Delete old rc3 tag

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

6445 files changed, 0 insertions, 510106 deletions

diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/LICENSE b/tags/java/sca/1.3/demos/alert-aggregator-webapp/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/NOTICE b/tags/java/sca/1.3/demos/alert-aggregator-webapp/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/README b/tags/java/sca/1.3/demos/alert-aggregator-webapp/README
deleted file mode 100644
index 3ec27ef65f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/alert-aggregator.png b/tags/java/sca/1.3/demos/alert-aggregator-webapp/alert-aggregator.png
deleted file mode 100644
index ae429cca94..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/alert-aggregator.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/alert-aggregator.svg b/tags/java/sca/1.3/demos/alert-aggregator-webapp/alert-aggregator.svg
deleted file mode 100644
index 807416135e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/build-dojo.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/build-dojo.xml
deleted file mode 100644
index c31c9adee8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/build.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/build.xml
deleted file mode 100644
index b75842d08c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/pom.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/pom.xml
deleted file mode 100644
index 62b872288b..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/pom.xml
+++ /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.    
--->
-<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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>demo-alert-aggregator-webapp</artifactId>
-    <packaging>war</packaging>
-    <version>1.3</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.2</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-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-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>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.3</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-incubating</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>
-                <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>8080</cargo.servlet.port>
-                        </properties>
-                        <deployables>
-                            <deployable>
-                                <location>
-                                    ${project.build.directory}/${project.build.finalName}.${project.packaging}
-                                </location>
-                                <pingURL>http://localhost:8080/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>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>             
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
deleted file mode 100644
index 808374030c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
deleted file mode 100644
index b062504311..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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://incubator.apache.org/tuscany");
- 
-        // 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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
deleted file mode 100644
index c4bf13ce7a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
deleted file mode 100644
index 28e27a9978..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
deleted file mode 100644
index 7b943b1b45..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
deleted file mode 100644
index ca2fc95b4a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
deleted file mode 100644
index 2962defb25..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
deleted file mode 100644
index 75544294ce..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
deleted file mode 100644
index 2a5775e9a9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
deleted file mode 100644
index 9b73a27625..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.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.demos.aggregator;
-
-import java.net.URL;
-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.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 {
-            // Turn the date into something we can process. 
-            DateFormat dateFormatter = DateFormat.getDateTimeInstance();
-            Date timestamp = dateFormatter.parse(lastchecktimestamp);
-            
-            // 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;             
-                
-                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(dateFormatter.format(syndEntry.getPublishedDate()));
-                    newAlert.setId(rssaddress);
-                    newAlert.setUnread(true);
-                    
-                    returnAlertList.add(newAlert);
-                }
-            }
-            
-        } catch(Exception ex) {
-            System.err.println("Exception " + ex.toString());
-        }
-
-        return returnAlerts;
-    }
-
-}
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
deleted file mode 100644
index 10575bf0dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
deleted file mode 100644
index 79b025bc73..0000000000
--- a/tags/java/sca/1.3/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:8080/services/AlertsServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
deleted file mode 100644
index f0ec561ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
deleted file mode 100644
index 987481bd14..0000000000
--- a/tags/java/sca/1.3/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:8080/services/AlertsSourcesServiceWebServiceBinding" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
deleted file mode 100644
index 49f44f9da8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
deleted file mode 100644
index c359b275be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/sources.xml
deleted file mode 100644
index 2168c10c9c..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/resources/sources.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.
--->
-<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>
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
deleted file mode 100644
index 8b472fd0fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 0bc67c4c98..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index e0c2233dd7..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-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">
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>demo-alert-aggregator-webapp</d:artifactId>
-            <d:version>1.3</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a81165e1b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/pop.png
deleted file mode 100644
index 1cf1df24a7..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/pop.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/rss.png
deleted file mode 100644
index b3c949d224..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/rss.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/service.smd
deleted file mode 100644
index bc77e39bf9..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/service.smd
+++ /dev/null
@@ -1 +0,0 @@
-{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8080/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]}
diff --git a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
deleted file mode 100644
index b5f1824363..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/style.css b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/main/webapp/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
deleted file mode 100644
index 6e75ea0bdf..0000000000
--- a/tags/java/sca/1.3/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.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.demos.aggregator;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-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:8080/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:8080/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:8080/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/tags/java/sca/1.3/demos/bigbank-account/LICENSE b/tags/java/sca/1.3/demos/bigbank-account/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/NOTICE b/tags/java/sca/1.3/demos/bigbank-account/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-account/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/tags/java/sca/1.3/demos/bigbank-account/README b/tags/java/sca/1.3/demos/bigbank-account/README
deleted file mode 100644
index 5c0d850c5e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/bigbank.png b/tags/java/sca/1.3/demos/bigbank-account/bigbank.png
deleted file mode 100644
index 985cc6bd05..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-account/bigbank.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/bigbank-account/bigbank.svg b/tags/java/sca/1.3/demos/bigbank-account/bigbank.svg
deleted file mode 100644
index 0650075d48..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/build-dojo.xml b/tags/java/sca/1.3/demos/bigbank-account/build-dojo.xml
deleted file mode 100644
index 0e029c6335..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/build.xml b/tags/java/sca/1.3/demos/bigbank-account/build.xml
deleted file mode 100644
index 5d9b2fd48e..0000000000
--- a/tags/java/sca/1.3/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.3.jar"/>
-        <pathelement location="../../modules/tuscany-binding-jsonrpc-1.3.jar"/>
-        <pathelement location="../../modules/tuscany-binding-rmi-1.3.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/tags/java/sca/1.3/demos/bigbank-account/pom.xml b/tags/java/sca/1.3/demos/bigbank-account/pom.xml
deleted file mode 100644
index c20c595927..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-account/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-demos</artifactId>
-        <version>1.3</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>1.3</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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
deleted file mode 100644
index 57c1adcba0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
deleted file mode 100644
index bf919525c4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
deleted file mode 100644
index 0ed4b1dd2e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
deleted file mode 100644
index cc9023da60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
deleted file mode 100644
index 5bf6e6d26b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
deleted file mode 100644
index 1f4f02ea6d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
deleted file mode 100644
index 579b4ee64b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
deleted file mode 100644
index 5c64e11d10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
deleted file mode 100644
index c98dcacbf3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
deleted file mode 100644
index 121ee9a3f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
deleted file mode 100644
index c8b73d4ed4..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
+++ /dev/null
@@ -1,77 +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;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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();
-            if ( msg.getQoSContext().get(Message.QOS_CTX_SECURITY_PRINCIPAL) != null ) {
-                    BigbankCheckingsAcl.authorize((Principal)msg.getQoSContext().get(Message.QOS_CTX_SECURITY_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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
deleted file mode 100644
index 5fecef691e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
deleted file mode 100644
index 419b5def58..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.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 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.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();
-                if ( msg.getQoSContext().get(Message.QOS_CTX_SECURITY_PRINCIPAL) != null ) {
-                        BigbankCheckingsAcl.authorize((Principal)msg.getQoSContext().get(Message.QOS_CTX_SECURITY_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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
deleted file mode 100644
index da1b6e1d06..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
deleted file mode 100644
index 1473436000..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
deleted file mode 100644
index fcbf8a4831..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/tags/java/sca/1.3/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
deleted file mode 100644
index 28101a1986..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
deleted file mode 100644
index cc76e30a75..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index c5532b879d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6491a0d326..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index b1bce4339d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index d6bfe2167e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/SavingsAccount.composite
deleted file mode 100644
index 696b96d6e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/StockAccount.composite b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/StockAccount.composite
deleted file mode 100644
index 62c0b63003..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/definitions.xml b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/definitions.xml
deleted file mode 100644
index 31a8798f8b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 1609bf4b43..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/web/style.css b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index ac4d987a57..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/LICENSE b/tags/java/sca/1.3/demos/bigbank-calculator/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/NOTICE b/tags/java/sca/1.3/demos/bigbank-calculator/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-calculator/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/tags/java/sca/1.3/demos/bigbank-calculator/README b/tags/java/sca/1.3/demos/bigbank-calculator/README
deleted file mode 100644
index e8ff28fc0f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/build.xml b/tags/java/sca/1.3/demos/bigbank-calculator/build.xml
deleted file mode 100644
index 0893b27f4d..0000000000
--- a/tags/java/sca/1.3/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.3.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/tags/java/sca/1.3/demos/bigbank-calculator/pom.xml b/tags/java/sca/1.3/demos/bigbank-calculator/pom.xml
deleted file mode 100644
index 7b25d5bd99..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4eeb30a9c2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ed7bee0f4e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 131c5a8014..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index a917896aeb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index e328f024ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
deleted file mode 100644
index b1861daafc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/Calculator.composite b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 851813d31f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 1d4d221364..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index dd56af0ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/tags/java/sca/1.3/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 08fa310f46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/LICENSE b/tags/java/sca/1.3/demos/bigbank-stockquote/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/NOTICE b/tags/java/sca/1.3/demos/bigbank-stockquote/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-stockquote/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/tags/java/sca/1.3/demos/bigbank-stockquote/README b/tags/java/sca/1.3/demos/bigbank-stockquote/README
deleted file mode 100644
index 2ea98d020c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/build.xml b/tags/java/sca/1.3/demos/bigbank-stockquote/build.xml
deleted file mode 100644
index 145c158ac2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/pom.xml b/tags/java/sca/1.3/demos/bigbank-stockquote/pom.xml
deleted file mode 100644
index e3a3046550..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</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>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
deleted file mode 100644
index 2d7821171d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 2a0801f9b8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
deleted file mode 100644
index 9d128657eb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
diff --git a/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
deleted file mode 100644
index 04ed762602..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
deleted file mode 100644
index aaad92c861..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/definitions.xml b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/definitions.xml
deleted file mode 100644
index 7e1f51304e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/security.properties b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/security.properties
deleted file mode 100644
index 0063207e06..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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
\ No newline at end of file
diff --git a/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
deleted file mode 100644
index d53d32c4ef..0000000000
--- a/tags/java/sca/1.3/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/bigbank/LICENSE b/tags/java/sca/1.3/demos/bigbank/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/NOTICE b/tags/java/sca/1.3/demos/bigbank/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/bigbank/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/tags/java/sca/1.3/demos/bigbank/README b/tags/java/sca/1.3/demos/bigbank/README
deleted file mode 100644
index 5ec796db60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/bigbank.png b/tags/java/sca/1.3/demos/bigbank/bigbank.png
deleted file mode 100644
index 985cc6bd05..0000000000
--- a/tags/java/sca/1.3/demos/bigbank/bigbank.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/bigbank/bigbank.svg b/tags/java/sca/1.3/demos/bigbank/bigbank.svg
deleted file mode 100644
index 30aa0eab6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/build-dojo.xml b/tags/java/sca/1.3/demos/bigbank/build-dojo.xml
deleted file mode 100644
index 9d282c2dd2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/build.xml b/tags/java/sca/1.3/demos/bigbank/build.xml
deleted file mode 100644
index 046aadd228..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/pom.xml b/tags/java/sca/1.3/demos/bigbank/pom.xml
deleted file mode 100644
index ff9a255d06..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 2cb8027874..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * @version $$Rev$$ $$Date$$
- */
-
-@Remotable
-public interface AccountService {
-
-    public double getAccountReport(String customerID);
-
-}
diff --git a/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index 4f0e3879dc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
deleted file mode 100644
index 13d79a9c33..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index a7fa5ecc22..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
deleted file mode 100644
index 05360e07a5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
deleted file mode 100644
index 6d3b547939..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/tags/java/sca/1.3/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
deleted file mode 100644
index 749b8ee2f4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-    public double getQuote(String symbol);
-}
diff --git a/tags/java/sca/1.3/demos/bigbank/src/main/resources/BigBank.composite b/tags/java/sca/1.3/demos/bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index e57541b423..0000000000
--- a/tags/java/sca/1.3/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="/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="/rss"/>
-            <tuscany:binding.atom uri="/atom"/>
-        </service>
-        <reference name="accountService" target="AccountServiceComponent"/>
-    </component>
-
-    <component name="WebResourceComponent">
-        <tuscany:implementation.resource location="web"/>
-        <service name="Resource">
-            <tuscany:binding.http uri="/"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 154992c843..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/resources/bigbank.jks b/tags/java/sca/1.3/demos/bigbank/src/main/resources/bigbank.jks
deleted file mode 100644
index e6294d85f7..0000000000
--- a/tags/java/sca/1.3/demos/bigbank/src/main/resources/bigbank.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/bigbank/src/main/resources/definitions.xml b/tags/java/sca/1.3/demos/bigbank/src/main/resources/definitions.xml
deleted file mode 100644
index 8654151d82..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/resources/security.properties b/tags/java/sca/1.3/demos/bigbank/src/main/resources/security.properties
deleted file mode 100644
index 762d0523d9..0000000000
--- a/tags/java/sca/1.3/demos/bigbank/src/main/resources/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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
\ No newline at end of file
diff --git a/tags/java/sca/1.3/demos/bigbank/src/main/resources/web/AccountJSON.html b/tags/java/sca/1.3/demos/bigbank/src/main/resources/web/AccountJSON.html
deleted file mode 100644
index 9f4368443f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/resources/web/style.css b/tags/java/sca/1.3/demos/bigbank/src/main/resources/web/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index ac4d987a57..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/bigbank/src/test/java/test/BigBankTestCase.java b/tags/java/sca/1.3/demos/bigbank/src/test/java/test/BigBankTestCase.java
deleted file mode 100644
index 3b7c5ef2ad..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/LICENSE b/tags/java/sca/1.3/demos/mortgage-creditcheck/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/NOTICE b/tags/java/sca/1.3/demos/mortgage-creditcheck/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-creditcheck/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/tags/java/sca/1.3/demos/mortgage-creditcheck/README b/tags/java/sca/1.3/demos/mortgage-creditcheck/README
deleted file mode 100644
index b785802920..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/build.xml b/tags/java/sca/1.3/demos/mortgage-creditcheck/build.xml
deleted file mode 100644
index 59f1342276..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/pom.xml b/tags/java/sca/1.3/demos/mortgage-creditcheck/pom.xml
deleted file mode 100644
index a33e49bc5a..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
deleted file mode 100644
index ec95a60227..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CreditCheck {
-    int getCreditScore(String ssn);
-}
diff --git a/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
deleted file mode 100644
index f19e8a1250..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
deleted file mode 100644
index 870ea1941d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
deleted file mode 100644
index 5c828f5a39..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
deleted file mode 100644
index 9c2acc96d3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index aea009292a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d7b2e32dd1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/LICENSE b/tags/java/sca/1.3/demos/mortgage-loanapproval/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/NOTICE b/tags/java/sca/1.3/demos/mortgage-loanapproval/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/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/tags/java/sca/1.3/demos/mortgage-loanapproval/README b/tags/java/sca/1.3/demos/mortgage-loanapproval/README
deleted file mode 100644
index dbf3829a20..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/build.xml b/tags/java/sca/1.3/demos/mortgage-loanapproval/build.xml
deleted file mode 100644
index 9a0a83bf1d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.jpg
deleted file mode 100644
index e28ed63cfb..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.png
deleted file mode 100644
index 0bfce0078d..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/credit_composite.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.jpg
deleted file mode 100644
index 3f00557c7f..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.png
deleted file mode 100644
index 9d5f829fe5..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/loan_approval.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
deleted file mode 100644
index 515b6ecde7..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
deleted file mode 100644
index 4b815a4b82..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
deleted file mode 100644
index 01a7c55a14..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
deleted file mode 100644
index 07422c4f45..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
deleted file mode 100644
index 992c048684..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
deleted file mode 100644
index 4667956ed0..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
deleted file mode 100644
index 5021f6a317..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.png
deleted file mode 100644
index 1398c50ded..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_composite.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
deleted file mode 100644
index 00d45e1084..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
deleted file mode 100644
index e91c5f1bbd..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.png
deleted file mode 100644
index db304a4c28..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package1.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
deleted file mode 100644
index e8c2865e4a..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.png
deleted file mode 100644
index 502e538e94..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_package2.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
deleted file mode 100644
index fccf2e35c3..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.png
deleted file mode 100644
index b8f42ad318..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/doc/mortgage_scenario.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/mortgage_assembly.png b/tags/java/sca/1.3/demos/mortgage-loanapproval/mortgage_assembly.png
deleted file mode 100644
index 4667956ed0..0000000000
--- a/tags/java/sca/1.3/demos/mortgage-loanapproval/mortgage_assembly.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/pom.xml b/tags/java/sca/1.3/demos/mortgage-loanapproval/pom.xml
deleted file mode 100644
index c808aeb48c..0000000000
--- a/tags/java/sca/1.3/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>1.3</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.3</property>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
deleted file mode 100644
index c5787b7819..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * CreditCheck interface
- */
-@Remotable
-public interface CreditCheck {
-    int getCreditScore(String ssn);
-}
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
deleted file mode 100644
index dc803d9688..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
deleted file mode 100644
index 66a486d516..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
deleted file mode 100644
index b5bafeb204..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
deleted file mode 100644
index 8c642667f1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
deleted file mode 100644
index dcdad18496..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
deleted file mode 100644
index 40bfdc4a1d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
deleted file mode 100644
index cacd8694de..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The Mortgage Calculator service interface.
- */
-@Remotable
-public interface MortgageCalculator {
-    public double getMonthlyPayment(double principal, int years, float interestRate);
-}
diff --git a/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
deleted file mode 100644
index 015f1bae98..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
deleted file mode 100644
index d69f0a1163..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
deleted file mode 100644
index 23c9589e85..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
deleted file mode 100644
index c2116366ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
deleted file mode 100644
index d1128b9907..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
deleted file mode 100644
index 4cad6c7223..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
deleted file mode 100644
index bf7b10e0f7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
deleted file mode 100644
index b25af1d039..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
deleted file mode 100644
index 9c2acc96d3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/tags/java/sca/1.3/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
deleted file mode 100644
index 285cc72515..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/pom.xml b/tags/java/sca/1.3/demos/pom.xml
deleted file mode 100644
index 9d3e4b92c0..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/demos/xml-bigbank/LICENSE b/tags/java/sca/1.3/demos/xml-bigbank/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/NOTICE b/tags/java/sca/1.3/demos/xml-bigbank/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/demos/xml-bigbank/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/tags/java/sca/1.3/demos/xml-bigbank/README b/tags/java/sca/1.3/demos/xml-bigbank/README
deleted file mode 100644
index 3bdeeca60a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/build.xml b/tags/java/sca/1.3/demos/xml-bigbank/build.xml
deleted file mode 100644
index 0ba1b069aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/pom.xml b/tags/java/sca/1.3/demos/xml-bigbank/pom.xml
deleted file mode 100644
index 16e4e37756..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.3</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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
deleted file mode 100644
index c3ae8d0912..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
deleted file mode 100644
index 1c0c612987..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
deleted file mode 100644
index 4c72384e7b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
deleted file mode 100644
index 2ce1e86062..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
deleted file mode 100644
index a7703787fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
deleted file mode 100644
index f5f1ca90b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
deleted file mode 100644
index bb8ff85f45..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
deleted file mode 100644
index 358e5e19a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
deleted file mode 100644
index fcb3707cfe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
deleted file mode 100644
index 26753a9e9e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/tags/java/sca/1.3/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
deleted file mode 100644
index c300103398..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/BigBank.composite b/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index 8afde4bf80..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/accounts.xml b/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/accounts.xml
deleted file mode 100644
index 52ffd41fa7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/customer.xsd b/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/customer.xsd
deleted file mode 100644
index b22efb74c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/stock.xq b/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/stock.xq
deleted file mode 100644
index 03c19e457d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/tags/java/sca/1.3/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
deleted file mode 100644
index 8411e22ff7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/demos/xml-bigbank/xml-bigbank.png b/tags/java/sca/1.3/demos/xml-bigbank/xml-bigbank.png
deleted file mode 100644
index 0743a413a3..0000000000
--- a/tags/java/sca/1.3/demos/xml-bigbank/xml-bigbank.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/demos/xml-bigbank/xml-bigbank.svg b/tags/java/sca/1.3/demos/xml-bigbank/xml-bigbank.svg
deleted file mode 100644
index c7acc03324..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/distribution/bundle/pom.xml b/tags/java/sca/1.3/distribution/bundle/pom.xml
deleted file mode 100644
index 766b8ed905..0000000000
--- a/tags/java/sca/1.3/distribution/bundle/pom.xml
+++ /dev/null
@@ -1,673 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-bundle</artifactId>
-    <name>Apache Tuscany SCA Bundle Jar</name>
-    <packaging>jar</packaging>
-
-    <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-binding-atom-abdera</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-http-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>${pom.version}</version>
-        </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</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-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>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>addressing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-adb-codegen</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>opensaml</groupId>
-                    <artifactId>opensaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-wsdlgen</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-contribution-resource</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-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-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-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> don't put two servlet hosts in the classpat TUSCANY-1954
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-tomcat</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>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-data-api</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-tomcat</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>
-        </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-node2-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-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-runtime-tomcat</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-tomcat</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-sca-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <exclusions>
-                <exclusion>
-                    <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
-                    <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>
- 
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>shade-maven-plugin</artifactId>
-                <version>1.0-alpha-7</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedGroupFilter>org.apache.tuscany</shadedGroupFilter>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.apache.tuscany.sdo:tuscany-sdo-impl</exclude>
-                                </excludes>
-                            </artifactSet>
-
-                            <transformers>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.core.ModuleActivator</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.DataBinding</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.work.WorkScheduler</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory</resource>
-                                </transformer>
-                                <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider</resource>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/distribution/manifest/pom.xml b/tags/java/sca/1.3/distribution/manifest/pom.xml
deleted file mode 100644
index 44339cccc8..0000000000
--- a/tags/java/sca/1.3/distribution/manifest/pom.xml
+++ /dev/null
@@ -1,591 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-sca-manifest</artifactId>
-    <name>Apache Tuscany SCA Manifest 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-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-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</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</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-binding-ws-wsdlgen</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-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-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-host-tomcat</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>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
-        </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-tomcat</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>
-        </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-node2-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-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-tomcat</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>
-                    <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
-                    <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>
-     </dependencies>
-   
-
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <finalName>tuscany-sca-manifest</finalName>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                        <manifestEntries>
-                            <!-- Add an entry for the renamed bundle jar in the distro -->
-                            <Class-Path>tuscany-sca-all-${pom.version}.jar</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/distribution/pom.xml b/tags/java/sca/1.3/distribution/pom.xml
deleted file mode 100644
index cf8b584fae..0000000000
--- a/tags/java/sca/1.3/distribution/pom.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution</artifactId>
-    <name>Apache Tuscany SCA Distribution</name>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <tuscany.version>${pom.version}</tuscany.version>
-    </properties>
-
-    <modules>
-        <module>bundle</module>
-        <module>manifest</module>
-        <!--module>webapp</module-->
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-bundle</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-                <!-- exclude things that get dragged in from other dependencies that we don't need to distribute -->
-                <!-- TODO: this should probably be done in the Tuscany module where the dependency is defined -->
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-launcher</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jline</groupId>
-                    <artifactId>jline</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-                <!--
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-                -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-                </exclusion>
-            </exclusions>
-       </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
-        <!--include tomcat here so it is shipped in modules/ but not  -->
-        <!--in the all jar                                            -->
-        <!-- dependency> 
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-        </dependency -->
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-            <exclusions>
-                <exclusion>
-                    <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- exclude felix since we are using a later version -->
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.apache.felix.main</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <exclusions>
-                <!-- TUSCANY-2168 -->
-                <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>
-                <exclusion>
-                    <!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>  
-    </dependencies>
-
-    <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <!-- Temporarily Remove Javadoc -->
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>tuscany-sca-api</artifactId>
-                                    <classifier>javadoc</classifier>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>tuscany-core-spi</artifactId>
-                                    <classifier>javadoc</classifier>
-                                    <version>${pom.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-
-	    <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ant-plugin</artifactId>
-                ####
-                <version>1.1</version>
-                ####
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>ant</goal>
-                        </goals>
-                    </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-${pom.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-	    <!-- Temporarily remove to avoid out of memory
-            <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>process-sources-xsl</id>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <tasks>
-                                <xslt style="${basedir}/src/main/xsl/srcbuild_paths.xsl" in="build.xml" out="${basedir}/target/srcbuild_paths.xml">
-                                </xslt>
-
-                                <pathconvert property="cp" refid="maven.runtime.classpath" />
-                                <condition property="output.cp" value="set TUSCANY_CLASSPATH=${cp}">
-                                    <os family="windows" />
-                                </condition>
-                                <condition property="output.ext" value=".bat">
-                                    <os family="windows" />
-                                </condition>
-                                <property name="output.cp" value="export TUSCANY_CLASSPATH=${cp}" />
-                                <property name="output.ext" value="" />
-
-                                <echo file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
-                                <echo file="${basedir}/target/version.properties" message="tuscany.version=${pom.version}" />
-                                #########
-                                ### THIS WAS ALREADY COMMENTED
-                                <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml" overwrite="yes">
-                                    <filterset>
-                                        <filter token="TUSCANY_VERSION" value="${pom.version}" />
-                                    </filterset>
-                                </copy>
-                                ###
-                                <delete file="build.xml" />
-                            </tasks>
-
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/distribution/src/main/assembly/bin.xml b/tags/java/sca/1.3/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 01bc0a1e5e..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT 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>false</includeBaseDirectory>
-    <formats>
-        <format>dir</format>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}</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>tuscany-sca-${tuscany.version}</outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-        <!-- Add javadoc to the doc directory -->
-        <fileSet>
-            <directory>target/javadoc</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/docs/javadoc</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <!-- Add all the samples to the samples directory -->
-        <fileSet>
-            <directory>../samples</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/samples</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>*/.classpath</exclude>
-                <exclude>*/.project</exclude>
-                <exclude>*/.settings</exclude>
-                <exclude>*/.settings/**/*</exclude>
-                <exclude>*/.externalToolBuilders</exclude>
-                <exclude>*/.externalToolBuilders/**/*</exclude>
-                <exclude>*/work</exclude>
-                <exclude>*/work/**/*</exclude>
-                <exclude>**/activemq-test.log</exclude>
-                <exclude>**/derby.log</exclude>
-                <exclude>**/target/war/**</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/test-classes</exclude>
-                <exclude>*/target/test-classes/**/*</exclude>
-                <exclude>*/target/surefire-reports</exclude>
-                <exclude>*/target/surefire-reports/**/*</exclude>
-                <exclude>*/target/sdo-source</exclude>
-                <exclude>*/target/sdo-source/**/*</exclude>
-                <exclude>*/target/wsdl2java-source</exclude>
-                <exclude>*/target/wsdl2java-source/**/*</exclude>
-                <exclude>*/**/derby.log</exclude>
-                <exclude>*/**/*.svg</exclude>
-                <!-- Sample specific work file/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>calculator-distributed/work</exclude>
-                <exclude>calculator-distributed/work/**/*</exclude>
-                <exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
-                <exclude>calculator-webapp/target/sample-calculator-webapp/**/*</exclude>
-                <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp</exclude>
-                <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp</exclude>
-                <exclude>calculator-ws-secure-webapp/**/*</exclude>
-                <exclude>calculator-ws-secure-webapp/work</exclude>
-                <exclude>callback-ws-client/work</exclude>
-                <exclude>callback-ws-client/work/**/*</exclude>
-                <exclude>callback-ws-service/work</exclude>
-                <exclude>callback-ws-service/work/**/*</exclude>
-                <exclude>chat-webapp/target/sample-chat-webapp</exclude>
-                <exclude>chat-webapp/target/sample-chat-webapp/**/*</exclude>
-                <exclude>chat2-webapp</exclude>
-                <exclude>chat2-webapp/**/*</exclude>
-                <exclude>domain-webapp</exclude>
-                <exclude>domain-webapp/**/*</exclude>
-                <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
-                <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
-                <exclude>feed-aggregator-webapp/target/war</exclude>
-                <exclude>helloworld-bpel/target</exclude>
-                <exclude>helloworld-bpel/target/**/*</exclude>
-                <exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
-                <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp/**/*</exclude>
-                <exclude>helloworld-dojo-webapp/target/war</exclude>
-                <exclude>helloworld-jms-webapp</exclude>
-                <exclude>helloworld-jms-webapp/**/*</exclude>
-                <exclude>helloworld-jms-webapp/work</exclude>
-                <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp</exclude>
-                <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp</exclude>
-                <exclude>helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp/work</exclude>
-                <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
-                <exclude>helloworld-ws-reference/work</exclude>
-                <exclude>helloworld-ws-reference/work/**/*</exclude>
-                <exclude>helloworld-ws-reference-jms/activemq-data</exclude>
-                <exclude>helloworld-ws-reference-jms/activemq-data/**/*</exclude>
-                <exclude>helloworld-ws-reference-secure/work</exclude>
-                <exclude>helloworld-ws-reference-secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service-webapp</exclude>
-                <exclude>helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>helloworld-ws-service/work</exclude>
-                <exclude>helloworld-ws-service/secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service/secure/work</exclude>
-                <exclude>helloworld-ws-service/work/**/*</exclude>
-                <exclude>helloworld-ws-service-jms/activemq-data</exclude>
-                <exclude>helloworld-ws-service-jms/activemq-data/**/*</exclude>
-                <exclude>helloworld-ws-service-secure/work</exclude>
-                <exclude>helloworld-ws-service-secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp</exclude>
-                <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>helloworld-ws-sdo/work</exclude>
-                <exclude>helloworld-ws-sdo/work/**/*</exclude>
-                <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp</exclude>
-                <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp/**/*</exclude>
-                <exclude>loanapplication</exclude>
-                <exclude>loanapplication/**/*</exclude>
-                <exclude>osgi-supplychain/.felix</exclude>
-                <exclude>osgi-supplychain/.felix/**/*</exclude>
-                <exclude>osgi-supplychain/target/sample-osgi-supplychain</exclude>
-                <exclude>osgi-supplychain/target/sample-osgi-supplychain/**/*</exclude>
-                <exclude>simple-callback-ws/work</exclude>
-                <exclude>simple-callback-ws/work/**/*</exclude>
-                <exclude>spi-implementation-pojo</exclude>
-                <exclude>spi-implementation-pojo/**/*</exclude>
-                <!-- Sample war files to exclude -->
-                <exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp.war</exclude>
-                <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
-                <exclude>chat-webapp/target/sample-chat-webapp.war</exclude>
-                <exclude>domain-webapp/target/sample-domain-webapp.war</exclude>
-                <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp.war</exclude>
-                <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp.war</exclude>
-                <exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp.war</exclude>
-                <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp.war</exclude>
-                <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp.war</exclude>
-                <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
-                <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
-            </excludes>
-        </fileSet>
-        <!-- Add all the demos to the demos directory -->
-        <fileSet>
-            <directory>../demos</directory>
-
-            <outputDirectory>tuscany-sca-${tuscany.version}/demos</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>*/.classpath</exclude>
-                <exclude>*/.project</exclude>
-                <exclude>*/.settings</exclude>
-                <exclude>*/.settings/**/*</exclude>
-                <exclude>*/work</exclude>
-                <exclude>*/work/**/*</exclude>
-                <exclude>*/target/classes</exclude>
-                <exclude>*/target/classes/**/*</exclude>
-                <exclude>*/target/test-classes</exclude>
-                <exclude>*/target/test-classes/**/*</exclude>
-                <exclude>*/target/surefire-reports</exclude>
-                <exclude>*/target/surefire-reports/**/*</exclude>
-                <exclude>**/derby.log</exclude>
-                <exclude>*/**/derby.log</exclude>
-                <exclude>*/**/*.svg</exclude>
-                <exclude>*/**/*.ruleset</exclude>
-                <exclude>alert-aggregator-webapp/bin</exclude>
-                <exclude>alert-aggregator-webapp/bin/**/*</exclude>
-                <exclude>alert-aggregator-webapp/src/main/webapp/dojo</exclude>
-                <exclude>alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator</exclude>
-                <exclude>alert-aggregator-webapp/target/demo-alert-aggregator/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target/sdo-source</exclude>
-                <exclude>alert-aggregator-webapp/target/sdo-source/**/*</exclude>
-                <exclude>alert-aggregator-webapp/target</exclude>
-                <exclude>alert-aggregator-webapp/target/**/*</exclude>
-                <exclude>bigbank/src/main/resources/web/dojo</exclude>
-                <exclude>bigbank/src/main/resources/web/dojo/**/*</exclude>
-                <exclude>bigbank/target</exclude>
-                <exclude>bigbank/target/**/*</exclude>
-                <exclude>bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>bigbank-account/src/main/resources/web/dojo/**/*</exclude>
-                <exclude>bigbank-account/target</exclude>
-                <exclude>bigbank-account/target/**/*</exclude>
-                <exclude>bigbank-calculator/target</exclude>
-                <exclude>bigbank-calculator/target/**/*</exclude>
-                <exclude>bigbank-stockquote/target</exclude>
-                <exclude>bigbank-stockquote/target/**/*</exclude>
-                <exclude>helloworld-ws-sdo/work</exclude>
-                <exclude>helloworld-ws-sdo/work/**/*</exclude>
-                <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck</exclude>
-                <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck/**/*</exclude>
-                <exclude>mortgage-creditcheck/target</exclude>
-                <exclude>mortgage-creditcheck/target/**/*</exclude>
-                <exclude>mortgage-loanapproval/target</exclude>
-                <exclude>mortgage-loanapproval/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude> 
-                <exclude>secure-bigbank/secure-bigbank-account/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-account/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-calculator/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-calculator/target/**/*</exclude>
-                <exclude>secure-bigbank/secure-bigbank-stockquote/target</exclude>
-                <exclude>secure-bigbank/secure-bigbank-stockquote/target/**/*</exclude>
-                <exclude>xml-bigbank/target</exclude>
-                <exclude>xml-bigbank/target/**/*</exclude>
-                <exclude>target</exclude>
-                <exclude>target/**/*</exclude>
-            </excludes>
-        </fileSet>
-        <!-- Add all the tutorials to the tutorials directory -->
-        <fileSet>
-            <directory>../tutorial</directory>
-
-            <outputDirectory>tuscany-sca-${tuscany.version}/tutorial</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>*/.classpath</exclude>
-                <exclude>*/.project</exclude>
-                <exclude>*/.settings</exclude>
-                <exclude>*/.settings/**/*</exclude>
-                <exclude>*/work</exclude>
-                <exclude>*/work/**/*</exclude>
-                <exclude>*/target/classes</exclude>
-                <exclude>*/target/classes/**/*</exclude>
-                <exclude>*/target/test-classes</exclude>
-                <exclude>*/target/test-classes/**/*</exclude>
-                <exclude>*/target/surefire-reports</exclude>
-                <exclude>*/target/surefire-reports/**/*</exclude>
-                <exclude>*/target/war</exclude>
-                <exclude>*/target/war/**/*</exclude>
-                <exclude>**/derby.log</exclude>
-                <exclude>*/**/derby.log</exclude>
-                <exclude>*/**/*.svg</exclude>
-                <exclude>*/**/*.ruleset</exclude>
-                <exclude>target</exclude>
-                <exclude>target/**/*</exclude>
-                <exclude>catalog-webapp/target/war</exclude>
-                <exclude>catalog-webapp/target/war/**/*</exclude>
-                <exclude>catalog-webapp/target/tutorial-catalog-webapp</exclude>
-                <exclude>catalog-webapp/target/tutorial-catalog-webapp/**/*</exclude>
-                <exclude>store-db/target/cart-db/</exclude>
-                <exclude>store-db/target/cart-db/**/*</exclude>
-                <exclude>store-eu/target/cart-eu-db/</exclude>
-                <exclude>store-eu/target/cart-eu-db/**/*</exclude>
-                <exclude>store-supplier/target/cart-db/</exclude>
-                <exclude>store-supplier/target/cart-db/**/*</exclude>
-            </excludes>
-        </fileSet>
-        <!-- Add the generated tuscany manifest classpath jar to the lib directory -->
-        <fileSet>
-            <directory>manifest/target</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/lib</outputDirectory>
-            <includes>
-                <include>tuscany-sca-manifest.jar</include>
-            </includes>
-        </fileSet>
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- temporary fix since maven dependencies of rampart seems to refere to SNAPSHOT versions of the parent pom --> 
-        <!--fileSet>
-            <directory>../modules/binding-ws-axis2/target/classes/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}/lib</outputDirectory>
-            <includes>
-                <include>rampart-1.3.mar</include> 
-            </includes>
-        </fileSet-->
-    </fileSets>
-
-    <dependencySets>
-        <!-- Add all the Tuscany modules to the modules directory -->
-        <dependencySet>
-            <outputDirectory>tuscany-sca-${tuscany.version}/modules</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:*</include>
-            </includes>
-            <!-- exclude the tuscany bundle jar from the modules directory -->
-            <excludes>
-                <exclude>org.apache.tuscany.sca:tuscany-bundle</exclude>
-            </excludes>
-            <scope>runtime</scope>
-        </dependencySet>
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>tuscany-sca-${tuscany.version}/lib</outputDirectory>
-            <unpack>false</unpack>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:*</exclude>
-            </excludes>
-            <scope>runtime</scope>
-        </dependencySet>
-        <!-- Add the Tuscany bundle jar to the lib directory renaming it to nicer name -->
-        <dependencySet>
-            <outputDirectory>tuscany-sca-${tuscany.version}/lib</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-bundle</include>
-            </includes>
-            <scope>runtime</scope>
-            <outputFileNameMapping>tuscany-sca-all-${version}.jar</outputFileNameMapping>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/tags/java/sca/1.3/distribution/src/main/assembly/src.xml b/tags/java/sca/1.3/distribution/src/main/assembly/src.xml
deleted file mode 100644
index 34748f67b2..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/assembly/src.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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>false</includeBaseDirectory>
-    <formats>
-        <format>tar.gz</format>
-	<format>zip</format>
-    </formats>
-
-    <fileSets>
-	 <fileSet>
-             <directory>src/main/release</directory>
-	     <outputDirectory>tuscany-sca-${tuscany.version}-src</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>tuscany-sca-${tuscany.version}-src</outputDirectory>
-	     <includes>
-		 <include>BUILDING</include>
-		 <include>LICENSE</include>
-		 <include>NOTICE</include>
-             </includes>
-	 </fileSet>
-         <fileSet>
-             <directory>target/maven-shared-archive-resources/META-INF</directory>
-             <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-             <includes>
-                 <include>NOTICE</include>
-             </includes>
-         </fileSet>
-	 <fileSet>
-	     <directory>..</directory>
-	     <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-	     <includes>
-	         <include>**/*</include>
-             </includes>
-             <excludes>
-    		<exclude>contrib</exclude>
-    		<exclude>contrib/**/*</exclude>
-    		<exclude>doc</exclude>
-    		<exclude>doc/**/*</exclude>
-                <exclude>**/target</exclude>
-    		<exclude>**/target/**/*</exclude>
-    		<exclude>**/build</exclude>
-    		<exclude>**/build/**/*</exclude>
-    		<exclude>**/.settings</exclude>
-    		<exclude>**/.settings/**/*</exclude>
-    		<exclude>**/.classpath</exclude>
-    		<exclude>**/.project</exclude>
-    		<exclude>**/.wtpmodules</exclude>
-    		<exclude>**/surefire*</exclude>
-    		<exclude>**/cobertura.ser</exclude>
-    		<exclude>bin</exclude>
-    		<exclude>bin/*</exclude>
-    		<exclude>**/var/journal</exclude>
-    		<exclude>**/build.out*</exclude>
-    		<exclude>velocity.log</exclude>
-    		<exclude>derby.log</exclude>
-    		<exclude>distribution/target-last-successful</exclude>
-    		<exclude>distribution/target-last-successful/**/*</exclude>
-    		<exclude>itest/velocity.log</exclude>
-                <exclude>itest/bpel/helloworld-ws/work</exclude>
-                <exclude>itest/bpel/helloworld-ws/work/**/*</exclude>
-                <exclude>itest/callablereferences/work</exclude>
-                <exclude>itest/callablereferences/work/**/*</exclude>
-                <exclude>itest/callablereferences-ws/work</exclude>
-                <exclude>itest/callablereferences-ws/work/**/*</exclude>
-                <exclude>itest/contribution-import-export/import-composite/work</exclude>
-                <exclude>itest/contribution-import-export/import-composite/work/**/*</exclude>
-                <exclude>itest/contribution-import-export/import-resource/work</exclude>
-                <exclude>itest/contribution-import-export/import-resource/work/**/*</exclude>
-                <exclude>itest/contribution-import-export/import-wsdl/work</exclude>
-                <exclude>itest/contribution-import-export/import-wsdl/work/**/*</exclude>
-                <exclude>itest/conversations-ws/work</exclude>
-                <exclude>itest/conversations-ws/work/**/*</exclude>
-    		<exclude>itest/databindings/jaxbgen/velocity.log</exclude>
-                <exclude>itest/domain/work</exclude>
-                <exclude>itest/domain/work/**/*</exclude>
-                <exclude>itest/exceptions-simple-ws/work</exclude>
-                <exclude>itest/exceptions-simple-ws/work/**/*</exclude>
-                <exclude>itest/large-sdo-ws/</exclude>
-                <exclude>itest/large-sdo-ws/**/*</exclude>
-                <exclude>itest/policy/work</exclude>
-                <exclude>itest/policy/work/**/*</exclude>
-                <exclude>itest/transaction/derbydb</exclude>
-                <exclude>itest/transaction/derbydb/**/*</exclude>
-                <exclude>itest/ws-void-args-return/work</exclude>
-                <exclude>itest/ws-void-args-return/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/defaultbinding/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/defaultbinding/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/multisoapbindings/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/multisoapbindings/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/promoted/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/promoted/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/soapversion/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/soapversion/work/**/*</exclude>
-                <exclude>vtest/wsbinding/service/work</exclude>
-                <exclude>vtest/wsbinding/service/work/**/*</exclude>
-                <exclude>modules/domain-impl/work</exclude>
-                <exclude>modules/domain-impl/work/**/*</exclude>
-                <exclude>modules/host-tomcat/work</exclude>
-                <exclude>modules/host-tomcat/work/**/*</exclude>
-                <exclude>modules/node-impl/work</exclude>
-                <exclude>modules/node-impl/work/**/*</exclude>
-                <exclude>modules/implementation-bpel-ode/derby.log</exclude>
-                <exclude>modules/implementation-das</exclude>
-                <exclude>modules/implementation-das/**/*</exclude>
-                <exclude>modules/implementation-data</exclude>
-                <exclude>modules/implementation-data/**/*</exclude>
-                <exclude>modules/implementation-osgi/.felix</exclude>
-                <exclude>modules/implementation-osgi/.felix/**/*</exclude>
-                <exclude>modules/osgi-runtime/.felix</exclude>
-                <exclude>modules/osgi-runtime/.felix/**/*</exclude>
-                <exclude>samples/old</exclude>
-                <exclude>samples/old/**/*</exclude>
-                <exclude>samples/calculator-distributed/work</exclude>
-                <exclude>samples/calculator-distributed/work/**/*</exclude>
-                <exclude>samples/callback-ws-client/work</exclude>
-                <exclude>samples/callback-ws-client/work/**/*</exclude>
-                <exclude>samples/callback-ws-service/work</exclude>
-                <exclude>samples/callback-ws-service/work/**/*</exclude>
-                <exclude>samples/chat2-webapp</exclude>
-                <exclude>samples/chat2-webapp/**/*</exclude>
-                <exclude>samples/domain-webapp</exclude>
-                <exclude>samples/domain-webapp/**/*</exclude>
-                <exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo</exclude>
-                <exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>samples/helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>samples/helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/work</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference/work</exclude>
-                <exclude>samples/helloworld-ws-reference/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference-jms/activemq-data</exclude>
-                <exclude>samples/helloworld-ws-reference-jms/activemq-data/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference-secure/work</exclude>
-                <exclude>samples/helloworld-ws-reference-secure/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-sdo/work</exclude>
-                <exclude>samples/helloworld-ws-sdo/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service/work</exclude>
-                <exclude>samples/helloworld-ws-service/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-jms/activemq-data</exclude>
-                <exclude>samples/helloworld-ws-service-jms/activemq-data/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-secure/work</exclude>
-                <exclude>samples/helloworld-ws-service-secure/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-webapp</exclude>
-                <exclude>samples/helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>samples/osgi-supplychain/.felix</exclude>
-                <exclude>samples/osgi-supplychain/.felix/**/*</exclude>
-                <exclude>samples/spi-implementation-pojo</exclude>
-                <exclude>samples/spi-implementation-pojo/**/*</exclude>
-                <exclude>samples/simple-callback-ws/work</exclude>
-                <exclude>samples/simple-callback-ws/work/**/*</exclude>
-                <exclude>demos/alert-aggregator-webapp/bin</exclude>
-                <exclude>demos/alert-aggregator-webapp/bin/**/*</exclude>
-                <exclude>demos/alert-aggregator-webapp/src/main/webapp/dojo</exclude>
-                <exclude>demos/alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>demos/bigbank/src/main/resources/web/dojo</exclude> 
-                <exclude>demos/bigbank/src/main/resources/web/dojo/**/*</exclude> 
-                <exclude>demos/bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>demos/bigbank-account/src/main/resources/web/dojo/**/*</exclude> 
-                <exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude> 
-                <exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude> 
-                <exclude>*/**/derby.log</exclude>
-                <exclude>*/**/*.svg</exclude>
-                <exclude>*/**/*.ruleset</exclude>
-                <exclude>*/**/*.pmd</exclude>
-                <exclude>*/**/*.checkstyle</exclude>
-             </excludes>
-	 </fileSet>
-     </fileSets>
-</assembly>
diff --git a/tags/java/sca/1.3/distribution/src/main/release/CHANGES b/tags/java/sca/1.3/distribution/src/main/release/CHANGES
deleted file mode 100644
index 538454e81f..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/CHANGES
+++ /dev/null
@@ -1,463 +0,0 @@
-Changes With Apache Tuscany SCA 1.3 July 2008 

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

-

-- Features and/or Enhancements

-

-  We have graduated as a top level Apache project. The incubating disclaimer has been removed

-  and the artifact names and version no longer containg the "-incubating" string.

-

-  * Core

-    - More improvements to the Distributed Domain story

-      - Old domain and node code has been removed

-    - Improved runtime Java2WSDL processing

-      - No longer relies on Axis code

-    - Support for core validation monitoring

-      - A pluggable monitor can be used to trap and process validation messages 

-    - Performance improvements

-    - Java 2 security enablement across the code base

-  * Extensions

-    - Validation monitoring added to extension processors

-    - Databinding improvements

-    - JSR250 annotation support

-    - OSGi support improvements 

-    - Better BPEL support

-  * Tools

-    - No significant changes

-  * Samples/Tutorial/Demos

-    - No significant changes

-  * Testing

-    - more spec verifaction tests

-    - validation itests

-

-

-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/tags/java/sca/1.3/distribution/src/main/release/README b/tags/java/sca/1.3/distribution/src/main/release/README
deleted file mode 100644
index 5c6c486092..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Apache Tuscany SCA 1.3 July 2008 README
-=======================================
-
-Welcome to the Tuscany SCA 1.3 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/tags/java/sca/1.3/distribution/src/main/release/RELEASE_NOTES b/tags/java/sca/1.3/distribution/src/main/release/RELEASE_NOTES
deleted file mode 100644
index 77da5e355e..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache Tuscany SCA 1.3 July 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.3 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://tuscany.apache.org/
- 
-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://tuscany.apache.org/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/tags/java/sca/1.3/distribution/src/main/release/bin/INSTALL b/tags/java/sca/1.3/distribution/src/main/release/bin/INSTALL
deleted file mode 100644
index aeaab83f58..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-Installing the Apache Tuscany SCA 1.3 July 2008 Release binary distribution
-===========================================================================
-
-Unzip Tuscany binary distribution archive and you get the following:
-
-tuscany-sca-1.3        
-   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/tags/java/sca/1.3/distribution/src/main/release/bin/LICENSE b/tags/java/sca/1.3/distribution/src/main/release/bin/LICENSE
deleted file mode 100644
index fae34e6a78..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,2394 +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
- 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
- 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
- derby-10.3.1.4.jar
- geronimo-activation_1.1_spec-1.1.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.jar
- jetty-6.1.7.jar
- jetty-util-6.1.7.jar
- json-rpc-1.0.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.3.jar
- org.apache.felix.framework-1.0.4.jar
- org.apache.felix.main-1.0.4.jar
- org.apache.felix.shell-1.0.1.jar
- org.apache.felix.shell.tui-1.0.1.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
- regexp-1.3.jar
- spring-beans-2.0.8.jar
- spring-context-2.0.8.jar
- spring-core-2.0.8.jar
- tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.1-incubating.jar
- tuscany-sdo-impl-1.1-incubating.jar
- tuscany-sdo-lib-1.1-incubating.jar
- tuscany-sdo-tools-1.1-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.7.jar, 
-jaxb-xjc-2.1.7.jar, 
-jaxb2-reflection-2.1.4.jar,
-jsr181-api-1.0-MR1.jar, 
-jsr250-api-1.0.jar, 
-jaxws-api-2.1.jar, 
-mail-1.4.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-3.0.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.
-================================================================================
-
-The asm-all-3.1.jar:
-
-Copyright (c) 2000-2005 INRIA, France Telecom
-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. Neither the name of the copyright holders 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.
-
-================================================================================
diff --git a/tags/java/sca/1.3/distribution/src/main/release/bin/NOTICE b/tags/java/sca/1.3/distribution/src/main/release/bin/NOTICE
deleted file mode 100644
index 0325a840ac..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,99 +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.
-
-This product includes/uses ASM (http://asm.objectweb.org)
-   Copyright (c) 2000-2005 INRIA, France Telecom
-   All rights reserved.
-
diff --git a/tags/java/sca/1.3/distribution/src/main/release/src/BUILDING b/tags/java/sca/1.3/distribution/src/main/release/src/BUILDING
deleted file mode 100644
index 1873bbd915..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,55 +0,0 @@
-Building the Apache Tuscany SCA 1.3 July 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/tags/java/sca/1.3/distribution/src/main/release/src/LICENSE b/tags/java/sca/1.3/distribution/src/main/release/src/LICENSE
deleted file mode 100644
index 144d8ae692..0000000000
--- a/tags/java/sca/1.3/distribution/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/tags/java/sca/1.3/distribution/src/main/release/src/NOTICE b/tags/java/sca/1.3/distribution/src/main/release/src/NOTICE
deleted file mode 100644
index a37f9b03f5..0000000000
--- a/tags/java/sca/1.3/distribution/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/tags/java/sca/1.3/distribution/src/main/xsl/srcbuild_paths.xsl b/tags/java/sca/1.3/distribution/src/main/xsl/srcbuild_paths.xsl
deleted file mode 100644
index ab7a40b94a..0000000000
--- a/tags/java/sca/1.3/distribution/src/main/xsl/srcbuild_paths.xsl
+++ /dev/null
@@ -1,56 +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.
--->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-
-    <xsl:output method="xml" indent="yes" xalan:indent-amount="4"/>
-    <xsl:strip-space elements="*"/>
-
-    <!-- copy attributes from any node -->
-    <xsl:template match="@*" mode="attribute_copy">
-        <xsl:attribute name="{name(.)}">
-            <xsl:value-of select="."/>
-        </xsl:attribute>
-    </xsl:template>
-
-    <xsl:template match="path">
-        <project name="source-build-paths">
-            <property>
-                <xsl:attribute name="file">${user.home}/.m2/maven.properties</xsl:attribute>
-            </property>
-            <property name="maven.repo.local">
-                <xsl:attribute name="value">${user.home}/.m2/repository</xsl:attribute>
-            </property>
-            <path id="srcbuild.classpath.path">
-                <xsl:copy-of select="*"/>
-            </path>
-            <property name="srcbuild.classpath" refid="srcbuild.classpath.path"/>
-            <property name="tuscany.lib.dir">
-                <xsl:attribute name="location">${user.home}/.m2/repository</xsl:attribute>
-            </property>
-
-        </project>
-    </xsl:template>
-
-    <xsl:template match="echo">
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tags/java/sca/1.3/distribution/standalone/pom.xml b/tags/java/sca/1.3/distribution/standalone/pom.xml
deleted file mode 100644
index 7fc1f9b1d5..0000000000
--- a/tags/java/sca/1.3/distribution/standalone/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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA Standalone Runtime</name>
-    <artifactId>tuscany-standalone</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-runtime-standalone</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <finalName>tuscany-sca</finalName>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.tuscany.sca.runtime.standalone.StandaloneLauncher</mainClass>
-                            <addClasspath>false</addClasspath>
-                        </manifest>
-                        <manifestEntries>
-                            <!-- Add an entry for the renamed bundle jar in the distro -->
-                            <Class-Path>tuscany-standalone-${pom.version}.jar</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/distribution/standalone/src/test/resources/repo/tuscany.properties b/tags/java/sca/1.3/distribution/standalone/src/test/resources/repo/tuscany.properties
deleted file mode 100644
index a0d83168f7..0000000000
--- a/tags/java/sca/1.3/distribution/standalone/src/test/resources/repo/tuscany.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.
-#
-nodeName=http://localhost:8080/myNode/
-#domainName=http://localhost:8777/tuscany/foo/
-#startManager=true
-#hotDeployInterval=10000
-#useHotUpdate=true
diff --git a/tags/java/sca/1.3/distribution/tomcat/pom.xml b/tags/java/sca/1.3/distribution/tomcat/pom.xml
deleted file mode 100644
index 3b4990f586..0000000000
--- a/tags/java/sca/1.3/distribution/tomcat/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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA WebApp Runtime</name>
-    <artifactId>tuscany-tomcat-overlay</artifactId>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-runtime-tomcat</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <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/bin.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>apache-tuscany-tomcat-overlay-${pom.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/distribution/tomcat/src/main/assembly/bin.xml b/tags/java/sca/1.3/distribution/tomcat/src/main/assembly/bin.xml
deleted file mode 100644
index a664e719e9..0000000000
--- a/tags/java/sca/1.3/distribution/tomcat/src/main/assembly/bin.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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>bin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>dir</format>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Add the text files to the top-level directroy -->
-        <!-- commented out till we distribute fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>DISCLAIMER</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet -->
-
-        <!-- Add the repository and properties file -->
-        <fileSet>
-            <directory>src/main/resources/sca-contributions</directory>
-            <outputDirectory>/sca-contributions</outputDirectory>
-            <includes>
-                <include>tuscany.properties</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/tags/java/sca/1.3/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties b/tags/java/sca/1.3/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
deleted file mode 100644
index 6e2ca20deb..0000000000
--- a/tags/java/sca/1.3/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
+++ /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.
-#
-#nodeName=http://localhost:8080/tuscany/
-#domainName=http://localhost:8877
-hotDeployInterval=10000
diff --git a/tags/java/sca/1.3/distribution/war/pom.xml b/tags/java/sca/1.3/distribution/war/pom.xml
deleted file mode 100644
index da0afa61c7..0000000000
--- a/tags/java/sca/1.3/distribution/war/pom.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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA WAR Distribution</name>
-    <artifactId>tuscany-war</artifactId>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-runtime-war</artifactId>
-            <version>${pom.version}</version>
-
- <!-- exclude common unwanted jars, 
-      NOTE: most should be excluded in the module where they're dragged in -->
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <defaultGoal>package</defaultGoal>
-
-        <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>war.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>tuscany</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/distribution/war/src/main/release/LICENSE b/tags/java/sca/1.3/distribution/war/src/main/release/LICENSE
deleted file mode 100644
index 815617a23b..0000000000
--- a/tags/java/sca/1.3/distribution/war/src/main/release/LICENSE
+++ /dev/null
@@ -1,2296 +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 2.0
-
- activeio-2.0-r118.jar
- addressing-1.3.mar
- annogen-0.1.0.jar
- annotations-api-6.0.10.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-adb-codegen-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-beta1.jar
- catalina-6.0.10.jar
- cglib-nodep-2.1_3.jar
- common-2.2.2.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
- commons-primitives-1.0.jar
- coyote-6.0.10.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-jms_1.1_spec-1.1.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-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
- jetty-6.1.3.jar
- jetty-util-6.1.3.jar
- json-rpc-1.0.jar
- juli-6.0.10.jar
- log4j-1.2.12.jar
- logkit-1.0.1.jar
- maven-artifact-2.0.2.jar
- maven-artifact-manager-2.0.2.jar
- maven-error-diagnostics-2.0.2.jar
- maven-model-2.0.2.jar
- maven-profile-2.0.2.jar
- maven-project-2.0.2.jar
- maven-repository-metadata-2.0.2.jar
- maven-settings-2.0.2.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
- opensaml-1.1.jar
- org.apache.felix.bundlerepository-1.0.0.jar
- org.apache.felix.framework-1.0.0.jar
- org.apache.felix.main-1.0.0.jar
- org.apache.felix.shell-1.0.0.jar
- org.apache.felix.shell.tui-1.0.0.jar
- plexus-container-default-1.0-alpha-9.jar
- plexus-utils-1.1.jar
- rampart-1.3.mar
- 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
- stax-api-1.0.2.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
- wagon-file-1.0-alpha-7.jar
- wagon-http-lightweight-1.0-alpha-6.jar
- wagon-provider-api-1.0-alpha-6.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
- xalan-2.7.0.jar
- xmlbeans-2.3.0.jar
- xbean-naming-2.7.jar
- xercesImpl-2.8.1.jar
- xml-apis-1.3.03.jar
- xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
- 
-===============================================================================
-
-jaxen-1.1-beta-9.jar:
-
- Copyright 2003-2006 The Werken Company. 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 Jaxen Project 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 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.6R6.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:
-
-/*
- $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:
-
-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, jaxb-api, jaxb-impl, jaxb-xjc, jsr181-api,
-jsr250-api, jaxws-api, mail, saaj-api, servlet-api-2.5.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, wsdl4j:
-
-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:
-
-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 :
-
-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 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 axion, javacc, and howl 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/tags/java/sca/1.3/distribution/war/src/main/release/NOTICE b/tags/java/sca/1.3/distribution/war/src/main/release/NOTICE
deleted file mode 100644
index c34934e5cd..0000000000
--- a/tags/java/sca/1.3/distribution/war/src/main/release/NOTICE
+++ /dev/null
@@ -1,98 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-=========================================================================
-==  NOTICE file corresponding to the section 4 d of                    ==
-==  the Apache License, Version 2.0,                                   ==
-==  in this case for the Apache Tuscany distribution.                  ==
-=========================================================================
-
-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 Jaxen XPATH engine (http://jaxen.org/)
- Copyright 2003-2006 The Werken Company. 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 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 also includes software developed by:
-- the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
-- the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-
-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 also includes software under the OSOA license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-(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.
-
-Please see the LICENSE file present in the root directory of this
-distribution.
-
-
diff --git a/tags/java/sca/1.3/distribution/war/src/main/release/README b/tags/java/sca/1.3/distribution/war/src/main/release/README
deleted file mode 100644
index 7c5ba2db37..0000000000
--- a/tags/java/sca/1.3/distribution/war/src/main/release/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Tuscany 1.2 WAR Distribution September 2007 README
-=========================================================
-
-Welcome to the Tuscany SCA WAR Distribution see the RELEASE_NOTES
-and CHANGES files for information specific to this release.
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3/distribution/war/src/main/webapp/web.xml b/tags/java/sca/1.3/distribution/war/src/main/webapp/web.xml
deleted file mode 100644
index 787ff847b0..0000000000
--- a/tags/java/sca/1.3/distribution/war/src/main/webapp/web.xml
+++ /dev/null
@@ -1,48 +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 WAR Distribution</display-name>
-
-  <listener>
-    <listener-class>org.apache.tuscany.sca.runtime.war.WarContextListener</listener-class>
-  </listener>
-
-  <!-- Uncomment this to use a repository outside of the webapp 
-  <context-param>
-     <param-name>repositoryFolder</param-name>
-     <param-value>/sca-contributions</param-value>
-  </context-param>
-   -->
-
-  <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/tags/java/sca/1.3/distribution/war/war.xml b/tags/java/sca/1.3/distribution/war/war.xml
deleted file mode 100644
index 8fb1044714..0000000000
--- a/tags/java/sca/1.3/distribution/war/war.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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>war</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add the web.xml file -->
-        <fileSet>
-            <directory>src/main/webapp</directory>
-            <outputDirectory>WEB-INF/</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add samples -->
-        <fileSet>
-            <directory>../../samples/feed-aggregator/target</directory>
-            <outputDirectory>repository/</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../samples/helloworld-ws-service/target</directory>
-            <outputDirectory>repository/</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>WEB-INF/lib</outputDirectory>
-            <unpack>false</unpack>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:sample-*</exclude>
-            </excludes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/tags/java/sca/1.3/distribution/webapp/pom.xml b/tags/java/sca/1.3/distribution/webapp/pom.xml
deleted file mode 100644
index 0e96d7639e..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA WebApp Runtime</name>
-    <artifactId>tuscany-webapp</artifactId>
-    <packaging>war</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-binding-dwr</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ejb</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-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jsonrpc</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</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-binding-ws</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-               </exclusion>
-            </exclusions>
-        </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-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-core-spring</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-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-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-domain</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-domain-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-domain-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-extension-helper</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-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>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-spring</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-node</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>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>tuscany</finalName>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java b/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
deleted file mode 100644
index 9a0c66a776..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.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.webapp;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-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.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-
-import org.apache.tuscany.sca.host.webapp.HotUpdateContextListener;
-
-/**
- * A Servlet to upload a contribution file.
- */
-public class ContributionUploaderServlet extends HttpServlet {
-
-    private static final long serialVersionUID = System.currentTimeMillis();
-
-    private File repository;
-    
-    @Override
-    public void init(ServletConfig config) throws ServletException {
-        ServletContext servletContext = config.getServletContext();
-        repository = new File(servletContext.getRealPath(HotUpdateContextListener.REPOSITORY_FOLDER_NAME));
-    }
-    
-    @Override
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        // Check that we have a file upload request
-        boolean isMultipart = ServletFileUpload.isMultipartContent(request);
-        if (!isMultipart) {
-            throw new RuntimeException("Need multipart content");
-        }
-
-        // Create a factory for disk-based file items
-        FileItemFactory factory = new DiskFileItemFactory();
-
-        // Create a new file upload handler
-        ServletFileUpload upload = new ServletFileUpload(factory);
-
-        try {
-            // Parse the request
-            List /* FileItem */ items = upload.parseRequest(request);        
-            // Process the uploaded items
-            Iterator iter = items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem) iter.next();
-
-                if (!item.isFormField()) {
-                    String fileName = item.getName();
-                    int index = fileName.lastIndexOf("\\") + 1;
-                    String uploadedFileName = repository.getAbsolutePath() + "/" + fileName.substring(index);
-                    File uploadedFile = new File(uploadedFileName);
-                    item.write(uploadedFile);
-                }
-            }
-        }
-        catch(FileUploadException e) {
-            throw new RuntimeException(e);
-        }
-        catch(Throwable e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-        
-        setResponse(response, request);
-    }
-    
-    private void setResponse(HttpServletResponse response, HttpServletRequest request) throws IOException {
-        response.setContentType("text/html");
-        PrintWriter out = response.getWriter();
-        out.println("<html>");
-        out.println("<head>");
-        out.println("<title>Apache Tuscany WebApp Runtime</title>");
-        out.println("</head>");
-        out.println("<body>");
-        out.println("<h2>Composite file uploaded</h2>");
-        int port = request.getServerPort();
-        String portSubStr = ((port == -1) ? "" : (":" + request.getServerPort()));
-        String backPath = request.getScheme() + "://" + request.getServerName() + portSubStr + request.getContextPath();
-        out.println("Go <a href=\"" + backPath + "\">back</a>");
-        out.println("</body>");
-        out.println("</html>");
-    }
-}
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java b/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
deleted file mode 100644
index e46cadfa3d..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.webapp;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.NodeException;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * A ServletContextListener for the Tuscany WAR distribution.
- * 
- * Starts and stops a Tuscany SCA domain Node for the webapp. 
- */
-public class WarContextListener implements ServletContextListener {
-    private final static Logger logger = Logger.getLogger(WarContextListener.class.getName());
-
-    protected SCANode node;
-    protected SCADomain domain;
-    protected AddableURLClassLoader classLoader;
-    protected File repository;
-
-    protected boolean useHotUpdate;
-    protected long hotDeployInterval = 2000; // 2 seconds, 0 = no hot deploy
-    protected Thread hotDeployThread;
-    protected boolean stopHotDeployThread;
-
-    protected HashMap<URL, Long> existingContributions; // value is last modified time
-
-    private String domainName;
-    private String nodeName;
-
-    protected static final String NODE_ATTRIBUTE = WarContextListener.class.getName() + ".TuscanyNode";
-    protected static final String REPOSITORY_FOLDER_NAME = "sca-contributions";
-
-    public void contextInitialized(ServletContextEvent event) {
-        ServletContext servletContext = event.getServletContext();
-        initParameters(servletContext);
-        try {
-
-            initNode();
-        
-        } catch (Throwable e) {
-            e.printStackTrace();
-            servletContext.log("exception initializing SCA node", e);
-        }
-    }
-
-    public void contextDestroyed(ServletContextEvent event) {
-        if (node != null) {
-            stopNode();
-        }
-    }
-
-    protected void stopNode() {
-        try {
-
-            node.stop();
-            logger.log(Level.INFO, "SCA node stopped");
-
-        } catch (Throwable e) {
-            e.printStackTrace();
-            logger.log(Level.SEVERE, "exception stopping SCA Node", e);
-        }
-    }
-
-    protected void initNode() throws NodeException, URISyntaxException {
-        logger.log(Level.INFO, "SCA node starting");
-        
-        classLoader = new AddableURLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader());
-        Thread.currentThread().setContextClassLoader(classLoader);
-        
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(nodeName, domainName);
-        domain = node.getDomain();
-
-        existingContributions = new HashMap<URL, Long>();
-        URL[] contributions = getContributionJarURLs(repository);
-        for (URL contribution : contributions) {
-                addContribution(contribution);
-        }
-        
-        node.start();
-
-        initHotDeploy(repository);
-    }
-
-    protected void addContribution(URL contribution) throws URISyntaxException, NodeException {
-        classLoader.addURL(contribution);
-        node.addContribution(contribution.toString(), contribution);
-        existingContributions.put(contribution, new Long(new File(contribution.toURI()).lastModified()));
-        logger.log(Level.INFO, "Added contribution: " + contribution);
-    }
-
-    protected URL[] getContributionJarURLs(File repositoryDir) {
-
-        String[] jarNames = repositoryDir.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".jar");
-            }});
-
-        List<URL> contributionJars = new ArrayList<URL>();
-        if (jarNames != null) {
-            for (String jar : jarNames) {
-                try {
-                    contributionJars.add(new File(repositoryDir, jar).toURL());
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        return contributionJars.toArray(new URL[contributionJars.size()]);
-    }
-
-    private void initHotDeploy(final File repository) {
-
-        if (hotDeployInterval == 0) {
-            return; // hotUpdateInterval of 0 disables hotupdate
-        }
-
-        Runnable runable = new Runnable() {
-
-            public void run() {
-                logger.info("Contribution hot deploy activated");
-                while (!stopHotDeployThread) {
-                    try {
-                        Thread.sleep(hotDeployInterval);
-                    } catch (InterruptedException e) {
-                    }
-                    if (!stopHotDeployThread) {
-                        checkForUpdates(repository);
-                    }
-                }
-                logger.info("Tuscany contribution hot deploy stopped");
-            }
-        };
-        hotDeployThread = new Thread(runable, "TuscanyHotDeploy");
-        stopHotDeployThread = false;
-        hotDeployThread.start();
-    }
-
-    protected void checkForUpdates(File repository) {
-        URL[] currentContributions = getContributionJarURLs(repository);
-
-        List<URL> addedContributions = getAddedContributions(currentContributions);
-        for (URL contribution : addedContributions) {
-            try {
-                addContribution(contribution);
-  //              node.startContribution(contribution.toString());
-            } catch (Throwable e) {
-                e.printStackTrace();
-                logger.log(Level.WARNING, "Exception adding contribution: " + e);
-            }
-        }
-        if (addedContributions.size() > 0) {
-            try {
-                node.start();
-            } catch (NodeException e) {
-                e.printStackTrace();
-                logger.log(Level.WARNING, "Exception restarting node for added contributions: " + e);
-            }
-        }
-        
-        if (useHotUpdate && areContributionsAltered(currentContributions)) {
-            stopNode();
-            try {
-                initNode();
-            } catch (Throwable e) {
-                e.printStackTrace();
-                logger.log(Level.SEVERE, "exception starting SCA Node", e);
-            }
-        }
-    }
-
-    protected List<URL> getAddedContributions(URL[] currentContrabutions) {
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : currentContrabutions) {
-            if (!existingContributions.containsKey(url)) {
-                urls.add(url);
-            }
-        }
-        return urls;
-    }
-
-    protected boolean areContributionsAltered(URL[] currentContrabutions) {
-        try {
-            
-            List removedContributions = getRemovedContributions(currentContrabutions);
-            List updatedContributions = getUpdatedContributions(currentContrabutions);
-            
-            return (removedContributions.size() > 0 || updatedContributions.size() > 0);
-
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected List<URL> getUpdatedContributions(URL[] currentContrabutions) throws URISyntaxException {
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : currentContrabutions) {
-            if (existingContributions.containsKey(url)) {
-                File curentFile = new File(url.toURI());
-                if (curentFile.lastModified() != existingContributions.get(url)) {
-                    urls.add(url);
-                    logger.info("updated contribution: " + curentFile.getName());
-                }
-            }
-        }
-        return urls;
-    }
-
-    protected List getRemovedContributions(URL[] currentContrabutions) throws URISyntaxException {
-        List<URL> currentUrls = Arrays.asList(currentContrabutions);
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : existingContributions.keySet()) {
-            if (!currentUrls.contains(url)) {
-                urls.add(url);
-            }
-        }
-        for (URL url : urls) {
-            logger.info("removed contributions: " + new File(url.toURI()).getName());
-        }
-        return urls;
-    }
-
-    protected void initParameters(ServletContext servletContext) {
-        if (servletContext.getInitParameter("domainName") != null) {
-            domainName = servletContext.getInitParameter("domainName");
-        } else {
-            domainName = null;
-        }
-
-        if (servletContext.getInitParameter("nodeName") != null) {
-            nodeName = servletContext.getInitParameter("nodeName");
-        } else {
-            nodeName = "DefaultNode";
-        }
-
-        if (servletContext.getInitParameter("hotDeployInterval") != null) {
-            hotDeployInterval = Long.parseLong(servletContext.getInitParameter("hotDeployInterval"));
-        }
-
-        useHotUpdate = Boolean.valueOf(servletContext.getInitParameter("hotUpdate")).booleanValue();
-
-        if (servletContext.getInitParameter("repositoryFolder") != null) {
-            repository = new File(servletContext.getInitParameter("repositoryFolder"));
-        } else {
-            repository = new File(servletContext.getRealPath(REPOSITORY_FOLDER_NAME));
-        }
-        logger.info("Tuscany Contribution Repository -> " + repository);
-    }
-
-}
-
-class AddableURLClassLoader extends URLClassLoader {
-
-    public AddableURLClassLoader(URL[] urls, ClassLoader parent) {
-        super(urls, parent);
-    }
-    
-    /**
-     * Make URLClassLoader addURL public 
-     */
-    @Override
-    public void addURL(URL url) {
-        super.addURL(url);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/distribution/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8e65a9b96d..0000000000
--- a/tags/java/sca/1.3/distribution/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 WebApp Runtime</display-name>
-
-  <listener>
-    <listener-class>org.apache.tuscany.sca.webapp.WarContextListener</listener-class>
-  </listener>
-
-  <context-param>
-     <param-name>repositoryFolder</param-name>
-     <param-value>/TuscanyRepository</param-value>
-  </context-param>
-
-  <!-- context-param>
-     <param-name>domainName</param-name>
-     <param-value>http://localhost:8877/</param-value>
-  </context-param -->
-
-  <context-param>
-     <param-name>nodeName</param-name>
-     <param-value>http://localhost:8080/</param-value>
-  </context-param>
-
-  <context-param>
-     <param-name>hotDeployInterval</param-name>
-     <param-value>2000</param-value>
-  </context-param>
-
-  <context-param>
-     <param-name>hotUpdate</param-name>
-     <param-value>no</param-value>
-  </context-param>
-
-  <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/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp b/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
deleted file mode 100644
index 4efe4b5db3..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
+++ /dev/null
@@ -1 +0,0 @@
-File just to get the sca-contributions folder included in webapp
\ No newline at end of file
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar b/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
deleted file mode 100644
index 0df7ab8d74..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar b/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
deleted file mode 100644
index acf47451b3..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/scaDomainInfo.jsp b/tags/java/sca/1.3/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
deleted file mode 100644
index c92c164cfb..0000000000
--- a/tags/java/sca/1.3/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
+++ /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.
---%>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-<%@ page import="org.apache.tuscany.sca.host.embedded.management.ComponentManager"%>
-<%@ page import="org.apache.tuscany.sca.assembly.ComponentService"%>
-<%@ page import="org.apache.tuscany.sca.assembly.Binding"%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-   ComponentManager componentManager = scaDomain.getComponentManager();
-%>
-<html>
-<head><title>Apache Tuscany WebApp Runtime</title></head>
-
-<body>
-Apache Tuscany WebApp Runtime
-<br>
-Components in SCA Domain:
-   <%
-        java.util.Iterator i = componentManager.getComponentNames().iterator();
-        while (i.hasNext()) {
-            String compName = i.next().toString();
-
-      	%><br><%=compName%><br><%
-
-            org.apache.tuscany.sca.assembly.Component comp = componentManager.getComponent(compName);
-            java.util.Iterator j = comp.getServices().iterator();
-            while (j.hasNext()) {
-                ComponentService compService = (ComponentService)j.next();
-
-                %><%=" - Service: " + compService.getName()%><br><%
-
-                java.util.Iterator k = compService.getBindings().iterator();
-                while (k.hasNext()) {
-                    Binding b = (Binding)k.next();
-                    String bindingType = b.getClass().getName();
-
-                    %><%="-- Binding: " + b.getName() + "(" + bindingType.substring(bindingType.lastIndexOf('.')+1) + ") URI: " + b.getURI()%><br><%
-                }
-            }
-        }
-   %>
-<br>
-
-<hr>
-You can fill in a composite file to upload
-
-<form method='POST' enctype='multipart/form-data' action='/tuscany/ContributionUploader'>
-Composite file to upload: <input type=file name=upfile><br>
-<br>
-<input type=submit value=Press> to upload the composite file
-</form>
-
-</body>
-</html>
-
diff --git a/tags/java/sca/1.3/itest/bpel/helloworld-reference/pom.xml b/tags/java/sca/1.3/itest/bpel/helloworld-reference/pom.xml
deleted file mode 100644
index 6efa14c812..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</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-incubating</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.8.0</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.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-incubating</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>1.3</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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
deleted file mode 100644
index 532b84bd22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface GreetingsService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
deleted file mode 100644
index 86d7f245e8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
deleted file mode 100644
index 8dea2715bf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 672dbdc0b5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String hello(String name);
-}
diff --git a/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index d7ebd5cbb8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index bdfedee2f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
deleted file mode 100644
index dfec43e8e1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
deleted file mode 100644
index e768707ccd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 25d676bcfc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 5ec2cc9f2e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 13d12e32a0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index 504e2ccc5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 0f51b96b27..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/tags/java/sca/1.3/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
deleted file mode 100644
index 4e13380e0b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/pom.xml b/tags/java/sca/1.3/itest/bpel/helloworld-ws/pom.xml
deleted file mode 100644
index df92d378a9..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</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>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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>
-		<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/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>1.3</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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index ffdbc50a22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 6971151a77..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f864f45613..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/tags/java/sca/1.3/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/pom.xml b/tags/java/sca/1.3/itest/bpel/helloworld/pom.xml
deleted file mode 100644
index e0c5ff7f90..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</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>
-    
-    <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/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>1.3</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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index ffdbc50a22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 76fcd35c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index f6b12fb14b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 610bda3cc4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/log4j.properties b/tags/java/sca/1.3/itest/bpel/helloworld/src/test/resources/log4j.properties
deleted file mode 100644
index 37f66e4189..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/bpel/ping-pong/pom.xml b/tags/java/sca/1.3/itest/bpel/ping-pong/pom.xml
deleted file mode 100644
index 501f0b248d..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/pom.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for 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>1.3</version>

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

-    </parent>

-    <artifactId>itest-bpel-ping-pong</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency> 

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>1.3</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.0</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.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-ping</id>

-						<phase>generate-sources</phase>

-						<configuration>

-							<schemaFile>${basedir}/src/test/resources/ping/ping.wsdl</schemaFile>

-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>

-							<prefix>Ping</prefix>

-							<noNotification>true</noNotification>

-							<noContainer>true</noContainer>

-							<noUnsettable>true</noUnsettable>

-						</configuration>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-

-					<execution>

-						<id>generate-bpel-pong</id>

-						<phase>generate-sources</phase>

-						<configuration>

-							<schemaFile>${basedir}/src/test/resources/pong/pong.wsdl</schemaFile>

-							<targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory>

-							<prefix>Pong</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>1.3</version>

-				<executions>

-					<execution>

-						<configuration>

-							<wsdlFiles>

-								<wsdlFile>

-									<fileName>${basedir}/src/test/resources/ping/ping.wsdl</fileName>

-								</wsdlFile>

-								<wsdlFile>

-									<fileName>${basedir}/src/test/resources/pong/pong.wsdl</fileName>

-								</wsdlFile>

-							</wsdlFiles>

-						</configuration>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

-		</plugins>

-	</build>

-</project>

diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java b/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
deleted file mode 100644
index 1ab2ba3d5d..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.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.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelPing = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping-pong/ping-pong.composite");
-        //bpelPing = scaDomain.getService(PingPortType.class, "BPELPingPong-PingComponent/PingService");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testPing() {
-        //String response = bpelPing.Ping("Ping");
-        //System.out.println("response:" + response);
-        //assertNotNull(response);
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java b/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
deleted file mode 100644
index 34f82318a3..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.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.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping/ping.composite");
-        //bpelService = scaDomain.getService(PingPortType.class, "BPELPingComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testInvoke() {
-        /*
-        String response = bpelService.Ping("Ping");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        */
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java b/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
deleted file mode 100644
index 313bd66850..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.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.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.pong.PongPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PongPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("pong/pong.composite");
-        bpelService = scaDomain.getService(PongPortType.class, "BPELPongComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testInvoke() {
-        String response = bpelService.Pong("Pong");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/log4j.properties b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/log4j.properties
deleted file mode 100644
index 01bf8d8bf5..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/log4j.properties
+++ /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.
-#
-
-# 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

-

-# 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/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
deleted file mode 100644
index e4cbdfe89c..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.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="PingService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
deleted file mode 100644
index a0eb4d0b5b..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.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:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="ping">
-    
-    <component name="BPELPingPong-PingComponent">
-        <implementation.bpel process="ping:Ping"/>
-        <reference name="Pong" target="BPELPingPong-PongComponent/PongService"/>
-    </component>
-    
-    <component name="BPELPingPong-PongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/deploy.xml b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/deploy.xml
deleted file mode 100644
index 613ed9c491..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/deploy.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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Ping">
-		<active>true</active>
-		<provide partnerLink="PingPartnerLink">
-			<service name="ping:PingService" port="PingPort"/>
-		</provide>
-		<invoke partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</invoke>
-	</process>
-    
-</deploy>
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.bpel b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.bpel
deleted file mode 100644
index abda9e58d2..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.bpel
+++ /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.
-  -->
-<process
-        name="Ping"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-    <import location="ping.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <partnerLinks>
-        <partnerLink name="PingPartnerLink"
-                partnerLinkType="ping:PingPartnerLinkType"
-                myRole="Provider" />
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                partnerRole="Provider"
-                initializePartnerRole="yes" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="ping:PingRequest" name="pingRequest"/>
-        <variable messageType="ping:PingResponse" name="pingResponse"/>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pingReceive"
-                createInstance="yes"
-                operation="Ping"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                variable="pingRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pingRequest.body/ping:text, ' ping')</from>
-                <to variable="text"/>
-            </copy>
-            <!-- initialize pongRequest -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongRequest.body</to>
-            </copy>
-            <!-- copy new text into pongRequest -->
-            <copy>
-                <from>$text</from>
-                <to>$pongRequest.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <invoke name="invokePong"
-                operation="Pong"
-                inputVariable="pongRequest"
-                outputVariable="pongResponse"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"/>
-        
-        <assign name="assignPingResponse">
-            <copy>
-                <from>$pongResponse.body/pong:text</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pingResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <ping:PingResponse>
-                            <ping:text/>
-                        </ping:PingResponse>
-                    </literal>
-                </from>
-                <to>$pingResponse.body</to>
-            </copy>
-            <!-- copy new text into pingResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pingResponse.body/ping:text</to>
-            </copy>
-        </assign>
-
-        <reply name="pingReply"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                operation="Ping"
-                variable="pingResponse"/>
-    </sequence>
-</process>
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.componentType b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.componentType
deleted file mode 100644
index 7598a99d16..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.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">
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-
-  <service name="PingService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.composite b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.composite
deleted file mode 100644
index 75eed03022..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.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:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    name="ping">
-    
-    <component name="BPELPingComponent">
-        <implementation.bpel process="ping:Ping"/>
-    </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.wsdl b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
deleted file mode 100644
index 03e54c4de8..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
+++ /dev/null
@@ -1,84 +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="Ping"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PingRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PingResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PingRequest">
-        <part name="body" element="tns:PingRequest"/>
-    </message>
-
-    <message name="PingResponse">
-        <part name="body" element="tns:PingResponse"/>
-    </message>
-
-    <portType name="PingPortType">
-        <operation name="Ping">
-            <input message="tns:PingRequest"/>
-            <output message="tns:PingResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PingSoapBinding" type="tns:PingPortType">
-    	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    	<operation name="Ping">
-    		<soap:operation soapAction="" />
-    		<input name="PingRequest">
-    			<soap:body use="literal" />
-    		</input>
-    		<output name="PingResponse">
-    			<soap:body use="literal" />
-    		</output>
-    	</operation>
-    </binding>
-
-    <service name="PingService">
-    	<port name="PingPort" binding="tns:PingSoapBinding">
-    		<soap:address location="http://localhost:8085/ode/processes/ping" />
-    	</port>
-    </service>
-
-    <plnk:partnerLinkType name="PingPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PingPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/pong.wsdl b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
deleted file mode 100644
index 1f4c4a9aaa..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
+++ /dev/null
@@ -1,84 +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="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/deploy.xml b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/deploy.xml
deleted file mode 100644
index 1315ef47f0..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/deploy.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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Pong">
-		<active>true</active>
-		<provide partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</provide>
-	</process>
-    
-</deploy>
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.bpel b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.bpel
deleted file mode 100644
index b5d84898c7..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.bpel
+++ /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.
-  -->
-<process
-        name="Pong"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-
-    <partnerLinks>
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                myRole="Provider" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pongReceive"
-                createInstance="yes"
-                operation="Pong"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                variable="pongRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pongRequest.body/pong:text, ' pong')</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pongResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongResponse.body</to>
-            </copy>
-            <!-- copy new text into pongResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pongResponse.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <reply name="pongReply"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                operation="Pong"
-                variable="pongResponse"/>
-    </sequence>
-</process>
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.componentType b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.componentType
deleted file mode 100644
index 2f8fd5d3de..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.componentType
+++ /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.
--->
-<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="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-</componentType>  
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.composite b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.composite
deleted file mode 100644
index e40ce7ee45..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.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://bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="pong">
-    
-    <component name="BPELPongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.wsdl b/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
deleted file mode 100644
index 21ee8b82f6..0000000000
--- a/tags/java/sca/1.3/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
+++ /dev/null
@@ -1,93 +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="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-    
-    <!--
-    
-    This is an abstract interface/portType definition.  Note the lack of 
-    binding and service.  Since Pong is only exposed on the JBI bus, the
-    JBI endpoint is defined in Pong.dd.
-
-    -->
-
-</definitions>
diff --git a/tags/java/sca/1.3/itest/bpel/pom.xml b/tags/java/sca/1.3/itest/bpel/pom.xml
deleted file mode 100644
index ae0e2a5a4b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/itest/build-was-integration.xml b/tags/java/sca/1.3/itest/build-was-integration.xml
deleted file mode 100644
index 03de4c050f..0000000000
--- a/tags/java/sca/1.3/itest/build-was-integration.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="was-integration" default="main" basedir="."> 
-
-  <property environment="env"/>
-
-  <target name="startServer">
-    <exec dir="." executable="${env.WAS_HOME}/bin/startServer.sh">
-      <arg value="server1" />
-      <!--
-      <arg value="-username" />
-      <arg value="${sWasUser}" />
-      <arg value="-password" />
-      <arg value="${sWasPassword}" />
-      -->
-    </exec>
-  </target>
-
-  <target name="stopServer">
-    <exec dir="." executable="${env.WAS_HOME}/bin/stopServer.sh">
-      <arg value="server1" />
-      <!--
-      <arg value="-username" />
-      <arg value="${sWasUser}" />
-      <arg value="-password" />
-      <arg value="${sWasPassword}" />
-      -->
-    </exec>
-  </target>
-
-  <target name="installApplication">
-    <echo>Installing war ${application.war} on ${application.server} using name ${application.name} and context root ${application.contextRoot} </echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} installApplicationOnServer ${application.war} ${application.name} ${application.contextRoot} ${application.server}" />
-    </exec>
-
-    <echo>Starting application ${application.name} on ${application.server}</echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} startApplicationOnServer ${application.name} ${application.server}" />
-    </exec>
-   </target>
-
-  <target name="uninstallApplication">
-    <echo>Uninstalling ${application.name} </echo>
-    <exec dir="." executable="${env.WAS_HOME}/bin/wsadmin.sh">
-       <arg line="-conntype SOAP -lang jython -f ${was.python.script} uninstallApplicationOnServer ${application.name}" />
-    </exec>
-   </target>
-
- 
-</project>
diff --git a/tags/java/sca/1.3/itest/builder/pom.xml b/tags/java/sca/1.3/itest/builder/pom.xml
deleted file mode 100644
index ab68befe3f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-monitor-logging</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-workspace-impl</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>         

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-xml</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>  

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-sca-xml</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>  

-        

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
deleted file mode 100644
index 932ae3987a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
deleted file mode 100644
index fbb10a9ff7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation class for ComponentD.
- * 
- * @version $Rev$ $Date$
- */
-@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/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
deleted file mode 100644
index d1db4a5620..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation class for ComponentD.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={Service3.class})
-public class ComponentEImpl implements Service3 {
-
-
-    public String getGreetings(String name) {
-        return "Hello, " + name + " from ComponentE";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
deleted file mode 100644
index c6d1240a95..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implementation class for ComponentD.
- * 
- * @version $Rev$ $Date$
- */
-@Service(interfaces={Service3.class})
-public class ComponentFImpl implements Service3 {
-
-
-    public String getGreetings(String name) {
-        return "Hello, " + name + " from ComponentF";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
deleted file mode 100644
index 9a775feec9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * Interface for Service3 in ComponentD.

- * 

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface Service3 {

-

-    String getGreetings(String name);

-

-}

diff --git a/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/tags/java/sca/1.3/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
deleted file mode 100644
index 98a1741fb6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * Interface for Service3a in ComponentD.

- * 

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface Service3a {

-

-    String getGreetings2(String name);

-

-}

diff --git a/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
deleted file mode 100644
index 256d01be58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/scenario1.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/scenario1.composite
deleted file mode 100644
index 5c2a98ab40..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/scenario1a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario1/scenario1a.composite
deleted file mode 100644
index 21b5897aa1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
deleted file mode 100644
index ac01b3c687..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/scenario10.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
deleted file mode 100644
index 2d127a7bec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
deleted file mode 100644
index 98103e360e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/service3.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario10/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b82b43c68..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/scenario11.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
deleted file mode 100644
index 2f5ca96d07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
deleted file mode 100644
index 381ccddcc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/service3.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario11/service3.wsdl
deleted file mode 100644
index 14edcc00e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
deleted file mode 100644
index 4028098023..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/scenario12.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
deleted file mode 100644
index 23799f8487..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
deleted file mode 100644
index a2b4f88dc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
deleted file mode 100644
index c906c6c5b0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/scenario13.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/scenario13.composite
deleted file mode 100644
index ed59cd2adf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/scenario13a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario13/scenario13a.composite
deleted file mode 100644
index 41150f78fd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
deleted file mode 100644
index 6fa901c4df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/scenario2.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/scenario2.composite
deleted file mode 100644
index 66f88294ff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/scenario2a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario2/scenario2a.composite
deleted file mode 100644
index db1af4743f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
deleted file mode 100644
index f5899ab1f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/scenario3.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/scenario3.composite
deleted file mode 100644
index 4b37c19e4e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/scenario3a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario3/scenario3a.composite
deleted file mode 100644
index fedd79ff3d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
deleted file mode 100644
index 642245ea7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/scenario4.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/scenario4.composite
deleted file mode 100644
index 1bb876b33d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/scenario4a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario4/scenario4a.composite
deleted file mode 100644
index 55e13700a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
deleted file mode 100644
index 92da17179f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenario5.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenario5.composite
deleted file mode 100644
index 403e19b087..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenario5a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenario5a.composite
deleted file mode 100644
index 0e37ded0e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario5/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
deleted file mode 100644
index 42d45b0b98..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenario6.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenario6.composite
deleted file mode 100644
index 1c89139905..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenario6a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenario6a.composite
deleted file mode 100644
index 853703a353..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario6/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
deleted file mode 100644
index 44c471cc65..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenario7.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenario7.composite
deleted file mode 100644
index 6b1ac24cec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenario7a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenario7a.composite
deleted file mode 100644
index 8e0cebbdd5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario7/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
deleted file mode 100644
index 7cb09d0a74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenario8.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenario8.composite
deleted file mode 100644
index 26e5ee33fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenario8a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenario8a.composite
deleted file mode 100644
index 4fa0712199..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario8/scenarios.wsdl
deleted file mode 100644
index 7480419231..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
deleted file mode 100644
index b6ec160506..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/scenario9.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
deleted file mode 100644
index 83584ed482..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite b/tags/java/sca/1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
deleted file mode 100644
index 0021ec242b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
deleted file mode 100644
index 5f16bc0bea..0000000000
--- a/tags/java/sca/1.3/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.Service2 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$.ComponentB.Service2".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/ComponentB/Service2".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$.ComponentB.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.Service2 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$.ComponentB.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.Service2  

-        for (ComponentService service : componentD.getServices()) {

-            if (!"$promoted$.Service1".equals(service.getName()) &&

-                !"$promoted$.ComponentB.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.Service2 on innermost component

-            //  ComponentD, with <binding.ws> and uri="/ComponentB/Service2"

-            wsBinding = null;

-            for (ComponentService service : componentD.getServices()) {

-                if ("$promoted$.ComponentB.Service2".equals(service.getName())) {

-                    wsBinding = service.getBinding(WebServiceBinding.class);

-                }

-            }

-            assert "/ComponentB/Service2".equals(wsBinding.getURI());

-

-            // Should create WSDL document for ComponentD/$promoted$.ComponentB.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.Service2 on innermost component ComponentD

-            for (ComponentService service : componentD.getServices()) {

-                assert !"$promoted$.ComponentB.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.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/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
deleted file mode 100644
index 6ec2ea849e..0000000000
--- a/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.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.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.SCADefinitions;

-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: 674139 $ $Date: 2008-07-05 00:20:36 +0100 (Sat, 05 Jul 2008) $

- */

-public class CompositeBuilderNonWiringImpl implements CompositeBuilder {

-    private static final Logger logger = Logger.getLogger(CompositeBuilderNonWiringImpl.class.getName());

-    private CompositeBuilder compositeIncludeBuilder;

-  //private CompositeBuilder componentReferenceWireBuilder;

-  //private CompositeBuilder componentReferencePromotionWireBuilder;

-  //private CompositeBuilder compositeReferenceWireBuilder;

-    private CompositeBuilder compositeCloneBuilder;

-    private CompositeBuilder componentConfigurationBuilder;

-    private CompositeBuilder compositeServiceConfigurationBuilder;

-    private CompositeBuilder compositeReferenceConfigurationBuilder;

-    private CompositeBuilder compositeBindingURIBuilder;

-    private CompositeBuilder componentServicePromotionBuilder;

-  //private CompositeBuilder compositeServicePromotionBuilder;

-    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,

-                                Monitor monitor) {

-        this(assemblyFactory, null, scaBindingFactory,  intentAttachPointTypeFactory, interfaceContractMapper, null, monitor);

-    }

-    

-    /**

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

-                                SCADefinitions policyDefinitions,

-                                Monitor monitor) {

-        

-        if (endpointFactory == null){

-            endpointFactory = new DefaultEndpointFactory();

-        }       

-        

-        compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(monitor); 

-      //componentReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);

-      //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor);

-      //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor);

-        compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl(monitor);

-        componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);

-        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, policyDefinitions, monitor);

-      //componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory);

-      //compositeServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl(assemblyFactory);

-        compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);

-        compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);

-        componentServiceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl(monitor);

-        componentReferenceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl(monitor);

-    }

-

-    public void build(Composite composite) throws CompositeBuilderException {

-

-        // Collect and fuse includes

-        compositeIncludeBuilder.build(composite);

-

-        // Expand nested composites

-        compositeCloneBuilder.build(composite);

-

-        // Configure all components

-        componentConfigurationBuilder.build(composite);

-

-        // Connect composite services/references to promoted services/references

-        compositePromotionBuilder.build(composite);

-        

-        // Compute the policies across the model hierarchy

-        compositePolicyBuilder.build(composite);

-        

-        // Configure composite services

-        compositeServiceConfigurationBuilder.build(composite);

-        

-        // Configure composite references

-        compositeReferenceConfigurationBuilder.build(composite);

-

-        // Configure binding URIs

-        compositeBindingURIBuilder.build(composite);

-

-        // Create promoted component services

-//      componentServicePromotionBuilder.build(composite);

-

-        // Create promoted composite services

-//      compositeServicePromotionBuilder.build(composite);

-

-        // Build component service binding-related information

-        componentServiceBindingBuilder.build(composite);

-        

-        // Wire the components

-//      componentReferenceWireBuilder.build(composite);

-

-        // Wire the promoted component references

-//      componentReferencePromotionWireBuilder.build(composite);

-

-        // Wire the composite references

-//      compositeReferenceWireBuilder.build(composite);

-

-        // Build component reference binding-related information

-        componentReferenceBindingBuilder.build(composite);

-        

-        // Fuse nested composites

-        //FIXME do this later

-        //cloneBuilder.fuseCompositeImplementations(composite);

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
deleted file mode 100644
index 82a8ca6689..0000000000
--- a/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.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.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.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.definitions.SCADefinitions;

-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;

-

-public class CustomCompositeBuilder {

-    private URLArtifactProcessor<Contribution> contributionProcessor;

-    private ModelResolverExtensionPoint modelResolvers;

-    private ModelFactoryExtensionPoint modelFactories;

-    private WorkspaceFactory workspaceFactory;

-    private AssemblyFactory assemblyFactory;

-    private XMLOutputFactory outputFactory;

-    private StAXArtifactProcessor<Object> xmlProcessor; 

-    private ContributionDependencyBuilder contributionDependencyBuilder;

-    private CompositeBuilder domainCompositeBuilder;

-    private static Workspace workspace;

-    private List<SCADefinitions> policyDefinitions;

-    private Monitor monitor;

-    private Composite domainComposite;

-    private boolean nonWiring;

-

-    protected 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(ModelFactoryExtensionPoint.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(monitor);

-        

-        // 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, monitor);

-        } else {

-            domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);

-        }

-    }

-    

-    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

-        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 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);

-    }

-    

-    /**

-     * 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/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/tags/java/sca/1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
deleted file mode 100644
index 9bff4d394e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences-ws/pom.xml b/tags/java/sca/1.3/itest/callablereferences-ws/pom.xml
deleted file mode 100644
index 06da2fb960..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index ecf1ac27e1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index c46087d865..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 670c145cc3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Remotable;

-

-@Remotable

-public interface ExampleService {

-

-	CallableReference hello(String name, ServiceReference ref);

-

-}

diff --git a/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index eb4d647a22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;

-import org.osoa.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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
deleted file mode 100644
index bb5e57397d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Alpha {
-    boolean run();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
deleted file mode 100644
index 6e5f1cedf9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
deleted file mode 100644
index 995e4fcf39..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Beta {
-    CallableReference<Gamma> getRef();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
deleted file mode 100644
index be72fd779e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
deleted file mode 100644
index b73f26b573..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma {
-    int start();
-
-    void doSomething();
-
-    @EndsConversation
-    void stop();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
deleted file mode 100644
index c3abc4c65d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
deleted file mode 100644
index 3d782a0b84..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences-ws/src/main/resources/example.composite b/tags/java/sca/1.3/itest/callablereferences-ws/src/main/resources/example.composite
deleted file mode 100644
index ea0819a32e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 310e31fb02..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/tags/java/sca/1.3/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
deleted file mode 100644
index 66fb2ef96c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/pom.xml b/tags/java/sca/1.3/itest/callablereferences/pom.xml
deleted file mode 100644
index 55864fe6e7..0000000000
--- a/tags/java/sca/1.3/itest/callablereferences/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-itest</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>  
-        
-                      
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
deleted file mode 100644
index d6b3807d31..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AComponent {
-    String foo();
-    
-    String fooB();
-    String fooB1();
-
-    String fooC();
-    String fooC1();
-    
-    String fooStringD();
-    String fooD();
-
-    String fooBC();
-
-    DComponent getDReference();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
deleted file mode 100644
index 09a0ceb629..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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 DComponent getDReference() {
-        return dReference;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
deleted file mode 100644
index ade672b0ab..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface BComponent {
-
-    String foo();
-
-    String fooC(CallableReference<CComponent> cComponent);
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
deleted file mode 100644
index 518e77d3a8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
deleted file mode 100644
index fdf80cc1c8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CComponent {
-
-    String foo();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
deleted file mode 100644
index cc8ec8f000..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(CComponent.class)
-public class CComponentImpl implements CComponent {
-
-    public String foo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
deleted file mode 100644
index 48b697df31..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface DComponent {
-
-    String foo(CallableReference<AComponent> aReference); 
-    
-    String fooString(String aReferenceString);
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
deleted file mode 100644
index 27ad48b9fe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
deleted file mode 100644
index abcedfa6e1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
deleted file mode 100644
index f2e0ce7582..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
deleted file mode 100644
index ab21421c4d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Alpha
-{	
-	boolean run();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
deleted file mode 100644
index 5b5984b164..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
deleted file mode 100644
index 223c467f47..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Beta
-{	
-	CallableReference<Gamma> getRef();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
deleted file mode 100644
index ed4e66bec3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
deleted file mode 100644
index e32051373f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma
-{	
-	void start();
-			
-	void doSomething();
-	
-	@EndsConversation
-	void stop();
-}
diff --git a/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/tags/java/sca/1.3/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
deleted file mode 100644
index adf5a1c1ce..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
deleted file mode 100644
index 0bf8f7ef1e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
deleted file mode 100644
index 5b3add1e61..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
deleted file mode 100644
index 49b75f56e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
deleted file mode 100644
index 9216f44191..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 95021f72a4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
deleted file mode 100644
index 42d739564c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 2edda61601..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
deleted file mode 100644
index a9cbb5d0a1..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
deleted file mode 100644
index a52f4de71b..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-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 SCANode2 nodeA;

-    private static SCANode2 nodeB;

-   

-    private static AComponent acomponent;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        

-        try {

-            

-            System.out.println("Setting up nodes");

-                  

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeA").toURL().toString()));

-            

-     

-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/nodeB").toURL().toString()));

-            

-            

-            nodeA.start();

-            nodeB.start();

-            

-            acomponent = ((SCAClient)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.getDReference().foo(null);

-        } catch (Exception e) {

-            Assert.assertTrue(true);

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
deleted file mode 100644
index f2d8fe5d64..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/tags/java/sca/1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
deleted file mode 100644
index 2b7750b443..0000000000
--- a/tags/java/sca/1.3/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.getDReference().foo(null);
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/pom.xml b/tags/java/sca/1.3/itest/callback-api/pom.xml
deleted file mode 100644
index e6fcddb911..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-api</artifactId>
-    <name>Apache Tuscany SCA Callback API Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
deleted file mode 100644
index de17ba2f0d..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackApiCallBack {
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void callBackMessage(String aString);
-
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
deleted file mode 100644
index 5fd4a71466..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackApiClient {
-    /**
-     * This function is defined in CallBackApiClientImpl
-     */
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
deleted file mode 100644
index 274984abb3..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiClient.class)
-public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack {
-
-    @Reference
-    protected CallBackApiService aCallBackService;
-
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    /**
-     * This test calls function test 3a,3a1,3b,3c
-     */
-    public void run() {
-
-        // This tests basic callback patterns.
-
-        // Test3a is the basic callback where the target calls back prior to
-        // returning to the client.
-        test3a();
-
-        test3a1();
-
-        // Test3b is where the target does not call back to the client.
-        test3b();
-
-        // Test3c is where the target calls back multiple times to the client.
-        test3c();
-
-        return;
-    }
-
-    /**
-     * This test is the basic callback where the target calls back prior to returning to the client.
-     */
-
-    private void test3a() {
-        aCallBackService.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();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
-    }
-
-    /**
-     * This test is the basic callback where the target calls back prior to returning to the client.
-     */
-    private void test3a1() {
-        aCallBackService.knockKnockByRef("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();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
-    }
-
-    /**
-     * This test is the basic callback where the target does not call back to the client
-     */
-    private void test3b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackApiITest - test3b", 1, 1);
-        return;
-    }
-
-    /**
-     * This test is the basic callback where the target calls back multiple times to the client
-     */
-
-    private void test3c() {
-        aCallBackService.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("CallBackApiITest - test3c", 3, this.getCallBackCount());
-        return;
-    }
-
-    /**
-     * This function returns a string
-     * 
-     * @param void
-     * @return String result string
-     */
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    /**
-     * This function set the returnMessage string
-     * 
-     * @param String
-     */
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    /**
-     * This function returns the callBackCount variable
-     * 
-     * @return Integer callBackCount variable
-     */
-    public int getCallBackCount() {
-        return callBackCount;
-    }
-
-    /**
-     * This function increments callBackCount variable by 1
-     */
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    /**
-     * This function prints a message synched with setReturnMessage function
-     * 
-     * @param String
-     */
-    public void callBackMessage(String aString) {
-        System.out.println("Entering callback callBackMessage: " + aString);
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            monitor.notify();
-        }
-    }
-
-    /**
-     * This function prints a message synched with incrementCallBackCount function
-     * 
-     * @param String
-     */
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        synchronized (monitor) {
-            this.incrementCallBackCount();
-            monitor.notify();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
deleted file mode 100644
index 33de1e7739..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.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.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackApiCallBack.class)
-/**
- * 
- */
-public interface CallBackApiService {
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void knockKnock(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void knockKnockByRef(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void noCallBack(String aString);
-
-    /**
-     * This function is defined in CallBackApiServiceImpl
-     */
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
deleted file mode 100644
index 61e2c7ee8f..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.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.test;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiService.class)
-public class CallBackApiServiceImpl implements CallBackApiService {
-
-    @Context
-    protected ComponentContext componentContext;
-    /**
-     * Object of CallBackApiCallBack class
-     */
-    private CallBackApiCallBack callback;
-
-    @Callback
-    protected CallableReference<CallBackApiCallBack> callbackRef;
-
-    /**
-     * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the
-     * callBackMessage function.
-     * 
-     * @param aString String passed by a function call
-     */
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callback = this.getCallBackInterface();
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function calls the callBackMessage function. <br>
-     * The reference to this function is received from Call back reference to the class CallBackApiService.
-     * 
-     * @param aString String passed by a function call
-     */
-    public void knockKnockByRef(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callbackRef.getService().callBackMessage("Who's There");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function. <br>
-     * This function then places multiple callBack using the callbackIncrement function defined in
-     * callBack.ApiServiceImpl
-     * 
-     * @param aString String passed by a function call
-     */
-    public void multiCallBack(String aString) {
-
-        callback = this.getCallBackInterface();
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackApiServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackApiServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
-    }
-
-    /**
-     * This function does not callBack any function.
-     * 
-     * @param aString String passed by a function call
-     */
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackApiServiceImpl message received: " + aString);
-
-        return;
-
-    }
-
-    /**
-     * This function get an object of CallBackApiServiceImpl from the present componentContext
-     * 
-     * @param void
-     */
-    private CallBackApiCallBack getCallBackInterface() {
-        System.out.println("CallBackApiServiceImpl getting request context");
-        RequestContext rc = componentContext.getRequestContext();
-        System.out.println("CallBackApiServiceImpl getting callback from request context");
-        callback = rc.getCallback();
-        System.out.println("CallBackApiServiceImpl returning callback");
-        return callback;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/1.3/itest/callback-api/src/main/resources/CallBackApiTest.composite
deleted file mode 100644
index 946c4862ee..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/main/resources/CallBackApiTest.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://callback"
-	name="CallBackApiTest">
- 	      
-    <component name="CallBackApiClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/>
-		<reference name="aCallBackService" target="CallBackApiService"/>
-    </component> 
-    
-    <component name="CallBackApiService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackApiServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 19eb25631e..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/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://callback"
-    xmlns:t="http://callback">
-    <deployable composite="t:CallBackApiTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/1.3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
deleted file mode 100644
index 9471049c74..0000000000
--- a/tags/java/sca/1.3/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.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;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackApiTestCase extends TestCase {
-
-    private static SCADomain domain;
-    private CallBackApiClient aCallBackClient;
-
-    /**
-     * This function uses the Instance of CallBackApiClient.class <br>
-     * This function calls the run function defined in the CallBackApiClinet Interface <br>
-     * which in turn executes the following test cases. <br>
-     * 1. Basic callback patterns <br>
-     * 2. Test in which the target does not call back to the client <br>
-     * 3. Test in which the target calls back multiple times to the client.
-     */
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    /**
-     * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class
-     */
-    @Override
-    protected void setUp() throws Exception {
-        if (domain == null) {
-            domain = SCADomain.newInstance("CallBackApiTest.composite");
-        }
-
-        aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient");
-    }
-
-    /**
-     * This function destroys the SCADomain instance that was created in setUp()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-basic/pom.xml b/tags/java/sca/1.3/itest/callback-basic/pom.xml
deleted file mode 100644
index abf27ffdea..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-basic</artifactId>
-    <name>Apache Tuscany SCA Callback Basic Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
-    </properties>    
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index 5e9d3d6821..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackBasicCallBack {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 9f4019f28c..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index e0e6d7eb8c..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicClient.class)
-public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {
-
-    @Reference
-    protected CallBackBasicService aCallBackService;
-    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() {
-        aCallBackService.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();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test1b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
-        return;
-    }
-
-    private void test1c() {
-        aCallBackService.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("CallBackBasicITest - 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/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index bd41fa7037..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- * 
- */
-public interface CallBackBasicService {
-
-    public void knockKnock(String aString);
-
-    public void noCallBack(String aString);
-
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 4ca2dc9af9..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicService.class)
-public class CallBackBasicServiceImpl implements CallBackBasicService {
-
-    @Callback
-    protected CallBackBasicCallBack callback;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackBasicServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl message received: " + aString);
-        // System.out.println("CallBackBasicServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/1.3/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
deleted file mode 100644
index c506956088..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/main/resources/CallBackBasicTest.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://callback"
-	name="CallBackBasicTest">
- 	      
-    <component name="CallBackBasicClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
-		<reference name="aCallBackService" target="CallBackBasicService"/>
-    </component> 
-    
-    <component name="CallBackBasicService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index adf28214f6..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/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://callback"
-    xmlns:t="http://callback">
-    <deployable composite="t:CallBackBasicTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/1.3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
deleted file mode 100644
index 32c26a348a..0000000000
--- a/tags/java/sca/1.3/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackBasicTestCase extends TestCase {
-
-    private static SCADomain domain;
-    private CallBackBasicClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run(); 
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	if( domain==null ) {
-    		domain = SCADomain.newInstance("CallBackBasicTest.composite");
-    	}
-    	
-        aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/pom.xml b/tags/java/sca/1.3/itest/callback-complex-type/pom.xml
deleted file mode 100644
index 561331560a..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-complex-type</artifactId>
-    <name>Apache Tuscany SCA Callback Complex Type Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
deleted file mode 100644
index 9fddb850ba..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackCTypeCallBack {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
deleted file mode 100644
index 739983c277..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackCTypeClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
deleted file mode 100644
index d2b03fcde7..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeClient.class)
-public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack {
-
-    @Reference
-    protected CallBackCTypeService aCallBackService;
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-    private static Object monitor = new Object();
-
-    public CallBackCTypeClientImpl() {
-    }
-
-    public void run() {
-
-        // This test is the same as the Basic Callback except it uses a
-        // componentType side file.
-        // This test currently fails because the integration test environment
-        // does not properly copy
-        // the componentType files to the target folder. This is documented in
-        // Tuscany-967.
-
-        // Test12a is the basic callback where the target calls back prior to
-        // returning to the client.
-        test12a();
-
-        // Test12b is where the target does not call back to the client.
-        test12b();
-
-        // Test12c is where the target calls back multiple times to the client.
-        test12c();
-
-        return;
-    }
-
-    private void test12a() {
-        aCallBackService.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();
-                }
-            }
-        }
-
-        Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage());
-
-    }
-
-    private void test12b() {
-        aCallBackService.noCallBack("No Reply Desired");
-        Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
-        return;
-    }
-
-    private void test12c() {
-        aCallBackService.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("CallBackBasicITest - test12c -", 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/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
deleted file mode 100644
index ffbf4f35fa..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-// @Callback(CallBackCTypeCallBack.class)
-/**
- * 
- */
-public interface CallBackCTypeService {
-
-    public void knockKnock(String aString);
-
-    public void noCallBack(String aString);
-
-    public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
deleted file mode 100644
index dc31ed156b..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeService.class)
-public class CallBackCTypeServiceImpl implements CallBackCTypeService {
-
-    @Callback
-    protected CallBackCTypeCallBack callback;
-
-    public CallBackCTypeServiceImpl() {
-    }
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
-
-    }
-
-    public void multiCallBack(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        callback.callBackIncrement("Who's There 1");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        callback.callBackIncrement("Who's There 2");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        callback.callBackIncrement("Who's There 3");
-        System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
-
-    }
-
-    public void noCallBack(String aString) {
-
-        System.out.println("CallBackCTypeServiceImpl message received: " + aString);
-        System.out.println("CallBackCTypeServiceImpl No response desired");
-        return;
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
deleted file mode 100644
index 3f48f16389..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.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://callback"
-	name="CallBackCTypeTest">
- 	      
-    <component name="CallBackCTypeClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/>
-		<reference name="aCallBackService" target="CallBackCTypeService"/>
-    </component> 
-    
-    <component name="CallBackCTypeService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
deleted file mode 100644
index ff38134df5..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ /dev/null
@@ -1,28 +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="CallBackCTypeService">

-     <interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService" 

-         callbackInterface="org.apache.tuscany.sca.test.CallBackCTypeCallBack"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/tags/java/sca/1.3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
deleted file mode 100644
index 33d1afaecd..0000000000
--- a/tags/java/sca/1.3/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackCTypeTestCaseFIXME extends TestCase {
-
-    private SCADomain domain;
-    private CallBackCTypeClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackCTypeClient.composite");
-
-        aCallBackClient =
-            domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/pom.xml b/tags/java/sca/1.3/itest/callback-id/pom.xml
deleted file mode 100644
index acd802e6ee..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-id</artifactId>
-    <name>Apache Tuscany SCA Callback ID Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
deleted file mode 100644
index b14560a8c3..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackIdCallBack {
-
-    public void callBackMessage(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
deleted file mode 100644
index a9e551f8b4..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackIdClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
deleted file mode 100644
index 59c9c3d069..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.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.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdClient.class)
-public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    protected ServiceReference<CallBackIdService> aCallBackService;
-
-    private static String returnMessage = null;
-    private static Object monitor = new Object();
-    private static Object callBackId;
-
-    public void run() {
-
-        // This tests the use of the set/get callbackId API both SCA generated
-        // and client specified.
-
-        // Test1 uses a SCA generated callback ID and compare that with the
-        // callbackID returned during callback.
-        test11a();
-
-        // Test2 uses a Client specified callback ID and compare that with the
-        // callbackID returned during callback.
-        test11b();
-
-        return;
-    }
-
-    private void test11a() {
-
-        // Retrieve this services callback ID and save it. Once the callback is
-        // received the callback ID will be compared with the one
-        // returned. Equal is good.
-
-        Object origCallBackId = aCallBackService.getCallbackID();
-        aCallBackService.getService().knockKnock("Knock Knock - Test1");
-        int count = 0;
-
-        // 
-        // If we cannot 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("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId());
-
-    }
-
-    private void test11b() {
-
-        // Set the services callback ID and save it. Once the callback is
-        // received the callback ID will be compared with the one
-        // returned. Equal is good.
-
-        String origCallBackId = "CallBackId1";
-        aCallBackService.setCallbackID(origCallBackId);
-
-        aCallBackService.getService().knockKnock("Knock Knock - Test2");
-        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();
-                }
-            }
-        }
-
-        Assert
-            .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId());
-
-    }
-
-    public String getReturnMessage() {
-        return returnMessage;
-    }
-
-    public void setReturnMessage(String aReturnMessage) {
-        returnMessage = aReturnMessage;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering callback callBackMessage: " + aString);
-        RequestContext rc = componentContext.getRequestContext();
-        Object callBackId = rc.getServiceReference().getCallbackID();
-
-        synchronized (monitor) {
-            this.setReturnMessage(aString);
-            this.setCallBackId(callBackId);
-            monitor.notify();
-        }
-    }
-
-    protected Object getCallBackId() {
-        return callBackId;
-    }
-
-    protected void setCallBackId(Object aCallBackId) {
-        callBackId = aCallBackId;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
deleted file mode 100644
index 18c592a1c1..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackIdCallBack.class)
-/**
- * 
- */
-public interface CallBackIdService {
-
-    public void knockKnock(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
deleted file mode 100644
index 8b0a4b69cf..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.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.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdService.class)
-public class CallBackIdServiceImpl implements CallBackIdService {
-
-    @Callback
-    protected CallBackIdCallBack callback;
-    @Context
-    protected ComponentContext compositeContext;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackIdServiceImpl message received: " + aString);
-        RequestContext rc = compositeContext.getRequestContext();
-        Object callBackId = rc.getServiceReference().getCallbackID();
-        System.out.println("CallBackIdServiceImpl callbackID: " + callBackId);
-
-        callback.callBackMessage("Who's There");
-        System.out.println("CallBackIdServiceImpl response sent");
-        return;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/1.3/itest/callback-id/src/main/resources/CallBackIdClient.composite
deleted file mode 100644
index c9a6ba6258..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/main/resources/CallBackIdClient.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://callback"
-	name="CallBackIdTest">
- 	      
-    <component name="CallBackIdClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/>
-		<reference name="aCallBackService" target="CallBackIdService"/>
-    </component> 
-    
-    <component name="CallBackIdService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackIdServiceImpl"/>
-    </component>  
-  
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/1.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
deleted file mode 100644
index 771fbb8ff7..0000000000
--- a/tags/java/sca/1.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.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;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackIdTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackIdClient aCallBackClient;
-
-    public void testCallBackBasic() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackIdClient.composite");
-
-        aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/pom.xml b/tags/java/sca/1.3/itest/callback-multiple-wires/pom.xml
deleted file mode 100644
index 2adb4570d4..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-multiple-wires</artifactId>
-    <name>Apache Tuscany SCA Callback With Mutiple Wires Test</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
deleted file mode 100644
index 7c80d222fc..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/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 org.apache.tuscany.sca.test.callback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
-    void aClientMethod();
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
deleted file mode 100644
index df91f3d268..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.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.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl1 implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        myService.someMethod("-> someMethod1");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl1.result = result;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
deleted file mode 100644
index a0a9564002..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.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.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl2 implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        myService.someMethod("-> someMethod2");
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("Work thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl2.result = result;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
deleted file mode 100644
index cfd601f546..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/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 org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
deleted file mode 100644
index f198efae51..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/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 org.apache.tuscany.sca.test.callback;
-
-/**
- * The callback interface for {@link MyService}.
- */
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
deleted file mode 100644
index d19b3fe355..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.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.callback;
-
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
-    @Context
-    protected RequestContext requestContext;
-    
-    public void someMethod(String arg) {
-        // invoke the callback
-        try {
-            MyServiceCallback myServiceCallback = requestContext.getCallback();
-            myServiceCallback.receiveResult(arg + " -> receiveResult");
-        } catch(RuntimeException e) {
-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
deleted file mode 100644
index 3dae3ca3a8..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.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="CallbackMultiWireTest">

-

-    <component name="MyClientComponent1">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl1"/>

-        <reference name="myService" target="MyServiceComponent"/>

-    </component>

-    

-    <component name="MyClientComponent2">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl2"/>

-        <reference name="myService" target="MyServiceComponent"/>

-    </component>

-    

-    <component name="MyServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.callback.MyServiceImpl"/>

-    </component>

-    

-</composite>

diff --git a/tags/java/sca/1.3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/1.3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
deleted file mode 100644
index 3c83e4bedd..0000000000
--- a/tags/java/sca/1.3/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.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.callback;
-
-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 CallbackMultiWireTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private MyClient myClient1;
-    private MyClient myClient2;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite");
-        myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1");
-        myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient1.aClientMethod();
-        myClient2.aClientMethod();
-        System.out.println("Sleeping ...");
-        Thread.sleep(300);
-        assertEquals("-> someMethod1 -> receiveResult", MyClientImpl1.result);
-        assertEquals("-> someMethod2 -> receiveResult", MyClientImpl2.result);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/pom.xml b/tags/java/sca/1.3/itest/callback-separatethread/pom.xml
deleted file mode 100644
index afa5f91f49..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-separatethread</artifactId>
-    <name>Apache Tuscany SCA Callback Using Separate Thread Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
deleted file mode 100644
index f812a39058..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the client interface for the call backs in a separate thread tests 
- */
-@Remotable
-public interface CallBackSeparateThreadClient {
-
-    /**
-     * This tests call back patterns using separate threads.
-     */
-    void runTests();
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
deleted file mode 100644
index e861f8a3d1..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.util.concurrent.atomic.AtomicInteger;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the client implementation for the call backs in a separate thread tests 
- */
-@Service(CallBackSeparateThreadClient.class)
-public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadClient, EventProcessorCallBack {
-    /**
-     * Used to sleep for 60 seconds.
-     */
-    private static final int SIXTY_SECONDS = 60 * 1000;
-
-    /**
-     * Counts the number of one second call backs
-     */
-    private static final AtomicInteger oneSecondCallbackCount = new AtomicInteger();
-
-    /**
-     * Counts the number of five second call backs
-     */
-    private static final AtomicInteger fiveSecondCallbackCount = new AtomicInteger();
-
-    /**
-     * This is our injected reference to the EventProcessorService
-     */
-    @Reference
-    protected EventProcessorService aCallBackService;
-
-    /**
-     * This tests call back patterns using separate threads.
-     */
-    public void runTests() {
-        // Register for 1 second call back
-        registerFor1SecondCallback();
-        
-        // Wait for a few 1 second call backs
-        System.out.println("Waiting for some 1 second calls");
-        waitForSome1SecondCallbacks();
-
-        // Register for 5 second call back
-        registerFor5SecondCallback();
-        
-        // Wait for a few 1 second call backs
-        System.out.println("Waiting for some 1 second calls");
-        waitForSome1SecondCallbacks();
-        
-        // Wait for a few 5 second call backs
-        System.out.println("Waiting for some 5 second calls");
-        waitForSome5SecondCallbacks();
-        
-        System.out.println("Done");
-    }
-
-    /**
-     * Waits for some one second call backs to be fired
-     */
-    private void waitForSome1SecondCallbacks() {
-        // Reset the one second call back count
-        oneSecondCallbackCount.set(0);
-        
-        // Wait until we have 10 1 second call backs or 60 seconds has passed
-        final long start = System.currentTimeMillis();
-        do {
-            if (oneSecondCallbackCount.get() >= 10) {
-                System.out.println("Received enough 1 second notifications");
-                return;
-            }
-            
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                Assert.fail("Unexpeceted exception " + e);
-            }
-        }
-        while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-        
-        // If we get to here then we did not receive enough events
-        Assert.fail("Did not receive enough 1 second events");
-    }
-
-    /**
-     * Waits for some five second call backs to be fired
-     */
-    private void waitForSome5SecondCallbacks() {
-        // Reset the five second call back count
-        fiveSecondCallbackCount.set(0);
-        
-        // Wait until we have 4 5 second call backs or 60 seconds has passed
-        final long start = System.currentTimeMillis();
-        do
-        {
-            if (fiveSecondCallbackCount.get() >= 4) {
-                System.out.println("Received enough 5 second notifications");
-                return;
-            }
-            
-            try
-            {
-                Thread.sleep(500);
-            }
-            catch (InterruptedException e)
-            {
-                Assert.fail("Unexpeceted exception " + e);
-            }
-        }
-        while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-        
-        // If we get to here then we did not receive enough events
-        Assert.fail("Did not receive enough 5 second events");
-    }
-    
-    /**
-     * Register to receive one second call backs
-     */
-    private void registerFor1SecondCallback() {
-        aCallBackService.registerForEvent("ONE");
-        return;
-    }
-
-    /**
-     * Register to receive five second call backs
-     */
-    private void registerFor5SecondCallback() {
-        aCallBackService.registerForEvent("FIVE");
-    }
-
-    /**
-     * Method that is called when an Event is delivered.
-     * 
-     * @param aEventName The name of the Event
-     * @param aEventData The Event data
-     */
-    public void eventNotification(String aEventName, Object aEventData) {
-        // System.out.println("Received Event : " + aEventName + " " + aEventData);
-
-        if (aEventName.equals("ONE")) {
-            final int newValue = oneSecondCallbackCount.incrementAndGet();
-            //System.out.println("Received total of " + newValue + " 1 second call backs");
-        } else if (aEventName.equals("FIVE")) {
-            final int newValue = fiveSecondCallbackCount.incrementAndGet();
-            //System.out.println("Received total of " + newValue + " 5 second call backs");
-        }
-        else
-            System.out.println("Unknown event type of " + aEventName);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
deleted file mode 100644
index ae41f596fc..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.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 org.osoa.sca.annotations.Remotable;
-
-/**
- * The call back interface for the EventProcessorService that is implemented
- * by the client to receive event notifications
- */
-@Remotable
-public interface EventProcessorCallBack {
-    /**
-     * Call back notifying client of an Event
-     * 
-     * @param aEventName The name of the Event
-     * @param aEventData The data for the Event
-     */
-    void eventNotification(String aEventName, Object aEventData);
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
deleted file mode 100644
index c22b8cceec..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * Sample Event Processor Service 
- */
-@Conversational
-@Callback(EventProcessorCallBack.class)
-@Remotable
-public interface EventProcessorService {
-
-    /**
-     * Registers the client to receive notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to register
-     */
-    void registerForEvent(String aEventName);
-
-    /**
-     * Unregisters the client so it no longer receives notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to unregister
-     */
-    void unregisterForEvent(String aEventName);
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
deleted file mode 100644
index 4d672b3a8b..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.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.itest;
-
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Sample Event Processor Service Implementation 
- */
-@Service(EventProcessorService.class)
-@Scope("CONVERSATION")
-public class EventProcessorServiceImpl implements EventProcessorService {
-
-    /**
-     * Reference to the call back
-     */
-    @Callback
-    protected CallableReference<EventProcessorCallBack> clientCallback;
-    
-    /**
-     * This map contains the call backs for each of the registered Event names
-     */
-    private final Map<String, CallableReference<EventProcessorCallBack>> eventListeners; 
-    
-    /**
-     * The list of all Event Generators we create
-     */
-    private final EventGenerator[] allEventGenerators;
-    
-    /**
-     * Constructor. Starts the Event Generators
-     */
-    public EventProcessorServiceImpl() {
-        eventListeners = new ConcurrentHashMap<String, CallableReference<EventProcessorCallBack>>();
-        
-        // We will simulate an Event generator
-        allEventGenerators = new EventGenerator[2];
-        allEventGenerators[0] = new EventGenerator("ONE", 1);      // Generate the SECOND event every second
-        allEventGenerators[1] = new EventGenerator("FIVE", 5);     // Generate the FIVE event every 5 seconds
-    }
-    
-    /**
-     * Registers the client to receive notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to register
-     */
-    public void registerForEvent(String aEventName)
-    {
-        // Register for the Event
-        eventListeners.put(aEventName, clientCallback);
-        
-        // Send the "register" started event to the client
-        receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName);
-    }
-
-    /**
-     * Unregisters the client so it no longer receives notifications for the specified event
-     * 
-     * @param aEventName The name of the Event to unregister
-     */
-    public void unregisterForEvent(String aEventName)
-    {
-        // Send the "register" started event to the client
-        receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName);
-        
-        eventListeners.remove(aEventName);
-    }
-    
-    /**
-     * This method is called whenever the EventProcessorService receives an Event
-     * 
-     * @param aEventName The name of the Event received
-     * @param aEventData The Event data
-     */
-    private void receiveEvent(String aEventName, Object aEventData)
-    {
-        // Get the listener for the Event
-        final CallableReference<EventProcessorCallBack> callback = eventListeners.get(aEventName);
-        if (callback == null)
-        {
-            //System.out.println("No registered listeners for " + aEventName);
-            return;
-        }
-        
-        // Trigger the call back
-        // System.out.println("Notifying " + callback + " of event " + aEventName);
-        callback.getService().eventNotification(aEventName, aEventData);
-        // System.out.println("Done notify " + callback + " of event " + aEventName);
-    }
-    
-    /**
-     * Shuts down the Event Processor
-     */
-    @Destroy
-    public void shutdown()
-    {
-        System.out.println("Shutting down the EventProcessor");
-        
-        // Clear list of call back locations as we don't want to send any more notifications
-        eventListeners.clear();
-
-        // Stop the Event Generators
-        for (EventGenerator generator : allEventGenerators)
-        {
-            generator.stop();
-        }
-    }
-    
-    /**
-     * Utility class for generating Events
-     */
-    private class EventGenerator
-    {
-        /**
-         * The Timer we are using to generate the events
-         */
-        private final Timer timer = new Timer();
-        
-        /**
-         * Constructor
-         *
-         * @param aEventName The name of the Event to generate
-         * @param frequencyInSeconds How frequently we should generate the Events
-         */
-        private EventGenerator(String aEventName, int frequencyInSeconds)
-        {
-            timer.schedule(new EventGeneratorTimerTask(aEventName), 
-                    frequencyInSeconds * 1000, frequencyInSeconds * 1000);
-        }
-        
-        /**
-         * Stop this Event Generator
-         */
-        private void stop()
-        {
-            timer.cancel();
-        }
-        
-        /**
-         * The TimerTask that is invoked by the Timer for the EventGenerator
-         */
-        private class EventGeneratorTimerTask extends TimerTask
-        {
-            /**
-             * The name of the Event we should generate
-             */
-            private final String eventName;
-
-            /**
-             * Constructor
-             *
-             * @param aEventName The name of the Event we should generate
-             */
-            private EventGeneratorTimerTask(String aEventName)
-            {
-                eventName = aEventName;
-            }
-
-            /**
-             * Timer calls this method and it will generate an Event
-             */
-            @Override
-            public void run()
-            {
-                // System.out.println("Generating new event " + eventName);
-                receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString());
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/1.3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
deleted file mode 100644
index e111e5074c..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.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://callback" name="CallBackSeparateThreadTest">

- 	      

-    <component name="CallBackSeparateThreadClient">

-		<implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/>

-		<reference name="aCallBackService" target="EventProcessorService"/>

-    </component> 

-    

-    <component name="EventProcessorService">

-      <implementation.java class="org.apache.tuscany.sca.itest.EventProcessorServiceImpl"/>

-    </component>  

-  

-</composite>

diff --git a/tags/java/sca/1.3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/1.3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
deleted file mode 100644
index f7e7be2133..0000000000
--- a/tags/java/sca/1.3/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.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;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This test case will attempt to trigger a call back using a separate thread
- */
-public class CallBackSeparateThreadTestCase extends TestCase {
-
-    /**
-     * The SCADomain we are using 
-     */
-    private SCADomain domain;
-    
-    /**
-     * The client the tests should use
-     */
-    private CallBackSeparateThreadClient aCallBackClient;
-
-    /**
-     * Run the call back in separate thread tests
-     */
-    public void testCallBackSeparateThread() {
-        aCallBackClient.runTests(); 
-    }
-
-    /**
-     * Load the Call back in separate thread composite and look up the client.
-     */
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite");
-        aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient");
-    }
-
-    /**
-     * Shutdown the SCA domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/pom.xml b/tags/java/sca/1.3/itest/callback-set-callback/pom.xml
deleted file mode 100644
index acbd16303e..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-set-callback</artifactId>
-    <name>Apache Tuscany SCA Set Callback Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
deleted file mode 100644
index 3b9599f53f..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.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;
-
-import org.osoa.sca.annotations.Callback;
-
-// @Remotable
-@Callback(CallBackSetCallbackCallback.class)
-/**
- * 
- */
-public interface CallBackSetCalbackService {
-
-    public void knockKnock(String aString);
-
-    public boolean setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
deleted file mode 100644
index 48752f2ea1..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.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;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackBadCallback {
-
-    public CallBackSetCallbackBadCallback() {
-        super();
-    }
-
-    public void callback(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("CallBackSetCallbackBadCallback: callback called");
-        Assert.fail("CallBackSetCallbackBadCallback: callback called");
-        return;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
deleted file mode 100644
index ad0e0603a3..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.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;
-
-// @Remotable
-/**
- *
- */
-public interface CallBackSetCallbackCallback {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
deleted file mode 100644
index 0a22b0e01f..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.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.test;
-
-import java.io.File;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackCallback.class)
-public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback {
-
-    private static String returnMessage = null;
-    private static int callBackCount = 0;
-
-    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 CallBackSetCallbackCallbackImpl callBackMessage: " + aString);
-
-        File aFile = new File("target/test4_marker");
-        try {
-            aFile.createNewFile();
-        } catch (Exception ex) {
-            System.out.println("Error Creating target/test4_marker marker file");
-            ex.printStackTrace();
-        }
-
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
deleted file mode 100644
index 94cb6aa73b..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
deleted file mode 100644
index 66e4d3fc05..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.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.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackClient.class)
-public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient {
-
-    @Reference
-    protected ServiceReference<CallBackSetCalbackService> aCallBackService;
-    @Reference
-    protected ServiceReference<CallBackSetCallbackCallback> callBack;
-
-    public void run() {
-
-        // This test various aspects of the setCallback() API in a stateless
-        // scope.
-
-        /*
-         * test4 Client does not implement the callback interface but calls
-         * setCallback with a service reference before invoking the target,
-         * Verify successful execution.
-         */
-
-        test4();
-
-        /*
-         * test5 The client does not implement the callback interface and does
-         * not call setCallback() before invoking the target. Verify a
-         * NoRegisteredCallbackException is thrown.
-         */
-
-        test5();
-
-        /*
-         * test6() The client calls setCallback() with an object that is not a
-         * service reference and the callback interface is stateless. Verify
-         * that an appropriate exception is thrown. When calling setCallback
-         * with an object the interface must be stateful. Stateless interfaces
-         * require a service Reference.
-         */
-
-        test6();
-
-        /*
-         * test10 The target calls setCallback() on its own service reference,
-         * e.g. getRequestContext().getServiceReference().getCallback(). Verify
-         * an appropriate exception occurs.
-         */
-
-        test10();
-
-        return;
-    }
-
-    private void test4() {
-
-        //
-        // Since callbacks do not synchronously return and this test results in
-        // a callback to a component other
-        // than this client I am using a marker file to determine the outcome.
-        // The presence of the marker
-        // file will be used for the Assertion test. If it exists then the
-        // callback occurred and all is good.
-        //
-
-        // Make sure the marker file is not present before starting the test.
-        File aFile = new File("target/test4_marker");
-        if (aFile.exists())
-            aFile.delete();
-
-        aCallBackService.setCallback(callBack);
-
-        aCallBackService.getService().knockKnock("Knock Knock");
-
-        // Lets give the callback a little time to complete....
-
-        int count = 0;
-        long timeout = 1000;
-
-        while (count++ < 30 && (aFile.exists() == false)) {
-            try {
-                Thread.sleep(timeout);
-            } catch (InterruptedException ie) {
-            }
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists());
-
-        aCallBackService.setCallback(null);  // leave this in the default state for next test
-
-    }
-
-    private void test5() {
-
-        boolean correctException = false;
-
-        //
-        // The backend service is expecting a callback reference to be set. This
-        // test will not
-        // set one so an exception is expected. According to the spec if a
-        // client calls a method on
-        // a service reference prior to calling setCallback() then a
-        // NoRegisteredCallbackException
-        // will be thrown on the client.
-        //
-
-        try {
-            aCallBackService.getService().knockKnock("Knock Knock");
-        } catch (NoRegisteredCallbackException NotRegEx) {
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test5", true, correctException);
-
-    }
-
-    private void test6() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface. However because this callback service is
-        // stateless the expected
-        // result is an appropriate exception.
-        //
-
-        try {
-            aCallBackService.setCallback(new CallBackSetCallbackObjectCallback());
-            aCallBackService.getService().knockKnock("Knock Knock");
-        }
-        //
-        // This should catch an appropriate exception.
-        //
-        catch (IllegalArgumentException goodEx) {
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallback - Test6", true, correctException);
-
-    }
-
-    private void test10() {
-
-        //
-        // The appropriate exception should be thrown and caught on the service side.
-        // If this happens, the setCallbackIllegally() method will return true.
-        // If not, this method will return false.
-        //
-
-        aCallBackService.setCallback(callBack);  // ensure no client-side exception
-
-        boolean result = aCallBackService.getService().setCallbackIllegally
-                             ("Try to set callback on your own service reference");
-
-        Assert.assertEquals("CallBackSetCallback - Test10", true, result);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
deleted file mode 100644
index afedcdf7f1..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.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;
-
-public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback {
-
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackObjectCallback() {
-        super();
-    }
-
-    public void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
-    }
-
-    public void callBackIncrement(String aString) {
-        System.out.println("Entering callback increment: " + aString);
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
deleted file mode 100644
index 4a6c9dbaa6..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.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;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCalbackService.class)
-public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService {
-
-    @Callback
-    protected CallBackSetCallbackCallback callback;
-    @Context
-    protected ComponentContext context;
-
-    public void knockKnock(String aString) {
-
-        try {
-            System.out.println("CallBackBasicServiceImpl message received: " + aString);
-            callback.callBackMessage("Who's There");
-            System.out.println("CallBackBasicServiceImpl response sent");
-            return;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-    }
-
-    public boolean setCallbackIllegally(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
-        boolean exceptionProduced = false;
-        RequestContext requestContext = null;
-        ServiceReference serviceRef = null;
-
-        try {
-            requestContext = context.getRequestContext();
-            serviceRef = (ServiceReference) requestContext.getServiceReference();
-            serviceRef.setCallback(serviceRef);
-        } catch (ClassCastException goodEx) {
-            exceptionProduced = true;
-            System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
-        } catch (Exception badEx) {
-            System.out.println("CallBackBasicServiceImpl.setCallbackIllegally()  " + badEx.toString());
-            badEx.printStackTrace();
-        }
-
-        // Return a flag indicating whether we got the exception we are looking for
-        return exceptionProduced;
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/1.3/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
deleted file mode 100644
index 3552ddecab..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.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://callback"
-	name="CallBackSetCallbackTest">
- 	      
-    <component name="CallBackSetCallbackClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackClientImpl"/>
-		<reference name="aCallBackService" target="CallBackSetCallbackService"/>
-		<reference name="callBack" target="CallBackSetCallbackCallback"/>
-    </component> 
-    
-    <component name="CallBackSetCallbackCallback">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackCallbackImpl"/>
-	</component> 
-    
-    <component name="CallBackSetCallbackService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackServiceImpl"/>
-    </component>    
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/1.3/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
deleted file mode 100644
index 496ae0b1a5..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackSetCallbackTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackSetCallbackClient aCallBackClient;
-
-    public void testCallBackSetCallback() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
-    	
-        aCallBackClient =
-            domain.getService(CallBackSetCallbackClient.class,
-                                                               "CallBackSetCallbackClient");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/pom.xml b/tags/java/sca/1.3/itest/callback-set-conversation/pom.xml
deleted file mode 100644
index 237802c64e..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-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>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-callback-set-conversation</artifactId>
-    <name>Apache Tuscany SCA Callback Set Conversation Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
deleted file mode 100644
index d97c69eaed..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.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;
-
-import java.io.Serializable;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvBadCallback implements Serializable {
-
-    public CallBackSetCallbackConvBadCallback() {
-        super();
-    }
-
-    public void callback(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("CallBackSetCallbackBadCallback: callback called");
-        Assert.fail("CallBackSetCallbackConvBadCallback: callback called");
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
deleted file mode 100644
index a704fd0ece..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.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;
-
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-/**
- *
- */
-public interface CallBackSetCallbackConvCallback {
-
-    public void callBackMessage(String aString);
-
-    public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
deleted file mode 100644
index 013424bf5e..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.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.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackConvClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
deleted file mode 100644
index 5d692e7728..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.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;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvClient.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    protected CallBackSetCallbackConvService aCallBackService;
-
-    private CallBackSetCallbackConvObjectCallback aCallbackObject = null;
-
-    public void run() {
-
-        // This tests aspects of the setCallback() API within a conversational
-        // scope.
-
-        /*
-         * test7 The client calls setCallback() with an object that is not a
-         * service reference and the callback interface is stateful. Verify
-         * successful execution.
-         */
-        test7();
-
-        /*
-         * test8() The client calls setCallback() with an object that does not
-         * implement the callback interface. Verify an appropriate exception is
-         * thrown. This requires a STATEFUL interface.
-         */
-        test8();
-
-        /*
-         * test9 The client calls setCallback() with an object that is not
-         * Serializable. Verify an appropriate exception is thrown. This
-         * requires a STATEFUL callback interface. Move from the stateless test
-         * case.
-         */
-        test9();
-
-        return;
-    }
-
-    private void test7() {
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface and is Serializable. Verify successful
-        // execution.
-        //	
-
-        aCallbackObject = new CallBackSetCallbackConvObjectCallback();
-        aCallbackObject.incrementCallBackCount();
-
-        ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                = componentContext.cast(aCallBackService);
-        aCallBackServiceRef.setCallback(aCallbackObject);
-        aCallBackService.knockKnock("Knock Knock 7");
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount());
-
-    }
-
-    private void test8() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does not implement
-        // the callback interface. The expected result is an appropriate
-        // exception.
-        //
-
-        try {
-            ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
-            aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback());
-            aCallBackService.knockKnock("Knock Knock 8");
-        }
-
-        //
-        // This should catch an appropriate exception.
-        // 
-
-        catch (IllegalArgumentException goodEx)
-        {
-            System.out.println("correct exception " + goodEx);
-            correctException = true;
-        }
-
-        catch (Exception ex) {
-            // This means an inappropriate exception occurred
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException);
-
-    }
-
-    private void test9() {
-
-        boolean correctException = false;
-
-        //
-        // This test is to specify an Object that is not a service reference
-        // that does implement
-        // the callback interface but does not implement Serializable. Verify
-        // an appropriate exception
-        // is thrown.
-        //
-
-        try {
-            ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
-                    = componentContext.cast(aCallBackService);
-            aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback());
-            aCallBackService.knockKnock("Knock Knock 9");
-        }
-        //
-        // This should catch an appropriate exception.
-        //
-        catch (IllegalArgumentException goodEx)
-        {
-            System.out.println("correct exception " + goodEx);
-            correctException = true;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-
-        Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
deleted file mode 100644
index 75a4a3a6a0..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.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;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback {
-
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackConvNonSerCallback() {
-        super();
-    }
-
-    public synchronized void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public synchronized int getCount() {
-        return callBackCount;
-    }
-
-    public void callBackMessage(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString);
-        Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackMessage called");
-    }
-
-    public void callBackIncrement(String aString) {
-        //
-        // This callback method should never be called.
-        //
-        System.out.println("Entering callbackIncrement: " + aString);
-        this.incrementCallBackCount();
-        Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackIncrement called");
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
deleted file mode 100644
index e7a3b144f6..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.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;
-
-import java.io.Serializable;
-
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable
-{
-    private int callBackCount = 0;
-
-    public CallBackSetCallbackConvObjectCallback() {
-        super();
-    }
-
-    public synchronized void incrementCallBackCount() {
-        callBackCount++;
-    }
-
-    public synchronized int getCount() {
-        return callBackCount;
-    }
-
-    public void callBackMessage(String aString) {
-
-        System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
-    }
-
-    public void callBackIncrement(String aString) {
-
-        System.out.println("Entering callback increment: " + aString);
-
-        this.incrementCallBackCount();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
deleted file mode 100644
index 692b6dfc35..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.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;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-@Callback(CallBackSetCallbackConvCallback.class)
-/**
- * 
- */
-public interface CallBackSetCallbackConvService {
-
-    public void knockKnock(String aString);
-
-    public void setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
deleted file mode 100644
index bca94ce407..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.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;
-
-import java.io.File;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvService.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService {
-
-    @Callback
-    protected CallBackSetCallbackConvCallback callback;
-    @Context
-    protected ComponentContext context;
-
-    public void knockKnock(String aString) {
-
-        System.out.println("CallBackSetCallbackConvServiceImpl message received: " + aString);
-        callback.callBackMessage("Who's There");
-        callback.callBackIncrement("This should do it");
-        System.out.println("CallBackSetCallbackConvServiceImpl response sent");
-
-    }
-
-    public void setCallbackIllegally(String aString) {
-
-        System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
-        boolean exceptionProduced = false;
-        RequestContext requestContext = null;
-        ServiceReference serviceRef = null;
-
-        // Context is not working properly so we can't trust that this is
-        // working.....
-        try {
-            requestContext = context.getRequestContext();
-            serviceRef = (ServiceReference) requestContext.getServiceReference();
-        } catch (Exception ex) {
-            System.out.println("CallBackBasicServiceImpl.setCallbackIllegally()  " + ex.toString());
-            ex.printStackTrace();
-            return;
-        }
-
-        // Ok, call setCallback with my own service reference.
-        try {
-            serviceRef.setCallback(serviceRef);
-        } catch (NullPointerException npe) {
-            // This is not an appropriate exception.
-            System.out.println("Test10 NPE exception during setCallback to own service reference");
-            npe.printStackTrace();
-            return;
-        }
-        // This needs to catch the appropriate exception, once we figure out
-        // what is needs to be!
-        catch (Exception ex) {
-            exceptionProduced = true;
-            System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
-        }
-        ;
-
-        // If we get the exception we are looking for then create the marker
-        // file.
-        if (exceptionProduced == true) {
-            File aFile = new File("target/test10_marker");
-            try {
-                aFile.createNewFile();
-            } catch (Exception ex) {
-                System.out.println("Error Creating target/test10_marker marker file");
-                ex.printStackTrace();
-            }
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/1.3/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
deleted file mode 100644
index ce73417f94..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.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://callback"
-	name="CallBackSetCallbackConvTest">
- 	      
-    <component name="CallBackSetCallbackConvClient">
-		<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvClientImpl"/>
-		<reference name="aCallBackService" target="CallBackSetCallbackConvService"/>
-    </component>    
-   
-    
-    <component name="CallBackSetCallbackConvService">
-      <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvServiceImpl"/>
-    </component>    
-</composite>
diff --git a/tags/java/sca/1.3/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/1.3/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
deleted file mode 100644
index 45bdaea9ab..0000000000
--- a/tags/java/sca/1.3/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.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.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackSetCallbackConvTestCase extends TestCase {
-
-    private SCADomain domain;
-    private CallBackSetCallbackConvClient aCallBackClient;
-
-    public void testCallBackSetCallback() {
-        aCallBackClient.run();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
-    	
-        aCallBackClient =
-            domain.getService(CallBackSetCallbackConvClient.class,
-                                                               "CallBackSetCallbackConvClient");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/component-type/pom.xml b/tags/java/sca/1.3/itest/component-type/pom.xml
deleted file mode 100644
index cc92efabe1..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-component-type</artifactId>
-    <name>Apache Tuscany SCA Component Type Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-</project>
-
diff --git a/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 8b6fe066a6..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 08afd922b3..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/CalculatorService");
-
-        // 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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 1209ac128a..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.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;
-
-/**
- * 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 void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/tags/java/sca/1.3/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/1.3/itest/component-type/src/main/resources/Calculator.composite
deleted file mode 100644
index b229787657..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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/AddService"/>

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

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

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

-    </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/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
deleted file mode 100644
index 00c48e5a35..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/AddServiceImpl.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="AddService">

-     <interface.java interface="calculator.AddService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
deleted file mode 100644
index 74bedc0a98..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,43 +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="addService">

-     <interface.java interface="calculator.AddService"/>

-  </reference>

-

-  <reference name="subtractService">

-     <interface.java interface="calculator.SubtractService"/>

-  </reference>

-

-  <reference name="multiplyService">

-     <interface.java interface="calculator.MultiplyService"/>

-  </reference>

-

-  <reference name="divideService">

-     <interface.java interface="calculator.DivideService"/>

-  </reference>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
deleted file mode 100644
index 289fcc3e11..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/DivideServiceImpl.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="DivideService">

-     <interface.java interface="calculator.DivideService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
deleted file mode 100644
index 2d8a879cda..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.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="MultiplyService">

-     <interface.java interface="calculator.MultiplyService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
deleted file mode 100644
index 6214955141..0000000000
--- a/tags/java/sca/1.3/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.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="SubtractService">

-     <interface.java interface="calculator.SubtractService"/> 

-  </service>

-
-</componentType>              

-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 08fc8e33bf..0000000000
--- a/tags/java/sca/1.3/itest/component-type/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 CalculatorService calculatorService;
-    private SCADomain scaDomain;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("Calculator.composite");
-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
-    }
-
-    @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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/build-jar.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/build-jar.xml
deleted file mode 100644
index 299ce6864f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/pom.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/pom.xml
deleted file mode 100644
index 25f25edc4e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 814c38777a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4daf0ec02..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4b3bc7048..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 698aa2aa5d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 9e01f00a79..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index cdd12d589d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
deleted file mode 100644
index 714d1826e1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 8a2bec308f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
deleted file mode 100644
index c77c4c1c7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
deleted file mode 100644
index d118cceef9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d37b6659da..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 77b28d9023..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 8ec290a831..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index 1398416978..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
deleted file mode 100644
index db1f0d34e7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/tags/java/sca/1.3/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
deleted file mode 100644
index a76fae8090..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/pom.xml b/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/pom.xml
deleted file mode 100644
index 0545ac8216..0000000000
--- a/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
deleted file mode 100644
index 692f16f6f6..0000000000
--- a/tags/java/sca/1.3/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.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-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/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
deleted file mode 100644
index 1ec7aaaa3a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/tags/java/sca/1.3/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
deleted file mode 100644
index b123951ef6..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/itest/contribution-classloader/pom.xml b/tags/java/sca/1.3/itest/contribution-classloader/pom.xml
deleted file mode 100644
index b135705dd7..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/pom.xml
deleted file mode 100644
index 755338c833..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
deleted file mode 100644
index e65422136f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the Hello service.

- */

-@Remotable

-public interface Hello {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
deleted file mode 100644
index 5369c18497..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3c14560a56..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
deleted file mode 100644
index 636b7111d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-java/pom.xml
deleted file mode 100644
index 250a913bff..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index dc33dfa560..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.3/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
deleted file mode 100644
index 5a14b41650..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/pom.xml
deleted file mode 100644
index ebc1f392ab..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f11eacb416..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.3/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
deleted file mode 100644
index 1ff281373a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/pom.xml
deleted file mode 100644
index eee5c288b5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b7394ec14b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.3/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/pom.xml
deleted file mode 100644
index ec0a8061ef..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 966f56d7d5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9f3f5be452..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
deleted file mode 100644
index e2f852ff7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 1176a89143..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-java/pom.xml
deleted file mode 100644
index d9e6ad9e64..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 224e2c4d79..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
deleted file mode 100644
index 9b650e4acc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/pom.xml
deleted file mode 100644
index f04a0825fb..0000000000
--- a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/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-itest</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</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-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac6d7becb3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/main/resources/store.composite
deleted file mode 100644
index bb5a7b764f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/pom.xml
deleted file mode 100644
index b71624734f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d46fe0b57c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
deleted file mode 100644
index 5008a2ea5b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-import-export/pom.xml b/tags/java/sca/1.3/itest/contribution-import-export/pom.xml
deleted file mode 100644
index d485679f28..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution-multiple/pom.xml b/tags/java/sca/1.3/itest/contribution-multiple/pom.xml
deleted file mode 100644
index 1280a7647e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/hello/Hello.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/hello/Hello.java
deleted file mode 100644
index 7e574a7db3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
deleted file mode 100644
index ff9f6e75f3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c062afaed0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 5251fc0a45..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
deleted file mode 100644
index ec5123eb2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
deleted file mode 100644
index 133c98f357..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/tags/java/sca/1.3/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
deleted file mode 100644
index 790b6fed98..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b76783c3d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
deleted file mode 100644
index 7a8003577e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
deleted file mode 100644
index bea6f39932..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
deleted file mode 100644
index 45cb504ea4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
deleted file mode 100644
index cbabdcd4fc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/tags/java/sca/1.3/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
deleted file mode 100644
index 4c9225de34..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/pom.xml b/tags/java/sca/1.3/itest/contribution/pom.xml
deleted file mode 100644
index cd216c4ee5..0000000000
--- a/tags/java/sca/1.3/itest/contribution/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4e72f92fda..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 40ca4d9b0f..0000000000
--- a/tags/java/sca/1.3/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.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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index f288af0174..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ae4ed12b7b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ad99418f5b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 3987b0a54f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 25e0ed6ca7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/resources/ContributionTest.composite b/tags/java/sca/1.3/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/resources/calculator/Calculator.composite b/tags/java/sca/1.3/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/tags/java/sca/1.3/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index e95796d83a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/tags/java/sca/1.3/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 97b2e5d6ed..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.3/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/contribution/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.3/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/conversations-ws/pom.xml b/tags/java/sca/1.3/itest/conversations-ws/pom.xml
deleted file mode 100644
index cb4eff7c2b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-impl</artifactId>

-            <version>1.3</version>

-        </dependency>        

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>         

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
deleted file mode 100644
index 9cd88620e3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;

-

-@Conversational

-public interface ConversationIdService {

-

-    String getCIDField();

-    String getCIDSetter();

-}

diff --git a/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index cb7a032e85..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 1e36ce6917..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index b4d3fe3d71..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index ed3a01c10b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 1603916cca..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index accc1eee27..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 90f6de86ac..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 3f7a90b3dc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index ab91498132..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index e4f83656de..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9f4857f703..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index 4b06251414..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index be039748fc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 42f2f1a603..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index a852aeda56..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
deleted file mode 100644
index d5a1ff7410..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
deleted file mode 100644
index c4da99145d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
deleted file mode 100644
index 20a92c9dc7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
deleted file mode 100644
index 73d078674c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/tags/java/sca/1.3/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
deleted file mode 100644
index 9c6b0a2b34..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
deleted file mode 100644
index d05e4712a1..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-public class ConversationWSDLTestCase {

-

-    private SCANode2 node; 

-    private ConversationalClient conversationalStatelessClientStatefulService;    

-

-    @Before

-    public void setUp() throws Exception {

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-        node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),

-                                         new SCAContribution("TestContribution", 

-                                                                     new File("src/main/resources/ConversationalWSDL").toURL().toString()));

-                

-         

-        node.start();

-        

-        conversationalStatelessClientStatefulService = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
deleted file mode 100644
index 7eec461476..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class NonConversationalCallbackTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatelessService");

-	

-	    conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientStatefulService");

-	

-	    conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatelessService");

-	

-	    conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatefulClientStatefulService");

-	    conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-	                                                                          "ConversationalStatelessClientRequestService");

-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
deleted file mode 100644
index 39ab4319f7..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class RequestScopeTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
deleted file mode 100644
index 28df937283..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatefulTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
deleted file mode 100644
index 02295b0ca6..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatefulStatelessTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
deleted file mode 100644
index fce6ee0d50..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatefulTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/tags/java/sca/1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
deleted file mode 100644
index 6df7767823..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class StatelessStatelessTestCase {

-

-    private static SCANode2 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 {

-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),

-                                             new SCAContribution("TestContribution", 

-                                                                 new File("src/main/resources/Conversational").toURL().toString()));

-                    

-             

-            node.start();

-            

-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatelessService");

-        

-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientStatefulService");

-        

-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatelessService");

-        

-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatefulClientStatefulService");

-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 

-                                                                                  "ConversationalStatelessClientRequestService");

-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)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/tags/java/sca/1.3/itest/conversations/pom.xml b/tags/java/sca/1.3/itest/conversations/pom.xml
deleted file mode 100644
index 5c8ec2cbc5..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-conversations</artifactId>
-    <name>Apache Tuscany SCA Conversations Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
deleted file mode 100644
index a3b83dfc14..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.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;
-
-import java.io.Serializable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Record implements Serializable {
-    public String id;
-    public String conversationId;
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
deleted file mode 100644
index 8e98b9cbd4..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.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;
-
-import java.util.Hashtable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestResult {
-    public static Hashtable<Object, Boolean> results = new Hashtable<Object, Boolean>();
-    private static int completed = 0;
-    public static synchronized void updateCompleted() {
-        ++completed;
-    }
-    
-    public static synchronized int getCompleted() {
-        return completed;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
deleted file mode 100644
index e7583c339a..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/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.itest.conversational;

-

-import org.osoa.sca.annotations.Conversational;

-

-/**

- * Simple conversational Service that uses another Conversational Service

- */

-@Conversational

-public interface AService {

-

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    String getState();

-

-    /**

-     * Returns the state for the other service that this service is using

-     * 

-     * @return The state for the other service that this service is using

-     */

-    String getStateOnB();

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    void setState(String aState);

-

-    /**

-     * Sets the state for the other service that this service is using

-     * 

-     * @param aState The state for the other service that this service is using

-     */

-    void setStateOnB(String aState);

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
deleted file mode 100644
index bc4a5fc571..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.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.conversational;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Alpha {
-    @OneWay
-    void run(int param);
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
deleted file mode 100644
index 77d7f4c007..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.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.osoa.sca.annotations.Conversational;

-

-/**

- * Simple conversational Service

- */

-@Conversational

-public interface BService {

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    String getState();

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    void setState(String aState);

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
deleted file mode 100644
index e422938b27..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.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.conversational;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Beta {
-    CallableReference<Gamma> getRef(int param);
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
deleted file mode 100644
index a6dbf56797..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Conversational
-public interface CService {
-
-    String getState();
-
-    void setState(String aState);
-    
-    Object getConversationID();
-    
-    Object getConversationObjectConversationId();
-        
-    void setConversationID(String theID);
-    
-    void endConversation();
-    
-    void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
deleted file mode 100644
index 3f04e9f09e..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.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.conversational;

-

-public interface Constants {

-

-    String A_INITIAL_VALUE = "Initial Value of A";

-    String B_INITIAL_VALUE = "Initial Value of B";

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.annotations.Conversational;

-

-@Conversational

-public interface ConversationIdService {

-

-    String getCIDField();

-    String getCIDSetter();

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index 8cad88d2f4..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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 Exception;        

-    

-    @EndsConversation

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 546382cfd1..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.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.itest.conversational;

-

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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 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();

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index f1a21cc18f..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.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.itest.conversational;

-

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Conversational;

-import org.osoa.sca.annotations.EndsConversation;

-import org.osoa.sca.annotations.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 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();

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
deleted file mode 100644
index 74afbfb763..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.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.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-
-/**
- * Simple conversational Service
- */
-@Conversational
-public interface DService {
-    
-    /**
-     * Returns the state for this service.
-     * 
-     * @return The state for this service
-     */
-    String getState();
-
-    /**
-     * Sets the state for this service.
-     * 
-     * @param aState The state for this service
-     */
-    void setState(String aState);
-    
-    @EndsConversation
-    void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
deleted file mode 100644
index 5f97b16088..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.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;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-@Conversational
-public interface Gamma {
-    void start(int param);
-
-    boolean hasNext();
-
-    Record next();
-
-    @EndsConversation
-    void stop();
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index 3ce3e3ada7..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.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.conversational;

-

-import org.osoa.sca.annotations.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 init();

-    

-    public void destroy();

-    

-    public void initializeCount(int count);

-    

-    public void incrementCount();

-    

-    public int retrieveCount();

-    

-    public void businessException() throws Exception;        

-    

-    public String endConversation();

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
deleted file mode 100644
index 95c9c7ae6e..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.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.conversational.impl;

-

-import java.lang.reflect.Proxy;

-import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler;

-

-import org.apache.tuscany.sca.itest.conversational.AService;

-import org.apache.tuscany.sca.itest.conversational.BService;

-import org.apache.tuscany.sca.itest.conversational.Constants;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-/**

- * Simple conversational Service that uses another Conversational Service

- */

-@Service(AService.class)

-@Scope("CONVERSATION")

-public class AServiceImpl implements AService {

-

-    /**

-     * The state 

-     */

-    private String state = Constants.A_INITIAL_VALUE;

-    

-    /**

-     * The reference to the other service

-     */

-    private BService b;

-    

-    /**

-     * Constructor

-     *

-     */

-    public AServiceImpl() {

-        System.out.println("---> AServiceImpl constructor for " + this);

-    }

-

-    /**

-     * Inject the reference to the other service

-     * @param aB The other service.

-     */

-    @Reference(name="b")

-    public void setB(BService aB) {

-        System.out.println("---> Setting reference to B on " + this + " to " + aB);

-        this.b = aB;

-    }

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    public String getState() {

-        return state;

-    }

-

-    /**

-     * Returns the state for the other service that this service is using

-     * 

-     * @return The state for the other service that this service is using

-     */

-    public String getStateOnB() {

-        return b.getState();

-    }

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    public void setState(String aState) {

-        this.state = aState;

-    }

-

-    /**

-     * Sets the state for the other service that this service is using

-     * 

-     * @param aState The state for the other service that this service is using

-     */

-    public void setStateOnB(String aState) {

-        b.setState(aState);

-    }

-    

-    /**

-     * Sets the conversation ID for this service

-     * @param id The Conversation ID

-     */

-    @ConversationID

-    public void setConversationID(String id) {

-        System.out.println("Conversation ID for " + this + " is set to " + id);

-    }

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
deleted file mode 100644
index a5f37f7a52..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.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.conversational.impl;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.apache.tuscany.sca.itest.conversational.Alpha;
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Alpha.class)
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
-    @Reference
-    public Beta beta;
-    
-    @Context
-    protected ComponentContext componentContext;
-    
-    public void run(int param) {
-        CallableReference<Gamma> gammaRef = null;
-        boolean testPassed = true;
-        try {
-            gammaRef = beta.getRef(param);
-            while (gammaRef.getService().hasNext()) {
-                Record record = gammaRef.getService().next();
-                if (!record.conversationId.equals(gammaRef.getConversation().getConversationID())) {
-                    // Record returned is not from this conversation.
-                    testPassed = false;
-                }
-            }
-        } catch (Exception ex) {
-            testPassed = false;
-            ex.printStackTrace();
-        } finally {
-            TestResult.updateCompleted();
-            if (gammaRef != null) {
-                TestResult.results.put(gammaRef.getConversation()
-                        .getConversationID(), testPassed);
-                gammaRef.getService().stop();
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
deleted file mode 100644
index c1e27641ef..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/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.itest.conversational.impl;

-

-

-import org.apache.tuscany.sca.itest.conversational.BService;

-import org.apache.tuscany.sca.itest.conversational.Constants;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-/**

- * Simple conversational Service

- */

-@Service(BService.class)

-@Scope("CONVERSATION")

-public class BServiceImpl implements BService {

-

-    /**

-     * The state for this service

-     */

-    private String state = Constants.B_INITIAL_VALUE;

-

-    /**

-     * Constructor

-     */

-    public BServiceImpl() {

-        System.out.println("---> BServiceImpl constructor for " + this);

-    }

-    

-    /**

-     * Returns the state for this service.

-     * 

-     * @return The state for this service

-     */

-    public String getState() {

-        return state;

-    }

-

-    /**

-     * Sets the state for this service.

-     * 

-     * @param aState The state for this service

-     */

-    public void setState(String aState) {

-        this.state = aState;

-    }

-

-    /**

-     * Sets the conversation ID for this service

-     * @param id The Conversation ID

-     */

-    @ConversationID

-    public void setConversationID(String id) {

-        System.out.println("Conversation ID for " + this + " is set to " + id);

-    }

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
deleted file mode 100644
index 900b8f743f..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.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.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Beta.class)
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta {
-    @Context
-    protected ComponentContext componentContext;
-
-    @Reference
-    public Gamma gamma;
-
-    public CallableReference<Gamma> getRef(int param) {
-        ServiceReference<Gamma> gammaRef = componentContext
-                .getServiceReference(Gamma.class, "gamma");
-        Gamma g = gammaRef.getService();
-        g.start(param);
-        return gammaRef;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
deleted file mode 100644
index b21f956bd9..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.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.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.CService;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
-    private ServiceReference<DService> dServiceRef;
-
-    @Reference(name = "d")
-    public void setD(ServiceReference<DService> servRef) {
-        this.dServiceRef = servRef;
-    }
-
-    public String getState() {
-        return dServiceRef.getService().getState();
-    }
-
-    public void setState(String aState) {
-        dServiceRef.getService().setState(aState);
-    }
-
-
-    /*
-     * When the coversationId is set manually the client may access the 
-     * conversation id that will be used by the reference using 
-     * ServiceReference.getConversationId()
-     */
-    public Object getConversationID() {
-        return dServiceRef.getConversationID();
-    }
-    
-    /*
-     * Whether the conversation ID is chosen by the client or is generated by
-     * the system, the client may access the conversation ID by calling
-     * Conversation.getConversationID().
-     */    
-    public Object getConversationObjectConversationId() {
-        // TODO Auto-generated method stub
-        if (dServiceRef.getConversation() != null){
-            return dServiceRef.getConversation().getConversationID();
-        } else {
-            return null;
-        }
-    }
-
-    public void endConversation() {
-        dServiceRef.getConversation().end();
-    }
-
-    public void endConversationViaAnnotatedMethod() {
-        dServiceRef.getService().endConversationViaAnnotatedMethod();
-    }
-
-    public void setConversationID(String theID) {
-        dServiceRef.setConversationID(theID);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 9deef312ac..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.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.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class ConversationAgeComponentImpl implements ConversationalService {
-
-    private int count;
-    
-    public void businessException() throws Exception {   
-    }
-    
-    public void businessExceptionCallback() throws Exception {   
-    }      
-
-    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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index cffa76186a..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 1272c7ab7f..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.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.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class ConversationMaxIdleComponentImpl implements ConversationalService {
-
-    private int count;
-
-    public void businessException() throws Exception {   
-    }
-    
-    public void businessExceptionCallback() throws Exception {   
-    }    
-    
-    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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 847b038881..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index b77e4c0194..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.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.itest.conversational.impl;

-

-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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index 5b3906fc2c..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.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.osoa.sca.ComponentContext;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.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 Exception {

-        throw new Exception("Business Exception");

-    }     

-    

-    public String endConversation(){

-        calls.append("endConversation,");

-        callbackCount = 0;

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3/itest/conversations/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.osoa.sca.CallableReference;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9a25f0f59a..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 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();

-    }   

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index efcbdff06f..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 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();

-    }

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index 8454b3846b..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.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.itest.conversational.impl;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationAttributes;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 Exception {

-        throw new Exception("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 Exception {

-        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/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 07186c91e1..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.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.itest.conversational.impl;

-

-import java.util.HashMap;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.Destroy;

-import org.osoa.sca.annotations.Init;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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("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();

-    }   

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index 344aa99dff..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.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.itest.conversational.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.itest.conversational.ConversationalService;

-import org.osoa.sca.annotations.ConversationID;

-import org.osoa.sca.annotations.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 Exception {

-        throw new Exception("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 Exception {

-        throw new Exception("Business Exception");

-    }    

-

-    public int retrieveCount() {

-        return state.get(cid);

-    }

-

-    public int retrieveCountCallback() {

-        // TODO Auto-generated method stub

-        return 0;

-    }

-    

-}

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
deleted file mode 100644
index 8d79bb75e8..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.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.itest.conversational.impl;
-
-
-import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service
- */
-@Service(DService.class)
-@Scope("CONVERSATION")
-public class DServiceImpl implements DService {
-
-    /**
-     * The state for this service
-     */
-    private String state = "Initial state value";
-
-    /**
-     * Returns the state for this service.
-     * 
-     * @return The state for this service
-     */
-    public String getState() {
-        return state;
-    }
-
-    /**
-     * Sets the state for this service.
-     * 
-     * @param aState The state for this service
-     */
-    public void setState(String aState) {
-        this.state = aState;
-    }
-
-    /**
-     * Sets the conversation ID for this service
-     * @param id The Conversation ID
-     */
-    @ConversationID
-    public void setConversationID(String id) {
-        System.out.println ("Setting conversation ID at service = " + id );
-    }
-    
-    public void endConversationViaAnnotatedMethod() {
-        System.out.println ("Annotated Ends Conversation");
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
deleted file mode 100644
index d1b769216b..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.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.itest.conversational.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Gamma.class)
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma {
-    @ConversationID
-    public String conversationId;
-
-    private ArrayList<Record> list;
-    
-    public void start(int param) {
-        list = new ArrayList<Record>();
-        fillList(param, conversationId);
-    }
-
-    public boolean hasNext() {
-        return !list.isEmpty();
-    }
-
-    public Record next() {
-        return list.remove(0);
-    }
-
-    public void stop() {
-        list = null;
-    }
-    
-    private void fillList(int param, String cid) {
-        for (int i = 0; i < param; i++) {
-            Record record = new Record();
-            record.id = "id_" + i;
-            record.conversationId = cid;
-            list.add(record);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationAge.composite
deleted file mode 100644
index abd1c35ced..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationAge.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"

-	name="ConversationalIdTest">

- 	      

-    <component name="ConversationAgeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationAgeComponentImpl"/>

-	</component>          

-     

-    <component name="ConversationIdleComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationMaxIdleComponentImpl"/>

-	</component>          

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationUniqueId.composite
deleted file mode 100644
index 831449a079..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/resources/ConversationUniqueId.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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://conversations"
-    name="ConversationUniqueIdTest">
-
-    <component name="Alpha">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.AlphaImpl"/>
-        <service name="Alpha">
-            <binding.sca />
-        </service>
-        <reference name="beta" target="Beta">
-            <binding.sca/>
-        </reference>
-    </component>
-
-    <component name="Beta">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.BetaImpl"/>
-        <service name="Beta">
-            <binding.sca />
-        </service>
-        <reference name="gamma" target="Gamma">
-            <binding.sca />
-        </reference>
-    </component>
-
-    <component name="Gamma">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.GammaImpl"/>
-        <service name="Gamma">
-            <binding.sca/>
-        </service>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationId.composite
deleted file mode 100644
index e61eb08194..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationId.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="ConversationalIdTest">

- 	      

-    <component name="ConversationIdComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationIdComponentImpl"/>

-	</component>          

-     

-</composite>

diff --git a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationLifetime.composite
deleted file mode 100644
index 3b79dc43d9..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversationLifetime.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://conversations"
-	name="conversationLifetimeTest">
-
-    <component name="ConversationalCComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.CServiceImpl"/>
-        <reference name="d" target="ConversationalDComponent" />
-    </component>
-
-    <component name="ConversationalDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.DServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/1.3/itest/conversations/src/main/resources/conversational.composite
deleted file mode 100644
index 4da3ce74d5..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/main/resources/conversational.composite
+++ /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.

--->

-<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"/>

-		<reference name="conversationalService2" target="ConversationalServiceStatelessSL"/>

-    </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"/>

-        <reference name="conversationalService2" target="ConversationalServiceStateful"/>        

-    </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"/>

-        <reference name="conversationalService2" target="ConversationalServiceStatelessSL"/>        

-    </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"/>

-        <reference name="conversationalService2" target="ConversationalServiceStateful"/>        

-    </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"/>

-		<reference name="conversationalService2" target="ConversationalServiceRequest"/>

-    </component> 

-    

-    <component name="ConversationalStatefulClientNonConversationalCallbackStatefulService">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>

-        <reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>       

-        <reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback"/>

-        <reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback"/>        

-    </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"/>

-	</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"/>

-    </component> 

-

-    <component name="ConversationalServiceRequest">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>

-    </component> 

-    

-    <component name="ConversationalServiceStatefulNonConversationalCallback">

-		<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>

-	</component>

-

-    <component name="ConversationalAComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.AServiceImpl"/>

-        <reference name="b" target="ConversationalBComponent" />

-    </component>

-

-    <component name="ConversationalBComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.BServiceImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
deleted file mode 100644
index 3e750bdd1e..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.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.conversational;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationIdTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversationId.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testConversationId() {
-        ConversationIdService service =
-            domain.getService(ConversationIdService.class, "ConversationIdComponent");
-        Assert.assertNotNull(service.getCIDField());
-        Assert.assertNotNull(service.getCIDSetter());
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
deleted file mode 100644
index 326a833a42..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.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.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationLifetimeTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversationLifetime.composite");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    /**
-     * Following a clarification re. the wording of the Java Common Annotations and APIs 1.00 Specification
-     * (see TUSCANY-2055) the following is accepted to be the intended operation
-     * 
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * 
-     * ServiceReference.getConversationID() - Returns the id supplied by the user that will be associated with
-     * future conversations initiated through this reference, or null if no ID has been set by the user.
-     * 
-     * ServiceReference.setConversationID(Object conversationId) - Set an ID, supplied by the user, to associate with any future 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. 
-     * 
-     */
-
-    /**
-     * Verify that ServiceReference.getConversationID() returns null before a conversation
-     * ID has been set manually.
-     */
-    @Test
-    public void getConversationID() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Assert.assertNull(service.getConversationID());
-    }
-
-    /**
-     * Verify that ServiceReference.getConversationID() returns any value previous set through the
-     * setConversationID() API.
-     */
-    @Test
-    public void getConversationID2() {
-        String userProvidedID = "A conversation ID";
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID(userProvidedID);
-        service.getState();
-        Assert.assertEquals(service.getConversationID(), userProvidedID);
-    }
-    
-    /**
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * Here test the manually set conversationID
-     */
-    @Test
-    public void getConversationID3() {
-        String userProvidedID = "A conversation ID";
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID(userProvidedID);
-        service.getState();
-        Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID);
-    }
-    
-    /**
-     * Whether the conversation ID is chosen by the user or is generated by the system, the client
-     * may access the conversation ID by calling getConversationID() on the current conversation object.
-     * Here test the auto generated conversationId
-     */
-    @Test
-    public void getConversationID4() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Assert.assertNotNull(service.getConversationObjectConversationId());
-    }    
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 494-495 Verify:
-     * 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 implicitStartNewConversationAfterEnd() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Object firstID = service.getConversationObjectConversationId();
-        service.endConversationViaAnnotatedMethod();
-        service.getState();
-        Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-495 Verify: If a
-     * method is invoked on a service reference after an "@EndsConversation"
-     * method has been called then a new conversation will automatically be
-     * started. Note: Uses Conversation.end() rather than "@EndsConversation"
-     */
-    @Test
-    public void implicitStartNewConversationAfterEnd2() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        Object firstID = service.getConversationObjectConversationId();
-        service.endConversation();
-        service.getState();
-        Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
-     * 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 nullConversationIDAfterEndConversation() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        service.endConversationViaAnnotatedMethod();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
-     * If ServiceReference.getConversationID() is called after the
-     * "@EndsConversation" method is called, but before the next conversation
-     * has been started, it will return null.  Note: Uses explicit set of Conversation ID
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation1a() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID("User provided ID");
-        service.getState();
-        service.endConversationViaAnnotatedMethod();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
-     * ServiceReference.getConversationID() is called after the
-     * "@EndsConversationmethod" is called, but before the next conversation has
-     * been started, it will return null. Note: Uses Conversation.end() rather
-     * than "@EndsConversation"
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation2() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.getState();
-        service.endConversation();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-    
-    /**
-     * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
-     * ServiceReference.getConversationID() is called after the
-     * "@EndsConversationmethod" is called, but before the next conversation has
-     * been started, it will return null. Note: Uses Conversation.end() rather
-     * than "@EndsConversation".  Note 2: Uses explicit set of Conversation ID
-     */
-    @Test
-    public void nullConversationIDAfterEndConversation2a() {
-        CService service = domain.getService(CService.class, "ConversationalCComponent");
-        service.setConversationID("User provided ID");
-        service.getState();
-        service.endConversation();
-        Assert.assertNull(service.getConversationObjectConversationId());
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
deleted file mode 100644
index 431962221a..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationUniqueIdTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("ConversationUniqueId.composite");
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testConversationUniqueId() {
-        Alpha alpha = domain.getService(Alpha.class, "Alpha");
-        int numConversations = 3;
-        
-        for(int i = 0; i < numConversations; ++i) {
-            alpha.run(5);
-        }
-        
-        // Wait for the conversations to complete
-        while (TestResult.getCompleted() < numConversations) {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-            }
-        }
-        
-        Assert.assertEquals(TestResult.results.size(), numConversations);
-        for(Boolean value : TestResult.results.values()) {
-            Assert.assertTrue(value);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
deleted file mode 100644
index cc31c77873..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.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.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ConversationEndedException;
-
-public class ConversationalAgeTestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2");        
-        domain = SCADomain.newInstance("ConversationAge.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval");        
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testMaxAge() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(500);
-        try {
-            Assert.assertEquals(42, conversationalService.retrieveCount());
-        } catch (ConversationEndedException e) {
-            Assert.fail();
-        }
-    }
-
-    @Test
-    public void testAgeExpired() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(1100);
-        try {
-            Assert.assertEquals(0, conversationalService.retrieveCount());
-            Assert.fail();
-        } catch (ConversationEndedException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testMaxIdle() throws InterruptedException {
-
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationIdleComponent");
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-        conversationalService.initializeCount(42);
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Assert.assertEquals(42, conversationalService.retrieveCount());
-        Thread.sleep(1100);
-        try {
-            Assert.assertEquals(0, conversationalService.retrieveCount());
-        } catch (ConversationEndedException e) {
-            // expected
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
deleted file mode 100644
index 8480e04028..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.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.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationalJ2SETestCase {
-
-    private SCADomain domain;
-
-    @Before
-    public void setUp() throws Exception {
-        domain = SCADomain.newInstance("conversational.composite");
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-
-    @Test
-    public void testStatefulConversation() {
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationalServiceStateful");
-
-        conversationalService.initializeCount(1);
-        Assert.assertEquals(1, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(2, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-        Assert.assertEquals(0, conversationalService.retrieveCount());
-
-        conversationalService.initializeCount(4);
-        Assert.assertEquals(4, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(5, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-    }
-
-    @Test
-    public void testStatelessConversation() {
-        ConversationalService conversationalService =
-            domain.getService(ConversationalService.class, "ConversationalServiceStateless");
-
-        conversationalService.initializeCount(1);
-        Assert.assertEquals(1, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(2, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-        conversationalService.initializeCount(4);
-        Assert.assertEquals(4, conversationalService.retrieveCount());
-        conversationalService.incrementCount();
-        Assert.assertEquals(5, conversationalService.retrieveCount());
-        conversationalService.endConversation();
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
deleted file mode 100644
index da359bc296..0000000000
--- a/tags/java/sca/1.3/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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 junit.framework.Assert;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-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.ConversationalServiceStatefulNonConversationalCallbackImpl;

-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class ConversationalTestCase {

-

-    private static SCADomain domain;

-    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 {

-	        domain = SCADomain.newInstance("conversational.composite");

-	

-	        conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientStatelessService");

-	

-	        conversationalStatelessClientStatefulService  = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientStatefulService");

-	

-	        conversationalStatefulClientStatelessService  = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientStatelessService");

-	

-	        conversationalStatefulClientStatefulService   = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientStatefulService");

-	        conversationalStatelessClientRequestService    = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatelessClientRequestService");

-	        conversationalStatefulClientNonConversationalCallbackStatelessService    = domain.getService(ConversationalClient.class,

-	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");

-        

-    	} catch(Exception ex) {

-    		System.err.println(ex.toString());

-    	}

-               

-    }

-

-    @AfterClass

-    public static void tearDown() throws Exception {

-        domain.close();

-    }

-    

-    private 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();

-        ConversationalServiceStatefulNonConversationalCallbackImpl.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);

-    }    

-

-    // 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);

-    }     

-

-    // 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);

-    }    

-   

-    // 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);

-    }      

-    

-    // 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("initializeCount,incrementCount,retrieveCount,endConversation,", 

-        		            ConversationalServiceRequestImpl.calls.toString());

-    }     

-

-    @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);

-    }    

-    

-    // 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();

-    	conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();

-        Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", 

-        		            ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());

-    }  

-

-    @Test

-    public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {

-        resetCallStack();

-        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);

-    }    

-

-    private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A";

-    private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B";

-    private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A";

-    private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B";

-    

-    @Test

-    public void testMultipleConversations() {

-        //////////

-        // Tests on first instance

-        //////////

-        System.out.println("========= First instance tests =========");

-        AService aService = domain.getService(AService.class, "ConversationalAComponent");

-        

-        // Make sure initial values are correct

-        Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState());

-        Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB());

-

-        // Set some new values

-        aService.setState(NEW_A_VALUE);

-        aService.setStateOnB(NEW_B_VALUE);

-        

-        // Verify the set worked

-        Assert.assertEquals(NEW_A_VALUE, aService.getState());

-        Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());

-

-        

-        //////////

-        // Tests on second instance

-        //////////

-        System.out.println("========= Second instance tests =========");

-

-        // Do another look up

-        AService aService2 = domain.getService(AService.class, "ConversationalAComponent");

-

-        // Make sure initial values are correct on the second instance

-        Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState());

-        Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB());

-        

-        // Set some new values on the second instance

-        aService2.setState(SECOND_NEW_A_VALUE);

-        aService2.setStateOnB(SECOND_NEW_B_VALUE);

-    

-        // Verify the set worked on the second instance

-        Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState());

-        Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB());

-

-        // Verify the values have not been changed on the first instance

-        Assert.assertEquals(NEW_A_VALUE, aService.getState());

-        Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());

-        

-        System.out.println("========= Done instance tests =========");

-    }

-        

-}

diff --git a/tags/java/sca/1.3/itest/databindings/common/pom.xml b/tags/java/sca/1.3/itest/databindings/common/pom.xml
deleted file mode 100644
index 7b87c331d3..0000000000
--- a/tags/java/sca/1.3/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>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-common</artifactId>
-    <version>1.3</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-incubating</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-incubating</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/tags/java/sca/1.3/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/tags/java/sca/1.3/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
deleted file mode 100644
index adb546a1ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
deleted file mode 100644
index b2346aa973..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
deleted file mode 100644
index 88616cc997..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
deleted file mode 100644
index 77a12e92ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
deleted file mode 100644
index ee73db6152..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
deleted file mode 100644
index aab564dc1e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
deleted file mode 100644
index 5507a0b747..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/generate.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/generate/generate.xsd
deleted file mode 100644
index 1fabedf55f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
deleted file mode 100644
index 8927d725b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Annotation.xml
deleted file mode 100644
index f1f4346e58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
deleted file mode 100644
index 1fae43eb09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Attribute.xml
deleted file mode 100644
index c20c80b658..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
deleted file mode 100644
index bd3db2e030..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
deleted file mode 100644
index 30e4979dca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
deleted file mode 100644
index e7738dcff7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
deleted file mode 100644
index 9552421e2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
deleted file mode 100644
index c7b9655749..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
deleted file mode 100644
index 5e5e7fbd55..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
deleted file mode 100644
index 5c455c2ab5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
deleted file mode 100644
index 635e851632..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
deleted file mode 100644
index 004dab4fbb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
deleted file mode 100644
index 136092951b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
deleted file mode 100644
index 796f08e1cf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
deleted file mode 100644
index 927b94885c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
deleted file mode 100644
index 93f83cd0a1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
deleted file mode 100644
index ea7db70595..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
deleted file mode 100644
index c64323e7e1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
deleted file mode 100644
index 85c7d85fd4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
deleted file mode 100644
index 543f276c50..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
deleted file mode 100644
index fcd281539b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
deleted file mode 100644
index 1610c2b861..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
deleted file mode 100644
index 36a0760a61..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
deleted file mode 100644
index 999b72bb35..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
deleted file mode 100644
index 5849165fe0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
deleted file mode 100644
index 71dad561ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
deleted file mode 100644
index 8acf9376d7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
deleted file mode 100644
index a49987c352..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
deleted file mode 100644
index a35b6e174a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
deleted file mode 100644
index e1995890f9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
deleted file mode 100644
index 91cfce51b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
deleted file mode 100644
index a2f86ba8c5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
deleted file mode 100644
index 907474cd1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
deleted file mode 100644
index a2f6bcfa77..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
deleted file mode 100644
index c5820e1a2e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
deleted file mode 100644
index f4d596bfe3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
deleted file mode 100644
index 0debe2fec5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
deleted file mode 100644
index b5bcfdcfd4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
deleted file mode 100644
index 7f001254cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
deleted file mode 100644
index 8d4d106f59..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
deleted file mode 100644
index f875b9f94d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
deleted file mode 100644
index 4c8a39b06c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
deleted file mode 100644
index 7d343d6dda..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
deleted file mode 100644
index bb12bc04a9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
deleted file mode 100644
index 7a81f3b0dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
deleted file mode 100644
index f0e1c21233..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
deleted file mode 100644
index d35568b3c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
deleted file mode 100644
index 92bd9a4b66..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
deleted file mode 100644
index 52cdfa8c4e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
deleted file mode 100644
index 78d001a585..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
deleted file mode 100644
index 2609a858f7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
deleted file mode 100644
index 38f6c55059..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
deleted file mode 100644
index 7868a47ca3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
deleted file mode 100644
index 0d65b124ff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
deleted file mode 100644
index 3f5080d49f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
deleted file mode 100644
index 340555dc5f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
deleted file mode 100644
index 0deb7af980..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
deleted file mode 100644
index 8059fe6da0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
deleted file mode 100644
index 06c92ce19b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
deleted file mode 100644
index 7b1f02d1d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
deleted file mode 100644
index 9bc0cefd0f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
deleted file mode 100644
index 0c207983bc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
deleted file mode 100644
index f91b602f99..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
deleted file mode 100644
index b99bf01b73..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
deleted file mode 100644
index c99698e175..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
deleted file mode 100644
index b5b9b0d1eb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
deleted file mode 100644
index 80d22ce057..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
deleted file mode 100644
index 4902935db5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
deleted file mode 100644
index 664bf824b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
deleted file mode 100644
index 5d3658d224..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
deleted file mode 100644
index c5861fa92a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
deleted file mode 100644
index 0aa4710057..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
deleted file mode 100644
index 1f95950394..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
deleted file mode 100644
index 6ee9c435db..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
deleted file mode 100644
index 0297f1aeb4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
deleted file mode 100644
index 56d027bdbb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
deleted file mode 100644
index 81ba1069bd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
deleted file mode 100644
index 866ab73024..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
deleted file mode 100644
index 8bb3a08b94..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
deleted file mode 100644
index c7c62f812b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
deleted file mode 100644
index 8235718c5e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
deleted file mode 100644
index 36caba2f16..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
deleted file mode 100644
index 599c428a44..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
deleted file mode 100644
index 389d5a99f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
deleted file mode 100644
index 919c4a20ee..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
deleted file mode 100644
index 59887078b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
deleted file mode 100644
index 79011f26ab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
deleted file mode 100644
index 5de7d64d7b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
deleted file mode 100644
index c40be9e18b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
deleted file mode 100644
index d4a78787b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
deleted file mode 100644
index c30434de66..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
deleted file mode 100644
index 5381590cd1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
deleted file mode 100644
index 4cd6ea7e72..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
deleted file mode 100644
index e8faf6225b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
deleted file mode 100644
index b4375467c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
deleted file mode 100644
index a4f564d9b7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
deleted file mode 100644
index d30ab85530..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
deleted file mode 100644
index 8abb34b5a5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
deleted file mode 100644
index 7fd9a061ae..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
deleted file mode 100644
index 1615976813..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
deleted file mode 100644
index cd567ba528..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
deleted file mode 100644
index 0beaac571f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
deleted file mode 100644
index 025362defb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
deleted file mode 100644
index d6d951fe5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
deleted file mode 100644
index 5736a8c121..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
deleted file mode 100644
index 242be1d53b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
deleted file mode 100644
index d728115a77..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
deleted file mode 100644
index 108e3a8619..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
deleted file mode 100644
index d4ffae5e17..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
deleted file mode 100644
index 5ee5e0229e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
deleted file mode 100644
index 3d5aed5aa8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
deleted file mode 100644
index e7b80ab11c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
deleted file mode 100644
index 2b4fe5594e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
deleted file mode 100644
index fc4deb63c2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
deleted file mode 100644
index 03570f41d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
deleted file mode 100644
index c754502645..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
deleted file mode 100644
index 4603793bfc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
deleted file mode 100644
index 4bcd2f8c46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
deleted file mode 100644
index a6861f803a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
deleted file mode 100644
index 8bb251cab2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
deleted file mode 100644
index 467ec007ed..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
deleted file mode 100644
index 8d00646678..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
deleted file mode 100644
index 7deafd798a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
deleted file mode 100644
index 72ac75fee0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
deleted file mode 100644
index f6208f81b3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
deleted file mode 100644
index 1f26e13673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
deleted file mode 100644
index 97de7b98eb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
deleted file mode 100644
index 67716553d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
deleted file mode 100644
index 5941348921..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
deleted file mode 100644
index 24d5d09054..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
deleted file mode 100644
index f684d06a4d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
deleted file mode 100644
index de4a8a666d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
deleted file mode 100644
index 242908bd27..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
deleted file mode 100644
index 4c00fbe295..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
deleted file mode 100644
index 925e8625d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
deleted file mode 100644
index b12bec040b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
deleted file mode 100644
index c73708ce46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
deleted file mode 100644
index 795c3ea7d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
deleted file mode 100644
index 3ebdc89ae0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
deleted file mode 100644
index 21546d0f67..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
deleted file mode 100644
index 89657e42ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
deleted file mode 100644
index d01b4172e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
deleted file mode 100644
index 82fd1eedaf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
deleted file mode 100644
index e1dcf06194..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
deleted file mode 100644
index ebf03c9d5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
deleted file mode 100644
index 8b9ba5b4b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
deleted file mode 100644
index 26466b1b39..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
deleted file mode 100644
index ff418c56ab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
deleted file mode 100644
index 27bb1ce9cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
deleted file mode 100644
index 2bf1df8c99..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
deleted file mode 100644
index 9b5561ed43..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
deleted file mode 100644
index 0b4e7bdf45..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
deleted file mode 100644
index f1b7cd264c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
deleted file mode 100644
index a2c8456257..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
deleted file mode 100644
index 1f60b0423f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
deleted file mode 100644
index 21e55ab8c1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
deleted file mode 100644
index 30762f4912..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
deleted file mode 100644
index 5bf35d0d70..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
deleted file mode 100644
index 2dd01e4090..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
deleted file mode 100644
index 6920cd8dd0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
deleted file mode 100644
index 6a526bdc47..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
deleted file mode 100644
index 1117a95eb8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
deleted file mode 100644
index ab91458bff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
deleted file mode 100644
index 3e015843b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
deleted file mode 100644
index b6d68fd08a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
deleted file mode 100644
index d4453a4477..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
deleted file mode 100644
index 6de3adc937..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
deleted file mode 100644
index 786ab226da..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
deleted file mode 100644
index 64093aa803..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
deleted file mode 100644
index 01f4c2b1ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
deleted file mode 100644
index 774646f682..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
deleted file mode 100644
index 34da37564c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
deleted file mode 100644
index a1fb3aa803..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
deleted file mode 100644
index 8eb7a4fce4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
deleted file mode 100644
index f68eb1939d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
deleted file mode 100644
index b9f77e6658..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Import.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Import.xml
deleted file mode 100644
index fd28850050..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Import.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Import.xsd
deleted file mode 100644
index eae93fd44a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
deleted file mode 100644
index a7e568decf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Include.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Include.xml
deleted file mode 100644
index d4b9e24fa6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Include.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Include.xsd
deleted file mode 100644
index 34ff314a19..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Interop.xsd
deleted file mode 100644
index ae22ab2c44..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Notation.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Notation.xml
deleted file mode 100644
index b75ac6500a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Notation.xsd
deleted file mode 100644
index 6ad019cb81..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Person.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/Person.xsd
deleted file mode 100644
index 5f5021b15e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
deleted file mode 100644
index 6c5ad88ff4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
deleted file mode 100644
index 6b7e39b334..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
deleted file mode 100644
index f9d4a24a49..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
deleted file mode 100644
index f649e2ba83..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
deleted file mode 100644
index 410df4b7e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
deleted file mode 100644
index 5d27ef5ce1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
deleted file mode 100644
index 7b74867c03..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
deleted file mode 100644
index ec16a678a3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
deleted file mode 100644
index 708d526f44..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
deleted file mode 100644
index ed681009f9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
deleted file mode 100644
index e404ac86b7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
deleted file mode 100644
index af0431f048..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
deleted file mode 100644
index c86a0f6bcb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
deleted file mode 100644
index 89b00a36cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
deleted file mode 100644
index 399b0d8175..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
deleted file mode 100644
index ea35bec61a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
deleted file mode 100644
index bc8cf35368..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
deleted file mode 100644
index 57981e3666..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
deleted file mode 100644
index da2929776e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
deleted file mode 100644
index ace5427786..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/tags/java/sca/1.3/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/tags/java/sca/1.3/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
deleted file mode 100644
index fa3f310d4d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/config.png b/tags/java/sca/1.3/itest/databindings/config.png
deleted file mode 100644
index 7912019e9d..0000000000
--- a/tags/java/sca/1.3/itest/databindings/config.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/databindings/config.svg b/tags/java/sca/1.3/itest/databindings/config.svg
deleted file mode 100644
index aaf027e2df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/databinding.png b/tags/java/sca/1.3/itest/databindings/databinding.png
deleted file mode 100644
index 76a9c71b7d..0000000000
--- a/tags/java/sca/1.3/itest/databindings/databinding.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/databindings/databinding.svg b/tags/java/sca/1.3/itest/databindings/databinding.svg
deleted file mode 100644
index d6850ccf7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop.png b/tags/java/sca/1.3/itest/databindings/interop.png
deleted file mode 100644
index 005e0f24ea..0000000000
--- a/tags/java/sca/1.3/itest/databindings/interop.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/databindings/interop.svg b/tags/java/sca/1.3/itest/databindings/interop.svg
deleted file mode 100644
index 03897c6d09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop/pom.xml b/tags/java/sca/1.3/itest/databindings/interop/pom.xml
deleted file mode 100644
index d593e1820f..0000000000
--- a/tags/java/sca/1.3/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>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-interop</artifactId>
-    <version>1.3</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>1.3</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/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
deleted file mode 100644
index 7bdfc57924..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
deleted file mode 100644
index 38bfccce0c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
deleted file mode 100644
index 6f02af4c9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/generate.xml b/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8453dd56b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/tags/java/sca/1.3/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
deleted file mode 100644
index 36797fde57..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/pom.xml b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/pom.xml
deleted file mode 100644
index 2f06064421..0000000000
--- a/tags/java/sca/1.3/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>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb-bottom-up</artifactId>
-    <version>1.3</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>1.3</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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
deleted file mode 100644
index 12ed7d0ec7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for GenericsService.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface GenericsService extends GenericsLocalService{
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
deleted file mode 100644
index 074ec85fce..0000000000
--- a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.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.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);
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
-    List<String> getGreetingsList(List<String> names);
-    
-    /**
-     * Add the RequestWrapper/ResponseWrapper annotations to support Collections.  These annotations are used
-     * by the remotable interface that extends this interface.
-     * @param names
-     * @return
-     */
-    // @RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
-    // @ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
-    ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
-    
-    // @WebMethod(exclude=true)
-    Map<String, String> getGreetingsMap(Map<String, String> namesMap);
-    
-    // @WebMethod(exclude=true)
-    HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap);
-    
-    String getGreetingsVarArgs(String... names);
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
deleted file mode 100644
index 34ac9024f6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for HelloServiceSimple.
- */
-@Remotable
-public interface HelloServiceSimple extends HelloLocalServiceSimple {
-    // Add any methods to the local interface.
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
deleted file mode 100644
index c5553688e2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for PrimitivesService.
- */
-@Remotable
-public interface PrimitivesService extends PrimitivesLocalService {
-    // Add any methods to the local interface.
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
deleted file mode 100644
index 2842205085..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-
-
-/**
- * The interface for StandardTypesService.
- */
-@Remotable
-public interface StandardTypesService extends StandardTypesLocalService{
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
deleted file mode 100644
index 9e042ffe6a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
deleted file mode 100644
index ec929ddece..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
deleted file mode 100644
index 58808eec4f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
deleted file mode 100644
index 51e48edbc9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
deleted file mode 100644
index de52cdfac3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
deleted file mode 100644
index 3bceba1e92..0000000000
--- a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.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.databindings.jaxb.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple;
-import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple;
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of HelloServiceSimple.
- * The implementation provides both a local and a remotable service.
- */
-@Service(interfaces = {HelloServiceSimple.class, HelloLocalServiceSimple.class})
-@WebService(targetNamespace = "http://jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class HelloServiceSimpleImpl implements HelloServiceSimple {
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String getGreetings(@WebParam(name = "arg0", targetNamespace = "")
-    String name) {
-        return "Hello " + name;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public String[] getGreetingsArray(@WebParam(name = "arg0", targetNamespace = "")
-    String[] names) {
-        String[] resps = new String[names.length];
-        for (int i = 0; i < names.length; ++i) {
-            resps[i] = "Hello " + names[i];
-        }
-        return resps;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public List<String> getGreetingsList(@WebParam(name = "arg0", targetNamespace = "")
-    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;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public ArrayList<String> getGreetingsArrayList(@WebParam(name = "arg0", targetNamespace = "")
-    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;
-    }
-
-    //    @WebMethod
-    //    @WebResult(name = "return", targetNamespace = "")
-    public Map<String, String> getGreetingsMap(
-    // @WebParam(name = "arg0", targetNamespace = "")
-    Map<String, String> namesMap) {
-        for (Map.Entry<String, String> entry : namesMap.entrySet()) {
-            entry.setValue("Hello " + entry.getKey());
-        }
-        return namesMap;
-    }
-
-    @WebMethod
-    @WebResult(name = "return", targetNamespace = "")
-    public HashMap<String, String> getGreetingsHashMap(@WebParam(name = "arg0", targetNamespace = "")
-    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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
deleted file mode 100644
index fe9121be9d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
deleted file mode 100644
index 28ace6aab7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
deleted file mode 100644
index ab1a3b4ab8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
deleted file mode 100644
index 0a8f6772b5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
deleted file mode 100644
index 626b0e9844..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
deleted file mode 100644
index 19a6cae01b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.java
deleted file mode 100644
index c8d08eed85..0000000000
--- a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsList.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.itest.databindings.jaxb.impl.jaxws;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsList", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsList {
-
-    @XmlElement(name = "arg0", namespace = "")
-    private List<String> arg0;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getArg0() {
-        return this.arg0;
-    }
-
-    /**
-     * 
-     * @param arg0
-     *     the value for the arg0 property
-     */
-    public void setArg0(List<String> arg0) {
-        this.arg0 = arg0;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.java
deleted file mode 100644
index 17ca0ca596..0000000000
--- a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/jaxws/GetGreetingsListResponse.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.itest.databindings.jaxb.impl.jaxws;
-
-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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * This wrapper class was initially generated by wsgen.
- * 
- * @version $Rev$ $Date$
- */
-@XmlRootElement(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getGreetingsListResponse", namespace = "http://impl.jaxb.databindings.itest.sca.tuscany.apache.org/")
-public class GetGreetingsListResponse {
-
-    @XmlElement(name = "return", namespace = "")
-    private List<String> _return;
-
-    /**
-     * 
-     * @return
-     *     returns List<String>
-     */
-    public List<String> getReturn() {
-        return this._return;
-    }
-
-    /**
-     * 
-     * @param _return
-     *     the value for the _return property
-     */
-    public void setReturn(List<String> _return) {
-        this._return = _return;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
deleted file mode 100644
index 2d47ba7b14..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
deleted file mode 100644
index c39cf21002..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
deleted file mode 100644
index 4b0a6e215d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
deleted file mode 100644
index 13ef73c082..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
deleted file mode 100644
index ebfa1c5bdd..0000000000
--- a/tags/java/sca/1.3/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ /dev/null
@@ -1,1439 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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
-    @Ignore("TUSCANY-2389")
-    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 = new String("<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 = new String("<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/tags/java/sca/1.3/itest/databindings/jaxbgen/pom.xml b/tags/java/sca/1.3/itest/databindings/jaxbgen/pom.xml
deleted file mode 100644
index ce9cb98537..0000000000
--- a/tags/java/sca/1.3/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>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb</artifactId>
-    <version>1.3</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>1.3</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/tags/java/sca/1.3/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/tags/java/sca/1.3/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8381a164ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/tags/java/sca/1.3/itest/databindings/jaxbgen/src/main/resources/greeter.composite
deleted file mode 100644
index ae0740e6fe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/pom.xml b/tags/java/sca/1.3/itest/databindings/pom.xml
deleted file mode 100644
index 6926ad2deb..0000000000
--- a/tags/java/sca/1.3/itest/databindings/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>
-  <parent>
-      <groupId>org.apache.tuscany.sca</groupId>
-      <artifactId>tuscany-itest</artifactId>
-      <version>1.3</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>1.3</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>interop</module>
-  </modules>
-</project>
diff --git a/tags/java/sca/1.3/itest/databindings/readme.html b/tags/java/sca/1.3/itest/databindings/readme.html
deleted file mode 100644
index 24a44e4ed7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/sdogen/pom.xml b/tags/java/sca/1.3/itest/databindings/sdogen/pom.xml
deleted file mode 100644
index c8200058c4..0000000000
--- a/tags/java/sca/1.3/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>1.3</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-sdo</artifactId>
-    <version>1.3</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-incubating</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/tags/java/sca/1.3/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/tags/java/sca/1.3/itest/databindings/sdogen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 3f9926604d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/tags/java/sca/1.3/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
deleted file mode 100644
index 9494d70f96..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/pom.xml b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/pom.xml
deleted file mode 100644
index 778cfd7dec..0000000000
--- a/tags/java/sca/1.3/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>1.3</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.2</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>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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-incubating</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>1.3</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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 4f4fe50041..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index 842dd4e602..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index ab65efbb58..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index acecdff613..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
deleted file mode 100644
index 460edab182..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 40e87953b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.3/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index fc49fa1d7d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-    
-    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/tags/java/sca/1.3/itest/exceptions-cross-binding/pom.xml b/tags/java/sca/1.3/itest/exceptions-cross-binding/pom.xml
deleted file mode 100644
index c74eb997b8..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/pom.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>itest-exceptions-cross-binding</artifactId>
-    <name>Apache Tuscany SCA Cross-Binding Exceptions Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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-incubating</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>1.3</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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
deleted file mode 100644
index f5e36db7cd..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface StockExceptionTestJAXB extends StockExceptionTest {
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
deleted file mode 100644
index 65751175fb..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
-import org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- */
-@Service(StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
-
-    /**
-     * 
-     */
-    public StockExchangeJaxB() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
-     */
-    public StockOffer stockQuoteOffer(StockOffer input) throws InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
-
-        System.out.println("stockQuoteOffer '" + input + "'");
-
-        String symbol = input.getSymbol();
-        if ("IBM".equals(symbol)) {
-            input.setPrice(99.00F);
-            return input;
-
-        }
-        else if ("CLOSED".equals(input.getName())) {
-            throw new MarketClosedFault("TO LATE!", 3);
-            
-        } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-            
-            throw new TestNotDeclaredAtSourceFault("not declared", "fault info");
-            
-        }
-        ObjectFactory jaxbOjectFactory = new ObjectFactory();
-
-        InvalidSymbolFault faultinfo = jaxbOjectFactory.createInvalidSymbolFault();
-        
-        faultinfo.setOffer(input);
-
-        throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
deleted file mode 100644
index 5f65d293ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
deleted file mode 100644
index e84ae633e7..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.test.exceptions.impl;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import stockexceptiontestservice.scatesttool.ScatesttoolFactory;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/**
- * 
- */
-@Service(StockTraderSDO.class)
-public class StockTraderSDOImpl implements StockTraderSDO {
-
-    private StockExceptionTest exchangeJaxb;
-
-    /**
-     * 
-     */
-
-    public StockTraderSDOImpl() {
-        // TODO Auto-generated constructor stub
-    }
-
-    @Reference
-    public void setExchangeJaxb(StockExceptionTest exchangeJaxb) {
-        this.exchangeJaxb = exchangeJaxb;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
-     */
-    public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        stockOffer.setName("IBM");
-        stockOffer.setSymbol("IBM");
-        stockOffer.setPrice(100.00F); // offer to buy at max $100.00
-
-        StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-
-        return stockOfferAccepted;
-
-    }
-
-    public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException,
-        MarketClosedSDOException {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-        // set up for a InvalidSymbolSDOException
-        stockOffer.setName("");
-        stockOffer.setSymbol("IBM0");
-
-        stockOffer.setPrice(11.0F); // offer to buy at max $100.00
-        exchangeJaxb.stockQuoteOffer(stockOffer);
-
-    }
-
-    public void marketClosedSDOExceptionTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("CLOSED");
-        stockOffer.setSymbol("MBI");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
-            stockOfferAccepted.getPrice(); // the price actually bought.
-        } catch (InvalidSymbolSDOException e) {
-
-            e.printStackTrace();
-        } catch (MarketClosedSDOException e) {
-
-            e.printStackTrace();
-        }
-    }
-
-    public Object  testNotDeclaredAtSourceTest() {
-        StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
-
-        // set up for a MarketClosedSDOException
-        stockOffer.setName("testNotDeclaredAtSourceTest");
-        stockOffer.setSymbol("TNDAS");
-        stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
-        try {
-            return  exchangeJaxb.stockQuoteOffer(stockOffer);
-            
-        } catch (Exception e) {
-            return e;
-           
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
deleted file mode 100644
index 74815dc6c1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
deleted file mode 100644
index 5fe40935ec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
deleted file mode 100644
index ab65efbb58..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-/**
- * StockExceptionTest.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-
-import org.osoa.sca.annotations.Remotable;
-
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-/*
- * StockExceptionTest java interface
- */
-
-@Remotable
-public interface StockExceptionTest {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param param0
-     */
-    StockOffer stockQuoteOffer(StockOffer param0) throws InvalidSymbolSDOException, MarketClosedSDOException;
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index 872fd721d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
deleted file mode 100644
index 83526cb6a1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
deleted file mode 100644
index d70cdad313..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index 33b830c856..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
deleted file mode 100644
index 9759647cfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/tags/java/sca/1.3/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
deleted file mode 100644
index 3371f63e4a..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.test.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
-import org.osoa.sca.ServiceRuntimeException;
-
-import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
-import stockexceptiontestservice.scatesttool.StockOffer;
-
-public class IntraCompositeTestCase extends TestCase {
-    private SCADomain domain;
-
-    private StockTraderSDO stockTrader;
-
-    public void testTrading() {
-        try {
-            StockOffer sp = stockTrader.testTrading();
-            assertNotNull(sp);
-            assertEquals(99.00F, sp.getPrice());
-            assertEquals("IBM", sp.getSymbol());
-        } catch (Exception e) {
-
-            e.printStackTrace();
-            fail(e + "");
-
-        }
-
-    }
-
-    public void testInvalidSymbolSDOException() {
-        try {
-            stockTrader.testInvalidSymbolSDOException();
-            fail("Expected InvalidSymbolSDOException");
-        } catch (InvalidSymbolSDOException e) {
-            InvalidSymbolFault isf = e.getFaultInfo();
-
-            assertNotNull(isf);
-            StockOffer sp = isf.getOffer();
-            assertEquals(11.00F, sp.getPrice());
-            assertEquals("IBM0", sp.getSymbol());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Expected InvalidSymbolSDOException" + e);
-
-        }
-    }
-
-    public void testNotDeclaredAtSourceException() {
-
-        Object ret = stockTrader.testNotDeclaredAtSourceTest();
-
-        assertNotNull(ret);
-
-        assertEquals(ServiceRuntimeException.class, ret.getClass());
-
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("ExceptionTest.composite");
-        stockTrader = domain.getService(StockTraderSDO.class, "stockTraderSDOComponent");
-        assertNotNull(stockTrader);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (domain != null) {
-            domain.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-simple-ws/pom.xml b/tags/java/sca/1.3/itest/exceptions-simple-ws/pom.xml
deleted file mode 100644
index 95665d65e0..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index d6545b5a23..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 30ea559694..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/resources/example.composite b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/resources/example.composite
deleted file mode 100644
index ad9877140b..0000000000
--- a/tags/java/sca/1.3/itest/exceptions-simple-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.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>

-</composite>

diff --git a/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index 628e6ca6ba..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/exceptions/pom.xml b/tags/java/sca/1.3/itest/exceptions/pom.xml
deleted file mode 100644
index 30e1bb5d01..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-exceptions</artifactId>
-    <name>Apache Tuscany SCA Exceptions Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
deleted file mode 100644
index b95b0ccb31..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.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.exceptions;
-
-
-public class Checked extends Exception {
-    private static final long serialVersionUID = -129752837478357452L;
-
-    /**
-     * 
-     */
-    public Checked() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public Checked(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public Checked(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public Checked(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
deleted file mode 100644
index 5740e053a9..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.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.exceptions;
-
-public interface ExceptionHandler {
-
-    public void testing();
-
-    public Checked getTheBad();
-
-    public String getTheGood();
-
-    public UnChecked getTheUgly();
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
deleted file mode 100644
index f923133ee9..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.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.test.exceptions;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Remote exception thrower
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ExceptionRemoteThrower extends ExceptionThrower {
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
deleted file mode 100644
index 55d81102d2..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.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.exceptions;
-
-
-/**
- * Local exception thrower
- * @version $Rev$ $Date$
- */
-public interface ExceptionThrower {
-    public static final Checked BAD = new Checked("theBad");
-    public static final UnChecked UGLY = new UnChecked("theUgly");
-    public static final String SO_THEY_SAY = "All is good that ends good.";
-
-    public String theGood() throws Checked;
-
-    public String theBad() throws Checked;
-
-    public String theUgly() throws Checked;
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
deleted file mode 100644
index 453528444d..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.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.exceptions;
-
-public class UnChecked extends RuntimeException {
-    private static final long serialVersionUID = -1318118082838092244L;
-
-    /**
-     * 
-     */
-    public UnChecked() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public UnChecked(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public UnChecked(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public UnChecked(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
deleted file mode 100644
index 1987490a0a..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ExceptionHandlerImpl implements ExceptionHandler {
-    static final String INIT = "INIT";
-
-    private ExceptionThrower exceptionThrower;
-
-    private String theGood;
-
-    private Checked theBad;
-
-    private UnChecked theUgly;
-
-    public void testing() {
-
-        assert exceptionThrower != null : "'exceptionThrower' never wired";
-        String result = INIT;
-        try {
-            theGood = result = exceptionThrower.theGood();
-            assert result == ExceptionThrower.SO_THEY_SAY;
-        } catch (Throwable e) {
-            assert result == INIT;
-            assert false;
-            e.printStackTrace();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theBad();
-            // incredible
-            assert false : "Expected 'Check' Exception";
-
-        } catch (Checked e) {
-            // This is good...
-            assert result == INIT;
-            theBad = e;
-        } catch (Throwable t) {
-            // This is not so good.
-            t.printStackTrace();
-            assert result == INIT;
-            assert false : "Got wrong exception '" + t.getClass().getName();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theUgly();
-            // incredible
-            assert false : "Expected 'UnCheck' Exception";
-
-        } catch (Checked e) {
-            // This is not so good...
-            assert false : "Got wrong exception '" + e.getClass().getName();
-            assert result == INIT;
-        } catch (UnChecked e) {
-            theUgly = e;
-
-        } catch (Throwable t) {
-            // This is not good.
-            assert false;
-            assert result == INIT;
-
-            System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
-        }
-
-    }
-
-    @Reference 
-    public void setExceptionThrower(ExceptionThrower exceptionThrower) {
-        this.exceptionThrower = exceptionThrower;
-    }
-
-    public String getTheGood() {
-        return theGood;
-    }
-
-    public Checked getTheBad() {
-        return theBad;
-    }
-
-    public UnChecked getTheUgly() {
-        return theUgly;
-    }
-
-    public ExceptionThrower getExceptionThrower() {
-        return exceptionThrower;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
deleted file mode 100644
index c4cb52f94c..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.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.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-@Service(ExceptionRemoteThrower.class)
-public class ExceptionRemoteThrowerImpl implements ExceptionRemoteThrower {
-    public String theBad() throws Checked {
-        throw BAD;
-    }
-
-    public String theGood() throws Checked {
-        return SO_THEY_SAY;
-    }
-
-    public String theUgly() throws Checked {
-        throw UGLY;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
deleted file mode 100644
index cf8740ba56..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.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.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-@Service(ExceptionThrower.class)
-public class ExceptionThrowerImpl implements ExceptionThrower {
-
-    public String theBad() throws Checked {
-        throw BAD;
-    }
-
-    public String theGood() throws Checked {
-        return SO_THEY_SAY;
-    }
-
-    public String theUgly() throws Checked {
-        throw UGLY;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
deleted file mode 100644
index f82a30d529..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.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.test.exceptions.impl;
-
-import org.apache.tuscany.sca.test.exceptions.Checked;
-import org.apache.tuscany.sca.test.exceptions.ExceptionHandler;
-import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower;
-import org.apache.tuscany.sca.test.exceptions.ExceptionThrower;
-import org.apache.tuscany.sca.test.exceptions.UnChecked;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class RemoteExceptionHandlerImpl implements ExceptionHandler {
-    static final String INIT = "INIT";
-
-    private ExceptionRemoteThrower exceptionThrower;
-
-    private String theGood;
-
-    private Checked theBad;
-
-    private UnChecked theUgly;
-
-    public void testing() {
-
-        assert exceptionThrower != null : "'exceptionThrower' never wired";
-        String result = INIT;
-        try {
-            theGood = result = exceptionThrower.theGood();
-            assert result == ExceptionThrower.SO_THEY_SAY;
-        } catch (Throwable e) {
-            assert result == INIT;
-            assert false;
-            e.printStackTrace();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theBad();
-            // incredible
-            assert false : "Expected 'Check' Exception";
-
-        } catch (Checked e) {
-            // This is good...
-            assert result == INIT;
-            theBad = e;
-        } catch (Throwable t) {
-            // This is not so good.
-            t.printStackTrace();
-            assert result == INIT;
-            assert false : "Got wrong exception '" + t.getClass().getName();
-        }
-
-        result = INIT;
-        try {
-            result = exceptionThrower.theUgly();
-            // incredible
-            assert false : "Expected 'UnCheck' Exception";
-
-        } catch (Checked e) {
-            // This is not so good...
-            assert false : "Got wrong exception '" + e.getClass().getName();
-            assert result == INIT;
-        } catch (UnChecked e) {
-            theUgly = e;
-
-        } catch (Throwable t) {
-            // This is not good.
-            assert false;
-            assert result == INIT;
-
-            System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT);
-        }
-
-    }
-
-    @Reference 
-    public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) {
-        this.exceptionThrower = exceptionThrower;
-    }
-
-    public String getTheGood() {
-        return theGood;
-    }
-
-    public Checked getTheBad() {
-        return theBad;
-    }
-
-    public UnChecked getTheUgly() {
-        return theUgly;
-    }
-
-    public ExceptionRemoteThrower getExceptionThrower() {
-        return exceptionThrower;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/exceptions/src/main/resources/ExceptionTest.composite b/tags/java/sca/1.3/itest/exceptions/src/main/resources/ExceptionTest.composite
deleted file mode 100644
index d27797c2fe..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/main/resources/ExceptionTest.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:foo="http://foo" targetNamespace="http://foo"
-  name="ExceptionTest">
-  <component name="main">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" />
-    <reference name="exceptionThrower" target="exceptionThrower" />
-  </component>
-
-  <component name="exceptionThrower">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl" />
-  </component>
-
-  <component name="mainRemote">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.RemoteExceptionHandlerImpl" />
-    <reference name="exceptionThrower" target="exceptionThrowerRemote" />
-  </component>
-
-  <component name="exceptionThrowerRemote">
-    <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionRemoteThrowerImpl" />
-  </component>
-
-
-</composite>
diff --git a/tags/java/sca/1.3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/tags/java/sca/1.3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
deleted file mode 100644
index f84205c096..0000000000
--- a/tags/java/sca/1.3/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.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.exceptions;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ExceptionsTestCase extends TestCase {
-
-    private SCADomain domain;
-
-    /**
-     * Test exception handling over a local interface
-     */
-    public void testLocal() {
-        ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "main");
-        exceptionHandler.testing();
-        assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
-        assertNotNull(exceptionHandler.getTheBad());
-        assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
-        assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
-        assertNotNull(exceptionHandler.getTheUgly());
-        assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-        assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
-    }
-    
-    /**
-     * Test exception handling over a remotable interface
-     */
-    public void testRemote() {
-        ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "mainRemote");
-        exceptionHandler.testing();
-        assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
-        assertNotNull(exceptionHandler.getTheBad());
-        assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
-        assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
-        assertNotNull(exceptionHandler.getTheUgly());
-        assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-        
-        // [rfeng] We're not in a position to copy non business exceptions
-        // assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
-
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-    	domain = SCADomain.newInstance("ExceptionTest.composite");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/itest/extended-api/pom.xml b/tags/java/sca/1.3/itest/extended-api/pom.xml
deleted file mode 100644
index 52724657f2..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            
-            <groupId>org.apache.tuscany.sca</groupId>
-            
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            
-            <version>1.3</version>
-            
-            <scope>runtime</scope>
-        
-        </dependency>
-    
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
deleted file mode 100644
index 869565af17..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
deleted file mode 100644
index c54af93c05..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
deleted file mode 100644
index 523d238f2e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/tags/java/sca/1.3/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
deleted file mode 100644
index ab4300a7dd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(MathService.class)
-public class MathServiceImpl implements MathService {
-
-    public int negate(int theInt) {
-        return -theInt;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/extended-api/src/main/resources/BasicService.composite b/tags/java/sca/1.3/itest/extended-api/src/main/resources/BasicService.composite
deleted file mode 100644
index 128b33b16f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/extended-api/src/main/resources/MathService.composite b/tags/java/sca/1.3/itest/extended-api/src/main/resources/MathService.composite
deleted file mode 100644
index 8e99d3da60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/tags/java/sca/1.3/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
deleted file mode 100644
index c480235d88..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/itest/interfaces/pom.xml b/tags/java/sca/1.3/itest/interfaces/pom.xml
deleted file mode 100644
index 8769e02cde..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-interfaces</artifactId>
-    <name>Apache Tuscany Interface Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
deleted file mode 100644
index 5bc872ef83..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.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.interfaces;
-
-
-/**
- * only for callBack
- */
-public interface LocalCallbackInterface {
-
-    public void callbackMethod(String str);
-
-    public void modifyParameter(ParameterObject po);
-
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
deleted file mode 100644
index 7bfcf5de11..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.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.interfaces;
-
-import org.osoa.sca.annotations.OneWay;
-
-/*
- * itest for interface: local,method-overloading
- */
-public interface LocalClientComponent {
-
-    String foo1(ParameterObject po);
-
-    String foo1(String str) throws Exception;
-
-    String foo2(String str, int i);
-
-    String foo2(int i, String str) throws Exception;
-
-    void callback(String str);
-
-    void callModifyParameter();
-
-    @OneWay
-    void onewayMethod(String str);
-
-    String getCallbackValue();
-
-    String getOnewayValue();
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
deleted file mode 100644
index d4f7694e8f..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.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.interfaces;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(LocalClientComponent.class)
-public class LocalClientComponentImpl implements LocalClientComponent, LocalCallbackInterface {
-
-    @Reference
-    protected LocalServiceComponent aCallBackService;
-    private static String callbackValue;
-    private static String onewayValue;
-
-    public String foo1(ParameterObject po) {
-        po.field1 = "AComponent";
-        return "AComponent";
-    }
-
-    public String foo1(String str) throws Exception {
-        return str + "AComponent";
-    }
-
-    public String foo2(String str, int i) {
-        return str + "AComponent" + i;
-    }
-
-    public String foo2(int i, String str) throws Exception {
-        return str + "AComponent" + i;
-    }
-
-    public void callback(String str) {
-        aCallBackService.callback(str);
-    }
-
-    public void callbackMethod(String str) {
-        callbackValue = str;
-    }
-
-    public void callModifyParameter() {
-        this.aCallBackService.modifyParameter();
-    }
-
-    public String getCallbackValue() {
-        return callbackValue;
-    }
-
-    public void onewayMethod(String str) {
-        onewayValue = str;
-        try {
-            Thread.sleep(200);
-        } catch (Exception e) {
-            //do nothing
-        }
-    }
-
-    public String getOnewayValue() {
-        return onewayValue;
-    }
-
-    public void modifyParameter(ParameterObject po) {
-        po.field1 = "AComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
deleted file mode 100644
index 4772303fab..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.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.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-
-/**
- * Local be-directional callBackService
- */
-@Callback(LocalCallbackInterface.class)
-public interface LocalServiceComponent {
-
-    String foo(String str);
-
-    void callback(String str);
-
-    void modifyParameter();
-
-    ParameterObject getPO();
-
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
deleted file mode 100644
index e100636b23..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.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.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(LocalServiceComponent.class)
-public class LocalServiceComponentImpl implements LocalServiceComponent {
-
-    @Callback
-    protected LocalCallbackInterface callback;
-
-    private static ParameterObject po;
-
-    public void callback(String str) {
-        callback.callbackMethod(str);
-    }
-
-    public void modifyParameter() {
-        po = new ParameterObject("CallBack");
-        callback.modifyParameter(po);
-    }
-
-    public String foo(String str) {
-        return str;
-    }
-
-    public ParameterObject getPO() {
-        return po;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
deleted file mode 100644
index 0bc8d10904..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.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.interfaces;
-
-import java.io.Serializable;
-
-public class ParameterObject implements Serializable {
-    private static final long serialVersionUID = 1L;
-    public String field1;
-
-    public ParameterObject() {
-        this.field1 = null;
-    }
-
-    public ParameterObject(String field1) {
-        this.field1 = field1;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-        if (o instanceof ParameterObject) {
-            ParameterObject other = (ParameterObject)o;
-            if (field1 != null)
-                return field1.equals(other.field1);
-        }
-        return false;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
deleted file mode 100644
index e2b70313ed..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.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.interfaces;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * only for callBack
- */
-@Remotable
-public interface RemoteCallbackInterface {
-
-    public void callbackMethod(String str);
-
-    public void modifyParameter(ParameterObject po);
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
deleted file mode 100644
index dd591eabeb..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.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.    
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.interfaces;
-
-import org.osoa.sca.annotations.Remotable;
-
-/*  
- * different signatures  
- */
-
-@Remotable
-public interface RemoteClientComponent {
-
-    String foo1(ParameterObject po);
-    String foo3(ParameterObject po);
-
-    String foo2(int i, String str1) throws Exception;
-
-    void callback(String str);
-
-    void callModifyParameter();
-
-    String getCallbackValue();
-
-    void onewayMethod(String str);
-
-    String getOnewayValue();
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
deleted file mode 100644
index d4731f35d3..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.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.interfaces;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(RemoteClientComponent.class)
-public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteCallbackInterface {
-
-    @Reference
-    protected RemoteServiceComponent aCallBackService;
-    private static String callbackValue;
-    private static String onewayValue;
-
-    public String foo1(ParameterObject po) {
-        po.field1 = "BComponent";
-        return "BComponent";
-    }
-
-    @AllowsPassByReference
-    public String foo3(ParameterObject po) {
-        po.field1 = "BComponent";
-        return "BComponent";
-    }
-    
-    public String foo2(int i, String str) throws Exception {
-        return str + "BComponent" + i;
-    }
-
-    public void callback(String str) {
-        aCallBackService.callback(str);
-    }
-
-    public void callModifyParameter() {
-        this.aCallBackService.modifyParameter();
-    }
-
-    public void callbackMethod(String str) {
-        callbackValue = str;
-    }
-
-    public String getCallbackValue() {
-        return callbackValue;
-    }
-
-    public void onewayMethod(String str) {
-        onewayValue = str;
-        try {
-            Thread.sleep(200);
-        } catch (Exception e) {
-            //do nothing
-        }
-    }
-
-    public String getOnewayValue() {
-        return onewayValue;
-    }
-
-    public void modifyParameter(ParameterObject po) {
-        po.field1 = "BComponent";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
deleted file mode 100644
index 6c40db0e70..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.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.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(RemoteCallbackInterface.class)
-public interface RemoteServiceComponent {
-
-    String foo(String str);
-
-    void callback(String str);
-
-    void modifyParameter();
-
-    ParameterObject getPO();
-    
-    String[] bar(int[][] intArray);
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
deleted file mode 100644
index 3804d31902..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.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.interfaces;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(RemoteServiceComponent.class)
-public class RemoteServiceComponentImpl implements RemoteServiceComponent {
-
-    @Callback
-    protected RemoteCallbackInterface callback;
-
-    private static ParameterObject po;
-
-    public void callback(String str) {
-        callback.callbackMethod(str);
-    }
-
-    public void modifyParameter() {
-        po = new ParameterObject("CallBack");
-        callback.modifyParameter(po);
-    }
-
-    public String foo(String str) {
-        return str;
-    }
-
-    public ParameterObject getPO() {
-        return po;
-    }
-
-    public String[] bar(int[][] intArray) {
-        return new String[] {"int"};
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/interfaces/src/main/resources/InterfacesTest.composite b/tags/java/sca/1.3/itest/interfaces/src/main/resources/InterfacesTest.composite
deleted file mode 100644
index 0361d8c83c..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/main/resources/InterfacesTest.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

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  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="InterfacesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component>

-

-    <component name="RemoteClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteClientComponentImpl" />

-        <reference name="aCallBackService" target="RemoteServiceComponent" />

-    </component>

-

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceComponentImpl" />

-    </component>

-

-    <component name="RemoteServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteServiceComponentImpl" />

-    </component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/tags/java/sca/1.3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 013cdd4f15..0000000000
--- a/tags/java/sca/1.3/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.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.itest.interfaces;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class InterfacesTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("InterfacesTest.composite");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testLocalClient() {
-        LocalServiceComponent service = domain.getService(LocalServiceComponent.class, "LocalServiceComponent");
-        LocalClientComponent local = domain.getService(LocalClientComponent.class, "LocalClientComponent");
-
-        try {
-            ParameterObject po = new ParameterObject();
-            assertEquals("AComponent", local.foo1(po));
-            assertEquals("AComponent", po.field1);
-
-            assertEquals("AAComponent", local.foo1("A"));
-
-            assertEquals("AAComponent1", local.foo2("A", 1));
-            assertEquals("AAComponent1", local.foo2(1, "A"));
-        } catch (Exception e) {
-            fail();
-        }
-
-        try {
-            // test local callback
-            local.callback("CallBack");
-            Thread.sleep(100);
-            assertEquals("CallBack", local.getCallbackValue());
-
-            local.callModifyParameter();
-            Thread.sleep(100);
-            assertEquals("AComponent", service.getPO().field1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("CallBack failed");
-        }
-
-        try {
-            local.onewayMethod("OneWay");
-            Thread.sleep(100);
-            assertEquals("OneWay", local.getOnewayValue());
-        } catch (Exception e) {
-            fail("OneWay failed");
-        }
-    }
-
-    @Test
-    public void testRemoteClient() {
-        RemoteServiceComponent service = domain.getService(RemoteServiceComponent.class, "RemoteServiceComponent");
-        RemoteClientComponent remote = domain.getService(RemoteClientComponent.class, "RemoteClientComponent");
-
-        try {
-            // Test Pass By Value
-            ParameterObject po = new ParameterObject("NotBComponent");
-            assertEquals("BComponent", remote.foo1(po));
-            assertEquals("NotBComponent", po.field1);
-
-            assertEquals("BBComponent1", remote.foo2(1, "B"));
-
-            // Test allowsPassByReference
-            assertEquals("BComponent", remote.foo3(po));
-            assertEquals("BComponent", po.field1);
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail();
-        }
-
-        try {
-            remote.callback("CallBack");
-            Thread.sleep(100);
-            assertEquals("CallBack", remote.getCallbackValue());
-
-            remote.callModifyParameter();
-            Thread.sleep(100);
-            assertEquals("CallBack", service.getPO().field1);
-        } catch (Exception e) {
-            fail("CallBack failed");
-        }
-
-        try {
-            remote.onewayMethod("OneWay");
-            Thread.sleep(100);
-            assertEquals("OneWay", remote.getOnewayValue());
-        } catch (Exception e) {
-            fail("OneWay failed");
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/jms/pom.xml b/tags/java/sca/1.3/itest/jms/pom.xml
deleted file mode 100644
index 55d1f7c808..0000000000
--- a/tags/java/sca/1.3/itest/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-itest</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </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>4.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
deleted file mode 100644
index 7b1c63d437..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
deleted file mode 100644
index 46bf911def..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
-    public void throwChecked() throws CheckedExcpetion;
-
-    public void throwUnChecked();
-}
diff --git a/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
deleted file mode 100644
index cd3c09e17f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
deleted file mode 100644
index ab293a5df1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index 86d4719646..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index abb29aec4c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index 21d2de2cf0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
deleted file mode 100644
index 218cccf64c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
deleted file mode 100644
index 9795089952..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
-    @OneWay
-    void sayHello(Object name);
-}
diff --git a/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
deleted file mode 100644
index 25a89fc5b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
deleted file mode 100644
index f16f853ba7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface OneWayService {
-    
-    @OneWay
-    void sayHello(String name);
-}
diff --git a/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
deleted file mode 100644
index bff4536fa0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/tags/java/sca/1.3/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
deleted file mode 100644
index cfe7a649d9..0000000000
--- a/tags/java/sca/1.3/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.JMSBinding;
-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(JMSBinding 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/tags/java/sca/1.3/itest/jms/src/main/resources/defaults/client.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/defaults/client.composite
deleted file mode 100644
index 02c04e6afd..0000000000
--- a/tags/java/sca/1.3/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="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 uri="jms:HelloWorldService" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/main/resources/defaults/service.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/defaults/service.composite
deleted file mode 100644
index 45c1819e2b..0000000000
--- a/tags/java/sca/1.3/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="RPCComposite">

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>

-        <service name="HelloWorldService">

-            <binding.jms />

-        </service> 

-    </component>       

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/main/resources/dynamic/client.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/dynamic/client.composite
deleted file mode 100644
index 494fe9790f..0000000000
--- a/tags/java/sca/1.3/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="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>

-            <destination name="DestQueueA"/>

-            <!-- No response destination defined means a temporary queue will be used -->

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/main/resources/exceptions/client.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/exceptions/client.composite
deleted file mode 100644
index 8bb7f86252..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/resources/exceptions/service.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/exceptions/service.composite
deleted file mode 100644
index 052ff9d985..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/resources/external/client.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/external/client.composite
deleted file mode 100644
index dcea428493..0000000000
--- a/tags/java/sca/1.3/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="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/tags/java/sca/1.3/itest/jms/src/main/resources/external/service.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/external/service.composite
deleted file mode 100644
index 44b7b29610..0000000000
--- a/tags/java/sca/1.3/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="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/tags/java/sca/1.3/itest/jms/src/main/resources/jndi.properties b/tags/java/sca/1.3/itest/jms/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/main/resources/nonSCAclient/service.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/nonSCAclient/service.composite
deleted file mode 100644
index 584a44dc4b..0000000000
--- a/tags/java/sca/1.3/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="RPCComposite">

-

-    <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/tags/java/sca/1.3/itest/jms/src/main/resources/oneway/OneWayClient.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/oneway/OneWayClient.composite
deleted file mode 100644
index cd9a62ee6f..0000000000
--- a/tags/java/sca/1.3/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="OneWayComposite">

-

-    <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/tags/java/sca/1.3/itest/jms/src/main/resources/oneway/OneWayService.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/oneway/OneWayService.composite
deleted file mode 100644
index 3c53881141..0000000000
--- a/tags/java/sca/1.3/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="OneWayComposite">

-

-    <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/tags/java/sca/1.3/itest/jms/src/main/resources/simple/client.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/simple/client.composite
deleted file mode 100644
index 3f5229a30c..0000000000
--- a/tags/java/sca/1.3/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="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>

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/main/resources/simple/mpclient.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/simple/mpclient.composite
deleted file mode 100644
index 2c8dc463e0..0000000000
--- a/tags/java/sca/1.3/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="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 messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

-            <destination name="DestQueueA"/>

-            <response>

-               <destination name="RespQueueA"/>

-            </response>

-        </binding.jms>  

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/main/resources/simple/service.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/simple/service.composite
deleted file mode 100644
index 47200f9005..0000000000
--- a/tags/java/sca/1.3/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="RPCComposite">

-

-    <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/tags/java/sca/1.3/itest/jms/src/main/resources/simple/uriclient.composite b/tags/java/sca/1.3/itest/jms/src/main/resources/simple/uriclient.composite
deleted file mode 100644
index a6c9ee3822..0000000000
--- a/tags/java/sca/1.3/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="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 uri="jms:DestQueueA" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
deleted file mode 100644
index dca9386637..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
deleted file mode 100644
index 41fbf04c0a..0000000000
--- a/tags/java/sca/1.3/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", "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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
deleted file mode 100644
index 051be93f22..0000000000
--- a/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.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 static org.junit.Assert.fail;
-
-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 ExceptionsTestCase {
-
-    private static SCADomain scaDomain;
-
-    @Before
-    public void init() {
-        scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "exceptions/client.composite", "exceptions/service.composite");
-    }
-
-    @Test
-    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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
deleted file mode 100644
index c34ad07901..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
deleted file mode 100644
index 9ec77ca440..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
deleted file mode 100644
index 94581876fd..0000000000
--- a/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.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.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.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", "<arg0>Petra</arg0>");
-
-            // 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 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 JMSResourceFactory(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 JMSResourceFactory(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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
deleted file mode 100644
index 26dda13cf9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
deleted file mode 100644
index c1882a1e26..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/tags/java/sca/1.3/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
deleted file mode 100644
index bed5515d7f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/pom.xml b/tags/java/sca/1.3/itest/late-reference-resolution/pom.xml
deleted file mode 100644
index 72f3f8fc3a..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</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>1.3</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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index c53b55aacf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 378d6e9706..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index db255e0232..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index 3fb16fa619..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 130157ac04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index c615b4355a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index cba0a5c281..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
deleted file mode 100644
index e4bd3035e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
deleted file mode 100644
index c6e0689837..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
deleted file mode 100644
index d3fe027e60..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 nodeA;
-    private static SCANode2 nodeB;
-    private static SCANode2 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");
-
-            
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeC", 
-                                    new File("src/main/resources/nodeC").toURL().toString()));
-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeB", 
-                                    new File("src/main/resources/nodeB").toURL().toString()));
-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeA", 
-                                    new File("src/main/resources/nodeA").toURL().toString()));
-
-            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();
-    }    
-
-    @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/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/tags/java/sca/1.3/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
deleted file mode 100644
index 57afc9ea50..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/oneway/build.xml b/tags/java/sca/1.3/itest/oneway/build.xml
deleted file mode 100644
index 3e68be8661..0000000000
--- a/tags/java/sca/1.3/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.3\tuscany-core-spi-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.3\tuscany-host-http-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.3\tuscany-binding-ws-axis2-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.3\tuscany-policy-1.3.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.3\tuscany-implementation-java-runtime-1.3.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.3\tuscany-contribution-namespace-1.3.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.3\tuscany-assembly-xsd-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.3\tuscany-assembly-1.3.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.3\tuscany-core-databinding-1.3.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.3\tuscany-policy-xml-1.3.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.3\tuscany-sca-api-1.3.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.3\tuscany-contribution-java-1.3.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.3\tuscany-databinding-1.3.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.3\tuscany-binding-ws-xml-1.3.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.3\tuscany-policy-security-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.3\tuscany-assembly-xml-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-domain\1.3\tuscany-domain-1.3.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.3\tuscany-interface-java-1.3.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.3\tuscany-contribution-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.3\tuscany-implementation-java-1.3.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.3\tuscany-domain-api-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.3\tuscany-binding-sca-1.3.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.3\tuscany-host-jetty-1.3.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.3\tuscany-implementation-java-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.3\tuscany-binding-sca-xml-1.3.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.3\tuscany-interface-wsdl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.3\tuscany-binding-ws-1.3.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.3\tuscany-databinding-axiom-1.3.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.3\tuscany-core-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.3\tuscany-interface-wsdl-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.3\tuscany-contribution-impl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.3\tuscany-node-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.3\tuscany-definitions-1.3.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.3\tuscany-host-embedded-1.3.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.3\tuscany-interface-java-xml-1.3.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.3\tuscany-interface-1.3.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/tags/java/sca/1.3/itest/oneway/pom.xml b/tags/java/sca/1.3/itest/oneway/pom.xml
deleted file mode 100644
index 25dc3bf9f4..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.3</version>

-        </dependency>        

-        

-        <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-                

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-    </dependencies>

-</project>

diff --git a/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
deleted file mode 100644
index 04c6069dfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
deleted file mode 100644
index b3cec51b1f..0000000000
--- a/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.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.oneway;

-

-

-import org.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
deleted file mode 100644
index 8013c5c0e8..0000000000
--- a/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.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.oneway.impl;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayClient;

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-import org.junit.Assert;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
deleted file mode 100644
index 01f956cb67..0000000000
--- a/tags/java/sca/1.3/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.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.oneway.impl;

-

-import org.apache.tuscany.sca.itest.oneway.OneWayService;

-

-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;

-

-/**

- * 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/tags/java/sca/1.3/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/tags/java/sca/1.3/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
deleted file mode 100644
index d053a6278c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/tags/java/sca/1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
deleted file mode 100644
index b21042c06b..0000000000
--- a/tags/java/sca/1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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 junit.framework.Assert;

-

-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.SCAClient;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.After;

-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 SCANode2 node;

-    

-    /**

-     * Initialise the SCADomain.

-     *

-     * @throws Exception Failed to initialise the SCADomain

-     */

-    @Before

-    public void setUp() throws Exception {

-        

-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();

-        node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);

-        node.start();

-        

-    }

-

-    /**

-     * This method will ensure that the SCADomain is shutdown.

-     *

-     * @throws Exception Failed to shutdown the SCADomain

-     */

-    @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 =

-            ((SCAClient)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 =

-            ((SCAClient)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}

-         */

-        @Override

-        public void close() throws SecurityException {

-            // Nothing to do

-        }

-

-        /**

-         * {@inheritDoc}

-         */

-        @Override

-        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

-         */

-        @Override

-        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/tags/java/sca/1.3/itest/operation-overloading/pom.xml b/tags/java/sca/1.3/itest/operation-overloading/pom.xml
deleted file mode 100644
index 79fe5fb294..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-operation-overloading</artifactId>
-    <name>Apache Tuscany SCA Operation Overloading Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
deleted file mode 100644
index 85b5717c00..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.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.opoverload;
-
-/**
- * This is an Interface which has methods declared but not implemented, These methods will be implemented in
- * OverloadATarget Class and OverloadASource This class has methods with overloaded parameters.
- */
-
-//@AllowsPassByReference
-public interface OverloadASourceTarget {
-    final String opName = "operationA:";
-
-    /**
-     * Method with no parameters
-     */
-    String operationA();
-
-    /**
-     * Method with one integer parameter
-     */
-    String operationA(int parm1);
-
-    /**
-     * Method with one integer parameter and one string parameter
-     */
-    String operationA(int parm1, String parm2);
-
-    /**
-     * Method with one one string parameter and one integer parameter
-     */
-    String operationA(String parm1, int parm2);
-
-    /**
-     * Method with one string parameter
-     */
-    String operationA(String string);
-
-    /**
-     * Method which throws an illegal argument exception in case of any exceptions.
-     */
-    String[] operationAall();
-
-}
diff --git a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
deleted file mode 100644
index e5d5083a2d..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.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.test.opoverload.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are
- * declared in the OverloadASourceTarget interface.
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadASource implements OverloadASourceTarget {
-    public OverloadASourceTarget overloadASourceTarget;
-
-    /**
-     * This is a default constructor
-     */
-    public OverloadASource() {
-
-    }
-
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String[] operationAall() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        ArrayList<String> ret = new ArrayList<String>();
-        ret.add(overloadASourceTarget.operationA());
-        ret.add(overloadASourceTarget.operationA(11));
-        ret.add(overloadASourceTarget.operationA("eleven"));
-        ret.add(overloadASourceTarget.operationA(3, "three"));
-        ret.add(overloadASourceTarget.operationA("four", 4));
-        return (String[])ret.toArray(new String[ret.size()]);
-    }
-
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA();
-    }
-
-    /**
-     * @param parm1
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1);
-    }
-
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-
-    public String operationA(String string) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(string);
-    }
-
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int)
-     */
-    public String operationA(String parm1, int parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-
-    /**
-     * This method which is used by all the overloaded functions to set the source target
-     */
-    @Reference
-    public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull";
-        this.overloadASourceTarget = overloadASourceTarget;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
deleted file mode 100644
index e206a86768..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.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.opoverload.impl;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are
- * declared in the OverloadASourceTarget interface.
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadATarget implements OverloadASourceTarget {
-
-    /**
-     * This is a default Constructor
-     */
-    public OverloadATarget() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        out(opName);
-        return opName;
-
-    }
-
-    public String operationA(String parm1, int parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-    }
-
-    public String operationA(String parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-    }
-
-    /**
-     * This method is used to print the message returned by all the overloaded functions
-     */
-    private void out(String msg) {
-
-        java.lang.System.out.println(msg);
-    }
-
-    public String[] operationAall() {
-        throw new IllegalArgumentException("not supported");
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/operation-overloading/src/main/resources/OperationOverload.composite b/tags/java/sca/1.3/itest/operation-overloading/src/main/resources/OperationOverload.composite
deleted file mode 100644
index cbf5aa2078..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/src/main/resources/OperationOverload.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://foo"
-	xmlns:foo="http://foo" 
-	name="OperationOverload">
-   
-    <component name="OverloadASourceComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" />
-        <reference name="overloadASourceTarget" target="OverloadATargetComponent"/>
-    </component>
-
-    <component name="OverloadATargetComponent">
-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" />
-    </component>
-     
-</composite>
diff --git a/tags/java/sca/1.3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/tags/java/sca/1.3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
deleted file mode 100644
index 0b3b12c762..0000000000
--- a/tags/java/sca/1.3/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.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.opoverload.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-
-public class OverloadATestCase extends TestCase {
-
-    private SCADomain domain;
-    private OverloadASourceTarget overloadA;
-
-    /**
-     * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
-     * test verifies the values compared are same as the values retrieved from the SCA runtime.
-     */
-    public void testOperationAall() {
-        String[] result = overloadA.operationAall();
-        assertEquals(5, result.length);
-        assertEquals(OverloadASourceTarget.opName, result[0]);
-        assertEquals(OverloadASourceTarget.opName + 11, result[1]);
-        assertEquals(OverloadASourceTarget.opName + "eleven", result[2]);
-        assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]);
-        assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]);
-    }
-
-    public void testOperationAInt() {
-        String result = overloadA.operationA(29);
-        assertEquals(OverloadASourceTarget.opName + 29, result);
-    }
-
-    public void testOperationAString() {
-        String result = overloadA.operationA("rick:-)");
-        assertEquals(OverloadASourceTarget.opName + "rick:-)", result);
-    }
-
-    public void testOperationAIntString() {
-        String result = overloadA.operationA(123, "Tuscany");
-        assertEquals(OverloadASourceTarget.opName + 123 + "Tuscany", result);
-    }
-
-    public void testOperationStringInt() {
-        String result = overloadA.operationA("StringInt", 77);
-        assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result);
-    }
-
-    /**
-     * 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 {
-        domain = SCADomain.newInstance("OperationOverload.composite");
-        overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent");
-    }
-
-    /**
-     * tearDown() is a method in JUnit Frame Work which is executed after all other methods in the class extending
-     * unit.framework.TestCase. So this method is used to close the SCA domain.
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/pom.xml
deleted file mode 100644
index 49f837d3b2..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</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.2</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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 2b8c973e2c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index cc5d44d279..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 2d1bb68e5b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index c39a34cb96..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 4779eff514..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d505834f15..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 6bcf6cef0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index e23e1a2ecd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 644b207e70..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index e649870356..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index 8e8e33ecd1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 5f4a8b94ec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index 57d2ac9e4d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 2e1399bb3b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
deleted file mode 100644
index bb8fb2b07c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/build-bundles.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/build-bundles.xml
deleted file mode 100644
index 82d536cbfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/pom.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/pom.xml
deleted file mode 100644
index af1c258f25..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</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.2</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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index fba9a109b3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index d0b0a13e6d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index d2bf71ed28..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 2556a0cfa0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index e180c37e3f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 0ba54b363a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
deleted file mode 100644
index 7edc392f46..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 828dc6f472..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index 9293b1ff52..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 03077aa4d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index c96deb4e1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
deleted file mode 100644
index 9832da880e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
deleted file mode 100644
index 5586179421..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
deleted file mode 100644
index ccc4f84ee4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 404995a90f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
deleted file mode 100644
index 0441e8c6f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index ac0ca72030..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
deleted file mode 100644
index 2f4b56835b..0000000000
--- a/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ /dev/null
@@ -1 +0,0 @@
-Manifest-Version: 1.0

diff --git a/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index 61f62fa16e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
deleted file mode 100644
index dc4aa2c30e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index d149165366..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/tags/java/sca/1.3/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
deleted file mode 100644
index 4a18aed5f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/pom.xml b/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/pom.xml
deleted file mode 100644
index 58cf2886f4..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</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.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
deleted file mode 100644
index 108481fcbd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.3/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index ea8d272a0c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-contribution/pom.xml b/tags/java/sca/1.3/itest/osgi-contribution/pom.xml
deleted file mode 100644
index d6340f4541..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/build-bundles.xml b/tags/java/sca/1.3/itest/osgi-implementation/build-bundles.xml
deleted file mode 100644
index 53bf014546..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/pom.xml b/tags/java/sca/1.3/itest/osgi-implementation/pom.xml
deleted file mode 100644
index 4f7cda6820..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</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-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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-incubating</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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
deleted file mode 100644
index cfecd989fe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-/*
- * Callback interface
- */
-public interface CallbackCallback {
-
-    public void callbackMessage(String aString);
-
-    public void callbackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
deleted file mode 100644
index 43bc26f2f5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- * Callback test client interface
- */
-public interface CallbackClient {
-
-    public void run();
-
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
deleted file mode 100644
index f78878ef47..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
deleted file mode 100644
index 1c65ca573b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
deleted file mode 100644
index 5383e1e268..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
deleted file mode 100644
index b2af2fa68d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
deleted file mode 100644
index c05a3f52a8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
deleted file mode 100644
index c92f078e49..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
deleted file mode 100644
index af269052c7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
deleted file mode 100644
index 5eb16be597..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
deleted file mode 100644
index 8479624546..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 3aedabc29c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
deleted file mode 100644
index b12e094bc1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
deleted file mode 100644
index 59e128b993..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
deleted file mode 100644
index ff6f16cba3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 4524c6bd3d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
deleted file mode 100644
index bcd24ef0b1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
deleted file mode 100644
index 903f8bf229..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
deleted file mode 100644
index fe8bd23f07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index ec30d641ac..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 34baca71d1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
deleted file mode 100644
index 9285c0a8d5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index 16d0eae990..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-    
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
deleted file mode 100644
index 3d0e045225..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
deleted file mode 100644
index c055aee142..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
deleted file mode 100644
index 661eb5a8cb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
deleted file mode 100644
index 0588da9a85..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
deleted file mode 100644
index fff67e1978..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    
-    public String getGreetings(Name name);
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
deleted file mode 100644
index 98085449e6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
deleted file mode 100644
index 5089019671..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld client
- */
-@Remotable
-public interface HelloWorldClient {
-    
-    public String getGreetings(String firstName, String lastName);
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
deleted file mode 100644
index 1aabf4d10c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
deleted file mode 100644
index 039a214856..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    public String getGreetings(String s);
-
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
deleted file mode 100644
index 4a3cd4aed2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
deleted file mode 100644
index 2251bf5be6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
deleted file mode 100644
index e2d25bf47d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
deleted file mode 100644
index f2ae804ad1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
deleted file mode 100644
index a47f68c579..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 25d7bcf2ff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 2762bc62be..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 80346311b1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a879505610..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
deleted file mode 100644
index c8cb522cf4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 546971860e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
deleted file mode 100644
index 593e55f3f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
deleted file mode 100644
index 18483817ad..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
deleted file mode 100644
index 5ba42780f2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerComponentImpl extends OSGiCustomerComponentImpl {
-    
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
deleted file mode 100644
index bc569d0ac0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Customer service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessCustomerImpl extends OSGiCustomerImpl {
-    
-    public OSGiStatelessCustomerImpl(boolean ignore) { 
-        super(ignore);
-    }
-   
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
deleted file mode 100644
index 599ab51a50..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index df52c6c760..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index aca5943552..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e71c624f49..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
deleted file mode 100644
index a036ecfc76..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
deleted file mode 100644
index db877bb366..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
deleted file mode 100644
index ee1f575e70..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
deleted file mode 100644
index 09e60ca626..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
deleted file mode 100644
index 7dd70889c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
deleted file mode 100644
index 354f40a064..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index d0cf43a960..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index ff40a7ae36..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
deleted file mode 100644
index ef989d6fcf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index effae8c246..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
deleted file mode 100644
index 4effadf208..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
deleted file mode 100644
index 13bce67bb4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-
-
-/**
- * This class implements the Shipper service component.
- */
-@Scope("STATELESS")
-public class OSGiStatelessShipperComponentImpl extends OSGiShipperComponentImpl {
-
-}
diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
deleted file mode 100644
index 071a131f40..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
deleted file mode 100644
index 6ebd1f2894..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
deleted file mode 100644
index b66961b1c2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 9edf3567e5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
deleted file mode 100644
index 659f16be7f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 7c9e102fd2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index bb04ff42e0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
deleted file mode 100644
index 3317816557..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/tags/java/sca/1.3/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
deleted file mode 100644
index 6d1ad76796..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
deleted file mode 100644
index 71e248590b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
deleted file mode 100644
index 7c1125bbb5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
deleted file mode 100644
index 8456b878f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
deleted file mode 100644
index d5a47c6403..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
deleted file mode 100644
index e6391d2159..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
deleted file mode 100644
index c79ede815b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
deleted file mode 100644
index 04cc73b85c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
deleted file mode 100644
index 9ece700efe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
deleted file mode 100644
index 52bc43478d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
deleted file mode 100644
index 0b8d2e5851..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
deleted file mode 100644
index 87370a6df4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
deleted file mode 100644
index 127349eacf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
deleted file mode 100644
index 7e3810c458..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
deleted file mode 100644
index fb9a112d18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
deleted file mode 100644
index ee732b5efc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
deleted file mode 100644
index b1723660d7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
deleted file mode 100644
index 5172cbe21e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
deleted file mode 100644
index b7591e732d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
deleted file mode 100644
index cf8717fcf5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
deleted file mode 100644
index 785212fa6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
deleted file mode 100644
index 7a06030e32..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca, org.osoa.sca.annotations,

-                conversation.service, conversation.referenceclient

-Export-Package: conversation.client

-Bundle-Activator: conversation.client.ConversationalClientActivator

-

diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
deleted file mode 100644
index 5c39b53b0a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca, org.osoa.sca.annotations,

-                conversation.service

-Export-Package: conversation.referenceclient

-Bundle-Activator: conversation.referenceclient.ConversationalReferenceClientActivator

-

diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
deleted file mode 100644
index b8bb809319..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca, org.osoa.sca.annotations,

-                conversation.client

-Export-Package: conversation.service

-Bundle-Activator: conversation.service.ConversationalServiceActivator

-

diff --git a/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
deleted file mode 100644
index 26f32fe617..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
deleted file mode 100644
index 1b9e0e847e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
deleted file mode 100644
index 6066a38f29..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
deleted file mode 100644
index 777edd3f7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
deleted file mode 100644
index d8adaa2ba3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
deleted file mode 100644
index e0bd9d8c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
deleted file mode 100644
index 6005ae785c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
deleted file mode 100644
index 6f0b79ebc2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
deleted file mode 100644
index d4b461460e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
deleted file mode 100644
index bb15e6e3aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
deleted file mode 100644
index 7591201b8c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
deleted file mode 100644
index 0e844fab99..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
deleted file mode 100644
index a8a87c5c8c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
deleted file mode 100644
index 05bbf4db88..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
deleted file mode 100644
index a12d1a21ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
deleted file mode 100644
index 2214db11a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
deleted file mode 100644
index 8d44067992..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
deleted file mode 100644
index 60c0fb3fd3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
deleted file mode 100644
index ca1392d2b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
deleted file mode 100644
index 7c9f67c36d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
deleted file mode 100644
index 760c761666..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
deleted file mode 100644
index 7d56770311..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
deleted file mode 100644
index 321bdc713f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
deleted file mode 100644
index 66f98011cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
deleted file mode 100644
index 6874a66db9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
deleted file mode 100644
index 47d290eb1a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
deleted file mode 100644
index c7f13a50a7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
deleted file mode 100644
index f4c102c4f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
deleted file mode 100644
index cbebf7eec2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
deleted file mode 100644
index 6a3c845cca..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca, org.osoa.sca.annotations,

- 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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
deleted file mode 100644
index cb6345432f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
deleted file mode 100644
index 89871fa8f6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca, org.osoa.sca.annotations,

- 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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
deleted file mode 100644
index d968d1ffc5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
deleted file mode 100644
index fc762df8d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
deleted file mode 100644
index 02e42bc010..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
deleted file mode 100644
index 390367b99b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
deleted file mode 100644
index 4715cbd976..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
deleted file mode 100644
index 932fb8a483..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
deleted file mode 100644
index c799f31606..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
deleted file mode 100644
index db68d7e333..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
deleted file mode 100644
index 1aea3cf669..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
deleted file mode 100644
index 106bd1b6aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
deleted file mode 100644
index 1e3c915a59..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
deleted file mode 100644
index 81c51e6804..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
deleted file mode 100644
index 335bc419c1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
deleted file mode 100644
index a68b9d6dbb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
deleted file mode 100644
index 02f79c15f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
deleted file mode 100644
index 8428b08d96..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
deleted file mode 100644
index c81bf00d00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
deleted file mode 100644
index 61c161617c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
deleted file mode 100644
index fd6a26a65f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
deleted file mode 100644
index 0168bc2435..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
deleted file mode 100644
index 6674cdd7f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
deleted file mode 100644
index 72df35ef41..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
deleted file mode 100644
index 724c8132df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
deleted file mode 100644
index 1e5035d949..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
deleted file mode 100644
index 85bfd86422..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
deleted file mode 100644
index 6e51b3d6f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
deleted file mode 100644
index 9a87758ec2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
deleted file mode 100644
index e134bd1061..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
deleted file mode 100644
index c19895bab1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
deleted file mode 100644
index 707609d2c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
deleted file mode 100644
index e084e5831a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
deleted file mode 100644
index d96f6481fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
deleted file mode 100644
index 10ef690c9b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
deleted file mode 100644
index 003f9dca5a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
deleted file mode 100644
index fefdea106d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
deleted file mode 100644
index f6b847ed59..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
deleted file mode 100644
index 5cff2f573e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
deleted file mode 100644
index 0fec68a725..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
deleted file mode 100644
index ca50b554df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
deleted file mode 100644
index 14658127f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
deleted file mode 100644
index 678014d48d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
deleted file mode 100644
index f0090fb52b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
deleted file mode 100644
index 0b50923a05..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
deleted file mode 100644
index 1000a5f974..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
deleted file mode 100644
index 4e392a9ff1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
deleted file mode 100644
index b10d0416dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
deleted file mode 100644
index 788ec4f19a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
deleted file mode 100644
index 1ba16d0693..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
deleted file mode 100644
index a55ebd02a8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
deleted file mode 100644
index e7459360e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
deleted file mode 100644
index d518ecab62..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
deleted file mode 100644
index d7d0b41f5e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
deleted file mode 100644
index 880304187b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
deleted file mode 100644
index d72db04425..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
deleted file mode 100644
index f9c1218f82..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
deleted file mode 100644
index d8e4c1cb7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
deleted file mode 100644
index a6de268bf6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
deleted file mode 100644
index 660e277693..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
deleted file mode 100644
index 5e0965d047..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
deleted file mode 100644
index 02ae93aec2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
deleted file mode 100644
index c94504f07d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
deleted file mode 100644
index fea03404fd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
deleted file mode 100644
index 3c425fcbc9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
deleted file mode 100644
index f6c04de980..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
deleted file mode 100644
index 87918132e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
deleted file mode 100644
index 9b00787162..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
deleted file mode 100644
index af79dc4bdf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
deleted file mode 100644
index c144a1bc18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/services-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/services/services-test.composite
deleted file mode 100644
index 64f3b30f88..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
deleted file mode 100644
index 0b0aa0912b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
deleted file mode 100644
index 7bcdc6a2bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
deleted file mode 100644
index eadb539ea5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
deleted file mode 100644
index 532293b03f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
deleted file mode 100644
index 877d0de1c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/version-test.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/version/version-test.composite
deleted file mode 100644
index bbb397ee70..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
deleted file mode 100644
index 1fd551be3b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
deleted file mode 100644
index 5599c44bc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
deleted file mode 100644
index 8743f8c145..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
deleted file mode 100644
index d349edf265..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
deleted file mode 100644
index 617200d8dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
deleted file mode 100644
index 213cde2c1d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
deleted file mode 100644
index 0dca0da75e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
deleted file mode 100644
index 953045fefa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
deleted file mode 100644
index c621d9aca0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
deleted file mode 100644
index 6d3f853382..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/tags/java/sca/1.3/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
deleted file mode 100644
index d545c844d2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
deleted file mode 100644
index 54b9b00bc8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
deleted file mode 100644
index b26bfbd98d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
deleted file mode 100644
index 667df7aa12..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
deleted file mode 100644
index a95437f8c1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
deleted file mode 100644
index c5d94df93d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
deleted file mode 100644
index d340923938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
deleted file mode 100644
index c1f11d0b6e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
deleted file mode 100644
index 49afb3d8e8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
deleted file mode 100644
index a858c18a90..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
deleted file mode 100644
index a9941aebcd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
deleted file mode 100644
index 8e939b1a83..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
deleted file mode 100644
index 39d90bb75c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
deleted file mode 100644
index 5376687b61..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
deleted file mode 100644
index 6d8dc1021e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
deleted file mode 100644
index e037ae9675..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
deleted file mode 100644
index eecf67913d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
deleted file mode 100644
index 203bf5123c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
deleted file mode 100644
index 429b1f10ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
deleted file mode 100644
index dbc980f8c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
deleted file mode 100644
index e39295a402..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
deleted file mode 100644
index c2f6bff4f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
deleted file mode 100644
index 17ba7a2f14..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
deleted file mode 100644
index 8c33720018..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
deleted file mode 100644
index 0c6edd6691..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
deleted file mode 100644
index 0b48ac90ba..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
deleted file mode 100644
index c84741f34f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
deleted file mode 100644
index 5a9b2a8b1d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/tags/java/sca/1.3/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
deleted file mode 100644
index 7b95c12038..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/tags/java/sca/1.3/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
deleted file mode 100644
index 8399991503..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
deleted file mode 100644
index 2b797cd45f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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.2</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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
deleted file mode 100644
index 6362385a13..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.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.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.xml.sax, " +

-            "org.xml.sax.ext, " +

-            "org.xml.sax.helpers, " +

-            "javax.security.auth, " +

-            "javax.security.auth.login, " +

-            "javax.security.auth.callback, " +

-            "javax.naming, " +

-            "javax.naming.spi, " +

-            "javax.naming.directory, " +

-            "javax.management, " + 

-            "javax.imageio, " +

-            "sun.misc, " +

-            "javax.net, " +

-            "javax.crypto, " +

-            "javax.rmi, " +

-            "javax.transaction, " +

-            "javax.transaction.xa";

-        

-        return systemPackages;

-    

-    }

-

-}

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
deleted file mode 100644
index ace762bb47..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.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.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 junit.framework.TestResult;
-
-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 {
-        
-        TestResult testResult = new TestResult();
-        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);
-            runTestCase(testClass, testResult);
-        }    
-        
-        Assert.assertEquals(0, testResult.errorCount());
-
-    }
-}
diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
deleted file mode 100644
index 3f3774899d..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-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.TestCase;

-import junit.framework.TestResult;

-

-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.AfterClass;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.junit.Test;

-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 {

-        

-        TestResult testResult = new TestResult();

-        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);

-            runTestCase(testClass, testResult);

-        }    

-        

-        Assert.assertEquals(0, testResult.errorCount());

-

-    }

-    

-

-    public void runTestCase(Class testClass, TestResult testResult) throws Exception {

-        

-        boolean isJunitTest = TestCase.class.isAssignableFrom(testClass);

-        if (testClass.getName().endsWith("TestCase") &&

-                    !testClass.getPackage().getName().startsWith("org.apache.tuscany.sca.test.osgi")) {

-            Object test = (Object)testClass.newInstance();

-

-            System.out.println("Running test " + test + " ");

-            int ran = 0;

-            int failed = 0;

-            ArrayList<Method> testMethods = new ArrayList<Method>();

-            Method setupMethod = null;

-            Method tearDownMethod = null;

-            Method setupClassMethod = null;

-            Method tearDownClassMethod = null;

-            Method[] methods = testClass.getDeclaredMethods();

-            for (final Method method : methods) {

-                if ((isJunitTest && method.getName().startsWith("test"))

-                        || method.getAnnotation(Test.class) != null) {

-                    testMethods.add(method);

-

-                } else if ((isJunitTest && method.getName().equals("setUp"))

-                        || method.getAnnotation(Before.class) != null) {

-

-                    setupMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if ((isJunitTest && method.getName().equals("tearDown"))

-                        || method.getAnnotation(After.class) != null) {

-

-                    tearDownMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if (method.getAnnotation(BeforeClass.class) != null) {

-

-                    setupClassMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                } else if (method.getAnnotation(AfterClass.class) != null) {

-

-                    tearDownClassMethod = method;

-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {

-                        public Object run() {

-                            method.setAccessible(true);

-                            return null;

-                        }

-                    });

-

-                }

-            }

-            try {

-                if (setupClassMethod != null)

-                    setupClassMethod.invoke(null);

-                for (Method testMethod : testMethods) {

-

-                    ran++;

-                    failed++;

-                    try {

-                        if (setupMethod != null)

-                            setupMethod.invoke(test);

-

-                        testMethod.invoke(test);

-                        failed--;

-

-                    } catch (Exception e) {

-                        e.printStackTrace();

-                        throw e;

-                    } finally {

-                        if (tearDownMethod != null)

-                            tearDownMethod.invoke(test);

-                    }

-                }

-            } catch (Exception e) {

-                e.printStackTrace();

-                throw e;

-            } finally {

-

-                System.out.println("Ran: " + ran + ", Passed: " + (ran - failed) + ", Failed: " + failed);

-                if (tearDownClassMethod != null)

-                    tearDownClassMethod.invoke(null);

-            }

-        }    

-    }

-}

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 8985947286..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca,

-  org.osoa.sca.annotations,

-  org.apache.tuscany.sca.databinding.annotation

-DynamicImport-Package: *

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/tags/java/sca/1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
deleted file mode 100644
index 6a38f48c4a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/pom.xml
deleted file mode 100644
index 1a4d5c6084..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/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-itest</artifactId>

-        <version>1.3</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-osgi-installer</module>

-        <module>osgi-tuscany-test</module>

-    </modules>

-    

-</project>

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/sca-api/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/sca-api/pom.xml
deleted file mode 100644
index 80b945499b..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/sca-api/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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-sca-api</artifactId>
-    <name>Apache Tuscany OSGi - SCA API Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA API Bundle</Bundle-Description>
-                        <Export-Package>org.osoa.sca*;version="2.0"</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/build-bundles.xml b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/build-bundles.xml
deleted file mode 100644
index c7ea66863f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/pom.xml
deleted file mode 100644
index c54abf37a8..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
deleted file mode 100644
index 0ac96b35a3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index a3aa2531fc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 5f1342c40b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index f5708dec40..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 17b342f8dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index afaf7aea02..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index cd204ebc2e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index ca720085c5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index b4807b80d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
deleted file mode 100644
index f71d822bbe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca,

-                org.osoa.sca.annotations,

-                javax.xml.bind.annotation

-Export-Package: supplychain.customer, supplychain

-

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
deleted file mode 100644
index 13a3c9b82a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca,

-        org.osoa.sca.annotations,

-        javax.xml.bind.annotation

-Export-Package: supplychain.client

-Bundle-Activator: supplychain.client.SupplyChainClient

-

diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b524abc2a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
deleted file mode 100644
index 8549ca3409..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/tags/java/sca/1.3/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
deleted file mode 100644
index 88d1e72efc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
deleted file mode 100644
index ec74a4c56c..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-3rdparty</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany 3rdParty Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>6.1.7</version>
-        </dependency>
-  
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.3rdparty</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA 3rd party Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-Dependency>
-                            tuscany-sdo*,
-                            tuscany-das*,
-                            !tuscany*
-                        </Embed-Dependency>
-                        <_exportcontents>
-                            !org.apache.tuscany.sca*,
-                            !org.osoa.sca*,
-                            org.mortbay*;version="6.1.7",
-                            commonj.sdo*;version="2.1.0",
-                            *
-                        </_exportcontents>
-                        <Import-Package>*;resolution:=optional</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml
deleted file mode 100644
index 819b387c9f..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-extensions/pom.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-tuscany-extensions</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Extensions Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-dwr</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-groovy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-fastinfoset</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-xmlbeans</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-das</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-data-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-engine-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.extensions</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA Extensions Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                        <Import-Package>*;version="0"</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
deleted file mode 100644
index 5d1ec6163c..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ /dev/null
@@ -1,651 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</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-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</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</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-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-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-tomcat</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-node2-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-node2-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-tomcat</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>
-                <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/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
deleted file mode 100644
index 2366acd094..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.net.URL;
-import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.HashMap;
-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 static final String TUSCANY_INSTALLER_JAR = "tuscany-sca-osgi-installer.jar";
-    private static final String TUSCANY_CLASSPATH = "org/apache/tuscany/sca/installer/.classpath";
-
-    private static final String TUSCANY_OSGI_MANIFEST_DIR = "org/apache/tuscany/sca/manifest";
-    
-    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",
-        
-    };
-    
-	public void start(BundleContext bundleContext) throws Exception {
-		
-        installTuscanyIntoOSGi(bundleContext);
-	}
-
-	public void stop(BundleContext bundleContext) throws Exception {
-        
-        for (Bundle bundle : tuscanyBundles) {
-            try {
-                bundle.stop();
-            } catch (Exception e) {
-                // Ignore error
-            }
-        }
-	}
-	
-    private void installTuscanyIntoOSGi(BundleContext bundleContext) {
-    
-        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>();
-            HashMap<File, InputStream> thirdPartyJarsWithManifests = new HashMap<File, InputStream>();
-            HashSet<File> thirdPartyJars = new HashSet<File>();
-            
-            findJars(bundleContext, tuscanyJars, thirdPartyJars, thirdPartyJarsWithManifests);
-            File tuscanyInstallDir = findTuscanyInstallDir(bundleContext.getBundle());
-            
-            for (File bundleFile : thirdPartyJarsWithManifests.keySet()) {
-                                
-                String bundleLocation = bundleFile.toURI().toURL().toString();
-                InputStream bundleManifestStream = thirdPartyJarsWithManifests.get(bundleFile);
-                HashSet<File> jarSet = new HashSet<File>();
-                jarSet.add(bundleFile);
-                
-                File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName());
-                if (realBundleFile.exists()) 
-                    bundleContext.installBundle(realBundleFile.toURI().toURL().toString());
-                else                
-                    createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet);
-                bundleManifestStream.close();
-                
-            }
-            
-            for (File bundleFile : thirdPartyJars) {
-                
-                String bundleName = bundleFile.getName();
-                if (bundleName.startsWith("org.apache.felix"))
-                    continue;
-                
-                String bundleSymbolicName = "org.apache.tuscany.sca.3rdparty." + bundleName;
-                if (bundleSymbolicName.endsWith(".jar")) bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length()-4);
-                if (installedBundleSet.contains(bundleSymbolicName))
-                    continue;
-                
-                String bundleLocation = bundleFile.toURI().toURL().toString();
-                InputStream bundleManifestStream = createBundleManifest(bundleFile, bundleSymbolicName);
-                HashSet<File> jarSet = new HashSet<File>();
-                jarSet.add(bundleFile);
-
-                File realBundleFile = new File(tuscanyInstallDir, "org.apache.tuscany.sca."+bundleFile.getName());
-                if (realBundleFile.exists()) 
-                    bundleContext.installBundle(realBundleFile.toURI().toURL().toString());
-                else 
-                    createAndInstallBundle(bundleContext, bundleLocation, realBundleFile, bundleManifestStream, jarSet);
-                bundleManifestStream.close();
-               
-            }
-            
-            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 findJars(BundleContext bundleContext, 
-            HashSet<File> tuscanyJars, 
-            HashSet<File> thirdPartyJars, 
-            HashMap<File, InputStream> thirdPartyBundleManifests) 
-    throws IOException
-    {
-        
-        Bundle installerBundle = bundleContext.getBundle();   
-        File tuscanyInstallDir = findTuscanyInstallDir(installerBundle);
-        
-        URL classPathURL = installerBundle.getResource(TUSCANY_CLASSPATH);
-        InputStream stream = classPathURL.openStream();
-        byte[] classPathBytes = new byte[stream.available()];
-        stream.read(classPathBytes);
-        String classPath = new String(classPathBytes);
-        
-        // Path separator overrides are not supported by older versions of maven
-        String pathSeparator = ":";
-        if (classPath.indexOf(";") > 0) pathSeparator = ";";
-        
-        String[] classPathEntries = classPath.split(pathSeparator);
-        for (String classPathEntry : classPathEntries) {
-            classPathEntry = classPathEntry.trim();
-            File jar = new File(classPathEntry);
-            if (!jar.exists()) {
-                jar = new File(tuscanyInstallDir, jar.getName());
-                if (!jar.exists())
-                    jar = new File(tuscanyInstallDir, "modules" + File.separator + jar.getName());
-                if (!jar.exists())
-                    jar = new File(tuscanyInstallDir, "lib" + File.separator + jar.getName());
-            }
-
-            String jarName = jar.getName();
-            if (!jarName.startsWith("tuscany") || jarName.startsWith("tuscany-sdo") || jarName.startsWith("tuscany-das")) {
-                if (jarName.endsWith(".jar")) {
-                    String manifestName = TUSCANY_OSGI_MANIFEST_DIR + "/" + jarName.substring(0, jarName.length()-4) + ".mf";
-                    InputStream manifestStream;
-                    if ((manifestStream = this.getClass().getClassLoader().getResourceAsStream(manifestName)) != null)
-                        thirdPartyBundleManifests.put(jar, manifestStream);
-                    else
-                        thirdPartyJars.add(jar);
-                }
-            } else {
-                boolean installTuscanyJar = true;
-                for (String name : tuscanyModulesToIgnore) {
-                    if (jarName.startsWith("tuscany-" + name)) {
-                        installTuscanyJar = false;
-                        break;
-                    }
-                }
-                if (installTuscanyJar)
-                    tuscanyJars.add(jar);
-            }
-        }
-        
-        
-    }
-    
-    private File findTuscanyInstallDir(Bundle installerBundle) 
-    throws IOException
-    {
-        String tuscanyDirName;
-        if ((tuscanyDirName = System.getenv("TUSCANY_HOME")) != null) {
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-        if ((tuscanyDirName = System.getProperty("TUSCANY_HOME")) != null) {
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-         
-        String location = installerBundle.getLocation();
-        
-        if (location != null && location.startsWith("file:") && location.endsWith(TUSCANY_INSTALLER_JAR)) {
-            tuscanyDirName = location.substring(5, location.length()-TUSCANY_INSTALLER_JAR.length()); // strip "file:" and installer jar name
-            File tuscanyInstallDir = new File(tuscanyDirName);
-            if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                return tuscanyInstallDir;
-        }
-        if (this.getClass().getProtectionDomain() != null) {
-            CodeSource codeSource = this.getClass().getProtectionDomain().getCodeSource();
-            if (codeSource != null) {
-                try {
-                    File tuscanyInstallDir = new File(codeSource.getLocation().toURI());
-                    if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory())
-                        return tuscanyInstallDir;
-                } catch (Exception e) {
-                    // ignore
-                }                     
-            }
-        }
-        return null;
-    }
-    
-    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 InputStream createBundleManifest(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)
-            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 (attributes.getValue("Manifest-Version") == null) {
-            attributes.putValue("Manifest-Version", "1.0");
-        }
-        if (isImmutableJar)
-            attributes.putValue("Bundle-ClassPath", bundleName);
-        
-        HashSet<String> packages = getPackagesInJar(bundleName, jar);
-        String version = getJarVersion(bundleName);
-
-        attributes.remove(new Attributes.Name("Require-Bundle"));
-        attributes.remove(new Attributes.Name("Import-Package"));
-        
-        if (attributes.getValue("Bundle-SymbolicName") == null)
-            attributes.putValue("Bundle-SymbolicName", bundleSymbolicName);
-        if (attributes.getValue("Bundle-Version") == null)
-            attributes.putValue("Bundle-Version", version);
-        // 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("tuscany-sdo-impl")) {
-            attributes.putValue("Export-Package", packagesToString(packages, version));
-            attributes.putValue("Import-Package", packagesToString(packages, null));
-        }
-        
-        attributes.putValue("DynamicImport-Package", "*");       
-        
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        manifest.write(out);
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        out.close();
-               
-        return in;
-        
-    }
-    
-    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/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml
deleted file mode 100644
index d2dd94775b..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-runtime/pom.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-runtime</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany Runtime Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA Runtime Bundle</Bundle-Description>
-                        <Bundle-Activator>org.apache.tuscany.sca.osgi.runtime.OSGiBundleActivator</Bundle-Activator>
-                        <DynamicImport-Package>org.apache.felix.main,org.eclipse.core.runtime.adaptor</DynamicImport-Package>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-spi/pom.xml b/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-spi/pom.xml
deleted file mode 100644
index 25c74bb163..0000000000
--- a/tags/java/sca/1.3/itest/osgi-tuscany/tuscany-spi/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-osgi-tuscany-tuscany-spi</artifactId>
-    <name>Apache Tuscany OSGi - Tuscany SPI Bundle</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>    
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.spi</Bundle-SymbolicName>
-                        <Bundle-Description>Apache Tuscany SCA SPI Bundle</Bundle-Description>
-                        <Embed-StripVersion>true</Embed-StripVersion>
-                        <Embed-StripGroup>true</Embed-StripGroup>
-                        <Embed-Dependency>tuscany*</Embed-Dependency>
-                        <_exportcontents>
-                            org.apache.tuscany.sca.*;version="2.0"
-                        </_exportcontents>
-                    </instructions>
-                </configuration>
-            </plugin> 
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/policy-security-jsr250/pom.xml b/tags/java/sca/1.3/itest/policy-security-jsr250/pom.xml
deleted file mode 100644
index 6f45a90c38..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-jsr250</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 3569410e7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 3e752144a0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/resources/definitions.xml b/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/resources/definitions.xml
deleted file mode 100644
index 64b8a95d18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/tags/java/sca/1.3/itest/policy-security-jsr250/src/main/resources/helloworld.composite
deleted file mode 100644
index 456ca450f1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/tags/java/sca/1.3/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
deleted file mode 100644
index da5f6409ba..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security/pom.xml b/tags/java/sca/1.3/itest/policy-security/pom.xml
deleted file mode 100644
index ca47164695..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/itest/policy-security/src/main/resources/definitions.xml b/tags/java/sca/1.3/itest/policy-security/src/main/resources/definitions.xml
deleted file mode 100644
index c8118a0caf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security/src/main/resources/helloworld.composite b/tags/java/sca/1.3/itest/policy-security/src/main/resources/helloworld.composite
deleted file mode 100644
index 9e0f289f87..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/tags/java/sca/1.3/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
deleted file mode 100644
index 9dad17741e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/pom.xml b/tags/java/sca/1.3/itest/policy/pom.xml
deleted file mode 100644
index d24b025479..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>   
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/policy/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/AddService.java
deleted file mode 100644
index 3e56bf3fad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The Add service interface
- */
-@Remotable
-@Service
-//@Requires(PolicyQNames.TEST_INTENT_FIVE)
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/itest/policy/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9abc488523..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index a1880698ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 28ce0ec78a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/DivideService.java
deleted file mode 100644
index f72b05cece..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The divide service interface
- */
-@Remotable
-@Service
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/PolicyQNames.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/PolicyQNames.java
deleted file mode 100644
index 3e1bc45842..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
deleted file mode 100644
index 4b04a4d0b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
deleted file mode 100644
index 3dcadd724e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/tags/java/sca/1.3/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
deleted file mode 100644
index 3d314a9d14..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/resources/Calculator.composite b/tags/java/sca/1.3/itest/policy/src/main/resources/Calculator.composite
deleted file mode 100644
index aed7684099..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index d9f144b3ff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/policy/src/main/resources/definitions.xml b/tags/java/sca/1.3/itest/policy/src/main/resources/definitions.xml
deleted file mode 100644
index 7ae6b2c547..0000000000
--- a/tags/java/sca/1.3/itest/policy/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,148 +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: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/tags/java/sca/1.3/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/tags/java/sca/1.3/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
deleted file mode 100644
index 885e8314ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/pom.xml b/tags/java/sca/1.3/itest/pom.xml
deleted file mode 100644
index 8721298462..0000000000
--- a/tags/java/sca/1.3/itest/pom.xml
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-itest</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Integration Tests</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <was.ant.script>${basedir}/build-was-integration.xml</was.ant.script>
-        <was.python.script>${basedir}/wasAdmin.py</was.python.script>
-    </properties>
-
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>bpel</module>
-                <module>builder</module>
-                <module>callablereferences</module>
-                <module>callablereferences-ws</module>
-                <module>callback-api</module>
-                <module>callback-basic</module>
-                <module>callback-complex-type</module>
-                <module>callback-id</module>
-                <module>callback-multiple-wires</module>
-                <module>callback-separatethread</module>
-                <module>callback-set-callback</module>
-                <module>callback-set-conversation</module>
-                <module>component-type</module>
-                <module>contribution</module>
-                <module>contribution-multiple</module>
-                <module>contribution-import-export</module>
-                <module>contribution-classloader</module>
-                <module>conversations</module>
-                <module>conversations-ws</module>
-                <module>databindings</module>
-                <module>exceptions</module>
-                <module>exceptions-cross-binding</module>
-                <module>exceptions-cross-binding-ws</module>
-                <module>exceptions-simple-ws</module>
-                <module>extended-api</module>
-                <module>interfaces</module>
-                <module>jms</module>
-                <module>late-reference-resolution</module>
-                <module>oneway</module>
-                <module>operation-overloading</module>
-                <module>osgi-implementation</module>
-                <module>osgi-contribution</module>
-                <module>policy</module>
-                <module>policy-security</module>
-                <module>policy-security-jsr250</module>
-                <module>properties</module>
-                <module>recursive</module>
-                <module>recursive-multi-level</module>
-                <module>recursive-ws</module>
-                <module>references</module>
-                <module>serialization</module>
-                <module>services</module>
-                <module>spring</module>
-                <module>scopes</module>
-                <module>transaction</module>
-                <module>validation</module>
-                <module>wires</module>
-                <module>wsdl</module>
-                <module>wsdlless</module>
-                <module>wsdl2java</module>
-                <module>wsdl-multiple</module>
-                <module>ws-void-args-return</module>
-           </modules>
-        </profile>
-        
-        <!-- 
-        This profile handles generation of jar/war artifacts to be used in executing tests in a web-container
-        -->
-        <profile>
-            <id>webapp</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-            
-            <dependencies>
-                <dependency>
-	    	    <groupId>org.apache.tuscany.sca</groupId>
-	    	    <artifactId>tuscany-host-webapp</artifactId>
-	    	    <version>1.3</version>
-                    <scope>runtime</scope>
-	    	</dependency>
-                <dependency>
-	    	    <groupId>org.apache.tuscany.sca</groupId>
-	    	    <artifactId>tuscany-host-webapp-junit</artifactId>
-	    	    <version>1.3</version>
-                    <scope>runtime</scope>
-	    	</dependency>
-                <dependency>
-	    	    <groupId>javax.servlet</groupId>
-	    	    <artifactId>servlet-api</artifactId>
-	    	    <version>2.3</version>
-                    <scope>provided</scope>
-	    	</dependency>
-	    </dependencies>    
-
-            <modules>
-                <module>callback-api</module>
-                <module>callback-basic</module>
-                <!--
-                <module>callback-complex-type</module>
-                -->
-                <module>callback-id</module>
-                <module>callback-multiple-wires</module>
-                <module>callback-set-callback</module>
-                <module>callback-set-conversation</module>
-                <!--
-                <module>contribution</module>
-                <module>contribution-multiple</module>
-                <module>contribution-import-export</module>
-                <module>contribution-classloader</module>
-                -->
-                <module>conversations</module>
-                <module>exceptions</module>
-                <module>exceptions-cross-binding</module>
-                <module>extended-api</module>
-                <module>oneway</module>
-                <module>operation-overloading</module>
-                <!--
-                <module>properties</module>
-                <module>recursive</module>
-                -->
-                <module>references</module>
-                <module>services</module>
-                <module>component-type</module>
-                <module>interfaces</module>
-                <module>wires</module>
-                <module>scopes</module>
-            </modules>
-
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <!-- Skip local junit test cases -->
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.3.1</version>
-                            <configuration>
-                                <skip>true</skip>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-
-                <plugins>
-
-                    <!-- Create jar containing the jUnit tests -->
-                    <!--
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <configuration>
-                                    <finalName>junit</finalName>
-                                </configuration>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>test-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    -->
-
-                    <!-- Generate web-xml -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Create war and include jUnit test classes -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>2.0.2</version>
-                        <configuration>
-                            <primaryArtifact>false</primaryArtifact>
-                            <!-- Exclude a few jars to avoid conflicts -->
-                            <warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
-                            <webResources>
-                                <!-- Add the tests jar into the WAR -->
-                                <!--
-                                <resource>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>*-tests.jar</include>
-                                    </includes>
-                                    <targetPath>WEB-INF/lib</targetPath>
-                                </resource>
-                                -->
-
-                                <resource>
-                                    <directory>${project.build.directory}/test-classes</directory>
-                                    <targetPath>WEB-INF/classes</targetPath>
-                                </resource>
-
-                                <resource>
-                                    <directory>${project.build.directory}/classes/META-INF</directory>
-                                    <includes>
-                                        <include>sca-contribution*.xml</include>
-                                    </includes>
-                                    <targetPath>META-INF</targetPath>
-                                </resource>
-
-                                <!-- Add the junit -->
-                                <resource>
-                                    <directory>${settings.localRepository}/junit/junit/4.2</directory>
-                                    <includes>
-                                        <include>junit-4.2.jar</include>
-                                    </includes>
-                                    <targetPath>WEB-INF/lib</targetPath>
-                                </resource>
-
-                            </webResources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>war</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>tomcat</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-           <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>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</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>installed</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>${http.port}</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>
-                </plugins>
-            </build>
-        </profile>
-
-
-        <profile>
-            <id>jetty</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>src</exists>
-                </file>
-                -->
-            </activation>
-           <properties>
-               <http.port>8085</http.port>
-               <http.base>http://127.0.0.1:${http.port}</http.base>
-               <jetty.home>${env.JETTY_HOME}</jetty.home>
-           </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</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>jetty6x</containerId>
-                                <type>embedded</type>
-                                <home>${jetty.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>${http.port}</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-jetty</home>
-                            </configuration>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>geronimo</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!--
-                <file>
-                    <exists>${geronimo.home}</exists>
-                </file>
-                -->
-            </activation>
-            <properties>
-                <http.port>8080</http.port>
-                <http.base>http://127.0.0.1:${http.port}</http.base>
-                <geronimo.home>${env.GERONIMO_HOME}</geronimo.home>
-            </properties>
-
-            <build>
-                <plugins>
-                    <!-- Generate web-xml and geronimo deployment descriptor -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <configuration>
-                                    <geronimo>true</geronimo>
-                                </configuration>
-                                <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.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                        <version>2.1.1</version>
-                        <configuration>
-                            <geronimoHome>${geronimo.home}</geronimoHome>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                                <configuration>
-                                    <background>true</background>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>deploy-war</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>deploy</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleArchive>${project.build.directory}/${project.build.finalName}.war</moduleArchive>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>undeploy-war</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                                <configuration>
-                                    <username>system</username>
-                                    <password>manager</password>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>websphere</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <http.port>8080</http.port>
-                <http.base>http://127.0.0.1:${http.port}</http.base>
-                <websphere.home>${env.WAS_HOME}</websphere.home>
-            </properties>
-
-            <build>
-                <plugins>
-                    <!-- Generate web-xml and geronimo deployment descriptor -->
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-web-junit</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>generate-web-xml</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>web-junit-test</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <url>${http.base}/${project.build.finalName}/junit?op=runAll</url>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-		    <!--WAS ant integration -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <executions>
-                            <!-- start Websphere server -->
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="startServer"/>
-	                            </tasks>
-	                        </configuration>
-	                    </execution>
-                            <!-- Deploy war application -->
-                            <execution>
-                                <id>deploy-war</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="installApplication">
-                                            <property name="was.python.script" value="${was.python.script}"/>
-                                            <property name="application.war" value="${project.build.directory}/${project.build.finalName}.war"/>
-                                            <property name="application.name" value="${project.build.finalName}.war"/>
-                                            <property name="application.contextRoot" value="${project.build.finalName}"/>
-                                            <property name="application.server" value="server1"/>
-                                        </ant>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-                            <!-- unDeploy war application -->
-                            <execution>
-                                <id>undeploy-war</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="uninstallApplication">
-                                            <property name="was.python.script" value="${was.python.script}"/>
-                                            <property name="application.name" value="${project.build.finalName}.war"/>
-                                        </ant>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-                            <!-- Stop Websphere server -->
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-	                        <configuration>
-	                            <tasks>
-	                                <ant antfile="${was.ant.script}" target="stopServer"/>
-	                            </tasks>
-	                        </configuration>
-                            </execution>
-
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/promotion-interface-missmatch/pom.xml b/tags/java/sca/1.3/itest/promotion-interface-missmatch/pom.xml
deleted file mode 100644
index a6afef6d9c..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
deleted file mode 100644
index 764f31b7cd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
deleted file mode 100644
index 0c72b52ed9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
deleted file mode 100644
index d6545b5a23..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
deleted file mode 100644
index 30ea559694..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExampleService {
-
-	String hello(String name) throws BusinessException;
-}
diff --git a/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
deleted file mode 100644
index b3b6f033e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/example.composite b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/example.composite
deleted file mode 100644
index cddf951d65..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
deleted file mode 100644
index a8ccde2e11..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
deleted file mode 100644
index 2caec0f20d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.3/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
deleted file mode 100644
index 740af4f43d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/properties/pom.xml b/tags/java/sca/1.3/itest/properties/pom.xml
deleted file mode 100644
index e1a8dfb903..0000000000
--- a/tags/java/sca/1.3/itest/properties/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>1.3</version>

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

-    </parent>

-    <artifactId>itest-properties</artifactId>

-    <name>Apache Tuscany SCA Properties Integration Tests</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-databinding-sdo</artifactId>

-            <version>1.3</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-databinding-jaxb</artifactId>

-            <version>1.3</version>

-            <scope>compile</scope>

-        </dependency>

-    </dependencies>

-    <build>

-        <plugins>

-		    <plugin>

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

-                <artifactId>tuscany-sdo-plugin</artifactId>

-                <version>1.1-incubating</version>

-                <executions>

-                    <execution>

-                        <id>generate-customer-sdo</id>

-                        <phase>generate-sources</phase>

-                        <configuration>

-                            <schemaFile>${basedir}/src/main/resources/customer.xsd</schemaFile>

-                            <javaPackage>com.example.customer.sdo</javaPackage>

-                            <noNotification>true</noNotification>

-                            <noContainer>true</noContainer>

-                            <noUnsettable>true</noUnsettable>

-                        </configuration>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-		</plugins>

-    </build>

-</project>

diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
deleted file mode 100644
index b0fd64c9da..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/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 mysca.test.myservice.impl;
-
-public interface MyService {
-    /**
-     * This is a method to get the location property value from the sca runtime environment. It is implemented in the
-     * class MyServiceImpl
-     */
-    String getLocation();
-
-    /**
-     * This is a method to get the year property value from the sca runtime environment. It is implemented in the class
-     * MyServiceImpl
-     */
-    String getYear();
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
deleted file mode 100644
index 51d064ba81..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.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 mysca.test.myservice.impl;
-
-import java.util.logging.Logger;
-
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface MyService and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-
-@Service(MyService.class)
-public class MyServiceImpl implements MyService {
-
-    @Property(name = "location")
-    protected String location = "RTP";
-
-    @Property(name = "year")
-    protected String year = "2006";
-
-    @ComponentName
-    protected String componentName;
-
-    private Logger logger;
-
-    /**
-     * @ to print the message in the log
-     */
-    public MyServiceImpl() {
-        logger = Logger.getAnonymousLogger();
-        logger.info("creating service instance...");
-    }
-
-    /**
-     * @Init annotation to Start the service. Which is executed all the time
-     */
-    @Init
-    public void start() {
-        logger.info("Start service..");
-    }
-
-    /**
-     * @Destroy annotation to stop the service. Which is executed in the end
-     */
-    @Destroy
-    public void stop() {
-        logger.info("Stop service..");
-
-    }
-
-    public String getComponentName() {
-        return componentName;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public String getYear() {
-        return year;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
deleted file mode 100644
index 38c26e70d6..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.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 mysca.test.myservice.impl;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class Implements the interface MyService and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-
-@Service(MyService.class)
-public class MyTotalServiceImpl implements MyService {
-
-    // default required==true so it is 1:1
-    @Reference
-    public MyService myService;
-
-    public String getLocation() {
-        return myService.getLocation();
-    }
-
-    public String getYear() {
-        return myService.getYear();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
deleted file mode 100644
index 68ce5a3cb6..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.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;
-
-/**
- * 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 ABCDComponentImpl Class
- */
-public interface ABCDComponent {
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getA();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getB();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getC();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABCDComponentImpl
-     */
-    String getD();
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
deleted file mode 100644
index 6b714c0d67..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.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;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * This class Implements the interface ABCDComponent and gives implementation for all methods which are declared in that
- * interface. scope is specified as Composite using
- * 
- * @scope annotation.
- */
-@Scope("COMPOSITE")
-public class ABCDComponentImpl implements ABCDComponent {
-    private ABComponent abComponent;
-    private CDComponent cdComponent;
-
-    /**
-     * It is a method which injects the property value to the variable 'abComponent' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Reference
-    public void setAb(ABComponent component) {
-        this.abComponent = component;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'cdComponent' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Reference
-    public void setCd(CDComponent component) {
-        this.cdComponent = component;
-    }
-
-    public String getA() {
-        return this.abComponent.getA();
-    }
-
-    public String getB() {
-        return this.abComponent.getB();
-    }
-
-    public String getC() {
-        return this.cdComponent.getC();
-    }
-
-    public String getD() {
-        return this.cdComponent.getD();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
deleted file mode 100644
index 586d4864a9..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.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;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * 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 ABComponentImpl Class
- */
-@Remotable
-public interface ABComponent {
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-
-    String getA();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getB();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getZ();
-
-    /**
-     * This is a method to get an integer property value from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    int getIntValue();
-
-    /**
-     * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class
-     * ABComponentImpl
-     */
-    String getF();
-
-    /**
-     * This is a method to get collection of property values from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    Collection<String> getManyStringValues();
-
-    /**
-     * This is a method to get collection of property value from the SCA runtime environment. It is implemented in the
-     * class ABComponentImpl
-     */
-    Collection<Integer> getManyIntegers();
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
deleted file mode 100644
index 5e3c985144..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.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.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * This class Implements the interface ABComponent and gives implementation for all methods which are declared in that
- * interface.
- */
-
-public class ABComponentImpl implements ABComponent {
-
-    private String aProperty;
-    private String bProperty;
-    private int intValue;
-    private Collection<String> manyStringValues;
-    private Collection<Integer> manyIntegerValues;
-    private String zProperty;
-    private String fProperty;
-
-    /**
-     * It is a method which injects the property value to the variable 'zProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property(name = "xpath")
-    public void setZProperty(final String value) {
-        this.zProperty = value;
-    }
-
-    /**
-     * It is a method which injects collection of property values to the variable 'manyStringValues' from the SCA
-     * runtime environment using Annotations.
-     */
-    @Property(name = "foobar")
-    public void setManyStringValues(final Collection<String> value) {
-        this.manyStringValues = value;
-    }
-
-    /**
-     * It is a method which injects collection of integer property values to the variable 'manyIntegerValues' from the
-     * SCA runtime environment using Annotations.
-     */
-    @Property(name = "fooInts")
-    public void setManyIntegers(final Collection<Integer> value) {
-        this.manyIntegerValues = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'aProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setA(final String A) {
-        this.aProperty = A;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'bProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setB(final String B) {
-        this.bProperty = B;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'fProperty' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setF(final String F) {
-        this.fProperty = F;
-    }
-
-    /**
-     * It is a method which injects integer property value to the variable 'intValue' from the SCA runtime environment
-     * using Annotations.
-     */
-    @Property
-    public void setOne(final int value) {
-        this.intValue = value;
-    }
-
-    public String getA() {
-        return this.aProperty;
-    }
-
-    public String getB() {
-        return this.bProperty;
-    }
-
-    public int getIntValue() {
-        return this.intValue;
-    }
-
-    public String getZ() {
-        return this.zProperty;
-    }
-
-    public String getF() {
-        return this.fProperty;
-    }
-
-    public Collection<String> getManyStringValues() {
-        return manyStringValues;
-    }
-
-    public Collection<Integer> getManyIntegers() {
-        return manyIntegerValues;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
deleted file mode 100644
index 52f9871d1b..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.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.itest;
-
-import java.util.Collection;
-
-/**
- * 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 CDComponentImpl Class
- */
-public interface CDComponent {
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getC();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getC2();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getD();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getNoSource();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    String getFileProperty();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    Collection<String> getManyValuesFileProperty();
-
-    /**
-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class
-     * CDComponentImpl Class
-     */
-    int getOverrideValue();
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
deleted file mode 100644
index 5b93bd8b8a..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.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;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-/**
- * This class Implements the interface CDComponent and gives implementation for all methods which are declared in that
- * interface.
- */
-public class CDComponentImpl implements CDComponent {
-
-    private String cProperty;
-    private String dProperty;
-    private String nosource;
-    private String fileProperty;
-    private Collection<String> manyValuesFileProperty;
-    private int overrideNumber;
-    private String cProperty2;
-
-    /**
-     * It is a method which injects the property value to the variable 'cProperty2' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "nonFileProperty")
-    public void setC2(final String value) {
-        this.cProperty2 = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'overrideNumber' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "two")
-    public void setOverrideNumber(final int value) {
-        this.overrideNumber = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'fileProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "fileProperty")
-    public void setFileProp(final String value) {
-        this.fileProperty = value;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'manyValuesFileProperty' from the SCA runtime
-     * environment using
-     * 
-     * @Property Annotations.
-     */
-    @Property(name = "manyValuesFileProperty")
-    public void setFileManyValueProp(final Collection<String> values) {
-        this.manyValuesFileProperty = values;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'cProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setC(final String C) {
-        this.cProperty = C;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'dProperty' from the SCA runtime environment
-     * using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setD(final String D) {
-        this.dProperty = D;
-    }
-
-    /**
-     * It is a method which injects the property value to the variable 'nosource' from the SCA runtime environment using
-     * 
-     * @Property Annotations.
-     */
-    @Property
-    public void setNosource(final String value) {
-        this.nosource = value;
-    }
-
-    public String getFileProperty() {
-        return this.fileProperty;
-    }
-
-    public String getC() {
-        return this.cProperty;
-    }
-
-    public String getC2() {
-        return this.cProperty2;
-    }
-
-    public String getD() {
-        return this.dProperty;
-    }
-
-    public String getNoSource() {
-        return this.nosource;
-    }
-
-    public int getOverrideValue() {
-        return this.overrideNumber;
-    }
-
-    public Collection<String> getManyValuesFileProperty() {
-        return this.manyValuesFileProperty;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
deleted file mode 100644
index c0c068d12e..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.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;

-

-/**

- * This is a Java Bean which has setter and getter methods for for the variables used in the property tests.

- */

-public class ComplexPropertyBean {

-

-    /**

-     * Variable declarations

-     */

-    protected int integerNumber = 25;

-    protected float floatNumber = 50;

-    protected double doubleNumber = 75;

-    protected int[] intArray = null;

-    protected double[] doubleArray = null;

-    protected String[] stringArray = null;

-

-    ComplexPropertyBean numberSet;

-    protected ComplexPropertyBean[] numberSetArray = null;

-

-    public ComplexPropertyBean() {

-

-    }

-

-    public double getDoubleNumber() {

-        return doubleNumber;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable doubleNumber

-     */

-    public void setDoubleNumber(double doubleNumber) {

-        this.doubleNumber = doubleNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable floatNumber

-     */

-    public float getFloatNumber() {

-        return floatNumber;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable floatNumber

-     */

-    public void setFloatNumber(float floatNumber) {

-        this.floatNumber = floatNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable floatNumber

-     */

-    public int getIntegerNumber() {

-        return integerNumber;

-    }

-

-    /**

-     * It is a getter method to get a value for the variable integerNumber

-     */

-    public void setIntegerNumber(int integerNumber) {

-        this.integerNumber = integerNumber;

-    }

-

-    /**

-     * It is a getter method to set a value for the variable numberSet

-     */

-    public ComplexPropertyBean getNumberSet() {

-        return numberSet;

-    }

-

-    /**

-     * It is a setter method to set a value for the variable numberSet

-     */

-    public void setNumberSet(ComplexPropertyBean numberSet) {

-        this.numberSet = numberSet;

-    }

-

-    /**

-     * It is a method which implements toString() function

-     */

-    @Override

-    public String toString() {

-        return Double.toString(integerNumber) + " - "

-            + Double.toString(floatNumber)

-            + " - "

-            + Double.toString(doubleNumber)

-            + " \n"

-            + ((intArray == null) ? "" : intArray[0] + " - " + intArray[1] + " \n ")

-            + ((doubleArray == null) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n ")

-            + ((stringArray == null) ? "" : stringArray[0] + " - " + stringArray[1] + " \n ")

-            + ((numberSetArray == null) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n ")

-            + ((numberSet == null) ? "" : numberSet.toString());

-    }

-

-    /**

-     * It is a setter method to set values for the variable stringArray

-     */

-    public String[] getStringArray() {

-        return stringArray;

-    }

-

-    /**

-     * It is a setter method to set values for the variable stringArray

-     */

-    public void setStringArray(String[] stringArray) {

-        this.stringArray = stringArray;

-    }

-

-    public int[] getIntArray() {

-        return intArray;

-    }

-

-    public void setIntArray(int[] intArray) {

-        this.intArray = intArray;

-    }

-

-    public double[] getDoubleArray() {

-        return doubleArray;

-    }

-

-    public void setDoubleArray(double[] doubleArray) {

-        this.doubleArray = doubleArray;

-    }

-

-    public ComplexPropertyBean[] getNumberSetArray() {

-        return numberSetArray;

-    }

-

-    public void setNumberSetArray(ComplexPropertyBean[] numberSetArray) {

-        this.numberSetArray = numberSetArray;

-    }

-}

diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
deleted file mode 100644
index acd1f26670..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.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;
-
-/**
- * This is an Interface for the services
- */
-public interface OverrideService {
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
deleted file mode 100644
index 71dce41efc..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.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;
-
-/**
- * An implementation for the interface OverrideService.
- */
-
-public class OverrideServiceImpl implements OverrideService {
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
deleted file mode 100644
index 17b4e582d6..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.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.itest;

-

-import java.util.Collection;

-

-import commonj.sdo.DataObject;

-

-import test.jaxb.props.ReturnCodeProperties;

-/**

- * 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 PropertyComponentImpl Class

- */

-public interface PropertyComponent {

-

-    /**

-     * This is a method to get a value for a property name 'location' from the SCA runtime environment. It is

-     * implemented in the class PropertyComponentImpl

-     */

-    public String getLocation();

-

-    /**

-     * This is a method to get a value for a property name 'year' from the SCA runtime environment. It is implemented in

-     * the class PropertyComponentImpl

-     */

-    public String getYear();

-

-    /**

-     * This method is used to test injecting a primitive String Array

-     * 

-     * @return The injected array

-     */

-    public String[] getDaysOfTheWeek();

-

-    /**

-     * This method is used to test injecting an Object Integer Array

-     * 

-     * @return The injected array

-     */

-    public Integer[] getIntegerNumbers();

-

-    /**

-     * This method is used to test injecting an int Array

-     * 

-     * @return The injected array

-     */

-    public int[] getIntNumbers();

-

-    /**

-     * This method is used to test injecting an Object Array

-     * 

-     * @return The injected array

-     */

-    public DataObject[] getSdoArrayProperty();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-

-    public ComplexPropertyBean getComplexPropertyOne();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ComplexPropertyBean getComplexPropertyTwo();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ComplexPropertyBean getComplexPropertyThree();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public Collection<ComplexPropertyBean> getComplexPropertyFour();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-

-    public ComplexPropertyBean getComplexPropertyFive();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public DataObject getSdoProperty();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public DataObject getCustomerSdo();

-    

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ReturnCodeProperties getComplexJAXBPropertyOne();

-

-    /**

-     * This is a method to get a property value from the SCA runtime environment. It is implemented in the class

-     * PropertyComponentImpl

-     */

-    public ReturnCodeProperties getComplexJAXBPropertyTwo();

-

-    /**

-     * @return

-     */

-    public String getLocationFromComponentContext();

-

-}

diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
deleted file mode 100644
index eb642b6637..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.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.itest;

-

-import java.util.Collection;

-

-import org.osoa.sca.ComponentContext;

-import org.osoa.sca.annotations.Context;

-import org.osoa.sca.annotations.Property;

-

-import com.example.customer.sdo.impl.CustomerImpl;

-import commonj.sdo.DataObject;

-

-import test.jaxb.props.ReturnCodeProperties;

-

-/**

- * This class Implements the interface PropertyComponent and gives implementation for all methods which are declared in

- * that interface.

- */

-public class PropertyComponentImpl implements PropertyComponent {

-    @Context

-    protected ComponentContext context;

-    

-    @Property

-    protected CustomerImpl customerSdo;

-

-    @Property

-    protected DataObject sdoProperty;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyOne;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyTwo;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyThree;

-

-    @Property

-    protected Collection<ComplexPropertyBean> complexPropertyFour;

-

-    @Property

-    protected ComplexPropertyBean complexPropertyFive;

-

-    @Property(name = "location")

-    protected String location;

-

-    @Property(name = "year")

-    protected String year;

-

-    @Property(name = "daysOfTheWeek")

-    protected String[] daysOfTheWeek;

-

-    @Property(name = "integerNumbers")

-    protected Integer[] integerNumbers;

-

-    @Property(name = "intNumbers")

-    protected int[] intNumbers;

-

-    @Property(name = "sdoArray")

-    protected DataObject[] sdoArray;

-

-    @Property

-    protected ReturnCodeProperties complexJAXBPropertyOne;

-

-    @Property

-    protected ReturnCodeProperties complexJAXBPropertyTwo;

-

-    public String getLocation() {

-        return location;

-    }

-

-    public String getYear() {

-        return year;

-    }

-

-    public ComplexPropertyBean getComplexPropertyOne() {

-        //System.out.println(complexPropertyOne);

-        return complexPropertyOne;

-    }

-

-    public ComplexPropertyBean getComplexPropertyTwo() {

-        //System.out.println(complexPropertyTwo);

-        return complexPropertyTwo;

-    }

-

-    public ComplexPropertyBean getComplexPropertyThree() {

-        //System.out.println(complexPropertyThree);

-        return complexPropertyThree;

-    }

-

-    public Collection<ComplexPropertyBean> getComplexPropertyFour() {

-        //System.out.println(complexPropertyThree);

-        return complexPropertyFour;

-    }

-

-    public ComplexPropertyBean getComplexPropertyFive() {

-        return complexPropertyFive;

-    }

-

-    public DataObject getSdoProperty() {

-        return sdoProperty;

-    }

-

-    /**

-     * It is a method which injects the property value to the variable 'sdoProperty' from the SCA runtime environment.

-     */

-    public void setSdoProperty(DataObject sdoProperty) {

-        System.out.println("Reached here da machi");

-        this.sdoProperty = sdoProperty;

-    }

-

-    public CustomerImpl getCustomerSdo() {

-        return customerSdo;

-    }

-

-    /**

-     * It is a method which injects the property value to the variable 'customerSdo' from the SCA runtime environment.

-     */

-    public void setCustomerSdo(CustomerImpl customerSdo) {

-        this.customerSdo = customerSdo;

-    }

-

-    /**

-     * This method is used to test injecting an Array

-     * 

-     * @return The injected array

-     */

-    public String[] getDaysOfTheWeek() {

-        return daysOfTheWeek;

-    }

-

-    /**

-     * This method is used to test injecting an Object Integer Array

-     * 

-     * @return The injected array

-     */

-    public Integer[] getIntegerNumbers() {

-        return integerNumbers;

-    }

-

-    /**

-     * This method is used to test injecting an int Array

-     * 

-     * @return The injected array

-     */

-    public int[] getIntNumbers() {

-        return intNumbers;

-    }

-

-    /**

-     * This method is used to test injecting an Object Array

-     * 

-     * @return The injected array

-     */

-    public DataObject[] getSdoArrayProperty() {

-        return sdoArray;

-    }

-    

-    public String getLocationFromComponentContext() {

-        return context.getProperty(String.class, "location");

-    }

-

-    public ReturnCodeProperties getComplexJAXBPropertyOne() {

-        return complexJAXBPropertyOne;

-    }

-

-    public ReturnCodeProperties getComplexJAXBPropertyTwo() {

-        return complexJAXBPropertyTwo;

-    }

-}

diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
deleted file mode 100644
index a57ccd90c8..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.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;
-
-/**
- * This is an Interface for the services.
- */
-public interface PropertyService {
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
deleted file mode 100644
index c147a2affe..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.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 org.apache.tuscany.sca.itest.cdi;
-
-public interface Bar {
-    public String getBar();
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
deleted file mode 100644
index 0a84e93828..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.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.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo1 implements Bar {
-
-    @Property
-    protected String bar;
-
-    @Constructor( {"bar"})
-    public Foo1(String b) {
-        this.bar = b;
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
deleted file mode 100644
index 6344a8aa83..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.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.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo2 implements Bar {
-
-    protected String bar;
-
-    @Constructor
-    public Foo2(@Property(name = "bar") String b) {
-        this.bar = b;
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
deleted file mode 100644
index 11a0a758cd..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.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.cdi;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-@Service(Bar.class)
-public class Foo3 implements Bar {
-
-    protected String bar;
-
-    @Constructor
-    public Foo3() {
-        this.bar = "bar";
-    }
-
-    public String getBar() {
-        return this.bar;
-    }
-
-    @Property(name = "bar")
-    public void setBar(String b) {
-        this.bar = b;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
deleted file mode 100644
index 76bcd06fca..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-
-package test.jaxb.props;
-
-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 test.jaxb.props 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 _MyRCProps_QNAME = new QName("http://test.sca.jaxb/rcprops", "MyRCProps");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: test.jaxb.props
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link ReturnCodeProperties }
-     * 
-     */
-    public ReturnCodeProperties createReturnCodeProperties() {
-        return new ReturnCodeProperties();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReturnCodeProperties }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://test.sca.jaxb/rcprops", name = "MyRCProps")
-    public JAXBElement<ReturnCodeProperties> createMyRCProps(ReturnCodeProperties value) {
-        return new JAXBElement<ReturnCodeProperties>(_MyRCProps_QNAME, ReturnCodeProperties.class, null, value);
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
deleted file mode 100644
index 7a809ebf1e..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-
-package test.jaxb.props;
-
-import java.math.BigInteger;
-
-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 ReturnCodeProperties complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ReturnCodeProperties">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="AInt" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         &lt;element name="BInteger" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {
-    "a",
-    "b"
-})
-public class ReturnCodeProperties {
-
-    @XmlElement(name = "AInt")
-    protected int a;
-    @XmlElement(name = "BInteger", required = true)
-    protected BigInteger b;
-
-    /**
-     * Gets the value of the a property.
-     * 
-     */
-    public int getA() {
-        return a;
-    }
-
-    /**
-     * Sets the value of the a property.
-     * 
-     */
-    public void setA(int value) {
-        this.a = value;
-    }
-
-    /**
-     * Gets the value of the b property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getB() {
-        return b;
-    }
-
-    /**
-     * Sets the value of the b property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setB(BigInteger value) {
-        this.b = value;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/package-info.java b/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/package-info.java
deleted file mode 100644
index f726552a62..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/java/test/jaxb/props/package-info.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.    
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.06.07 at 03:30:47 PM EDT 
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://test.sca.jaxb/rcprops", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package test.jaxb.props;
diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/tags/java/sca/1.3/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
deleted file mode 100644
index 70a251fa16..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/ConstructorPropertyInjection.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"

-	name="ConstructorPropertyInjection">

-

-	<component name="Foo1Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo1" />

-		<property name="bar">fubar</property>

-	</component>

-

-	<component name="Foo2Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo2" />

-		<property name="bar">fubar</property>

-	</component>

-

-	<component name="Foo3Component">

-		<implementation.java

-			class="org.apache.tuscany.sca.itest.cdi.Foo3" />

-		<property name="bar">fubar</property>

-	</component>

-

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/Outer.composite b/tags/java/sca/1.3/itest/properties/src/main/resources/Outer.composite
deleted file mode 100644
index b3e529e8b5..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/Outer.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: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">

-

-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>

-    <property name="newYear" type="xsd:anyURI">2008</property>

-    <component name="MyServiceComponent">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-    </component>

-    <component name="MyServiceComponentNew">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-        <property name="location" source="$newLocation" />

-        <property name="year" source="$newYear" />

-    </component>

-    <component name="MyTotalServiceNewComponent">

-        <implementation.java class="mysca.test.myservice.impl.MyTotalServiceImpl" />

-        <reference name="myService" target="MyServiceComponentNew/MyService" />

-    </component>

-    <component name="MySimpleServiceInRecursiveAnother">

-        <implementation.composite name="foo:MySimpleService" />

-        <property name="newLocation">Durham</property>

-        <property name="newYear">2009</property>

-    </component>

-</composite>

diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/OuterPropertyTest.composite b/tags/java/sca/1.3/itest/properties/src/main/resources/OuterPropertyTest.composite
deleted file mode 100644
index 5237e964a3..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/OuterPropertyTest.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

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  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="OuterPropertyTest"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-           

-	<component name="OuterComponent">

-        <implementation.composite name="foo:PropertyTest"/>

-        <property name="number">125</property>

-        <property name="complex" type="foo:MyComplexType">

-	        <foo:MyComplexValue xsi:type="foo:MyComplexType" >

-	            <foo:a>Overriden A</foo:a>

-	            <foo:b>Overriden B</foo:b>

-	            <foo:c>Overriden C</foo:c>

-	            <foo:d>Overriden D</foo:d>

-	            <foo:x>

-	                <foo:y>Overriden Y</foo:y>

-	                <foo:z>Overriden Z</foo:z>

-	            </foo:x>

-	        </foo:MyComplexValue>

-    	</property>

-    </component>           

-</composite>

-

diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/PropertyTest.composite b/tags/java/sca/1.3/itest/properties/src/main/resources/PropertyTest.composite
deleted file mode 100644
index 75deddbdad..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/PropertyTest.composite
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed 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" 
-       xmlns:cust="http://www.example.com/Customer"
-       xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:rcp="http://test.sca.jaxb/rcprops"
-       targetNamespace="http://foo"
-       name="PropertyTest"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-           
-    <service name="ProperterTestService" promote="ABComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.ABComponent"/>
-    </service>           
-           
-    <dbsdo:import.sdo location="customer.xsd" />
-    <!-- dbsdo:import.sdo factory="com.example.customer.sdo.SdoFactory" / -->
-               
-    <property name="number" type="xsd:int">1</property>
-    <property name="complex" type="foo:MyComplexType" >
-        <foo:MyComplexValue xsi:type="foo:MyComplexType" >
-            <foo:a>a</foo:a>
-            <foo:b>b</foo:b>
-            <foo:c>c</foo:c>
-            <foo:d>d</foo:d>
-            <foo:x>
-                <foo:y>y</foo:y>
-                <foo:z>z</foo:z>
-            </foo:x>
-        </foo:MyComplexValue>
-    </property>
-
-    <property name="moreComplex" type="foo:MyMoreComplexType">
-        <MyMoreComplexValue xmlns="">
-            <numberSetArray>
-                <integerNumber>1</integerNumber>
-                <floatNumber>11</floatNumber>
-                <doubleNumber>111</doubleNumber>
-            </numberSetArray>
-            <numberSetArray>
-                <integerNumber>2</integerNumber>
-                <floatNumber>22</floatNumber>
-                <doubleNumber>222</doubleNumber>
-            </numberSetArray>
-            <stringArray>TestString_1</stringArray>
-            <stringArray>TestString_2</stringArray>
-            <intArray>10</intArray>
-            <intArray>20</intArray>
-            <integerNumber>27</integerNumber>
-            <floatNumber>79.34</floatNumber>
-            <doubleNumber>184.52</doubleNumber>
-            <doubleArray>50.05</doubleArray>
-            <doubleArray>25.52</doubleArray>
-            <numberSet>
-                <integerNumber>54</integerNumber>
-                <floatNumber>158.68</floatNumber>
-                <doubleNumber>369.04</doubleNumber>
-            </numberSet>
-        </MyMoreComplexValue>
-    </property>
-    
-    <property name="complexFoo" type="foo:MyMoreComplexType">
-        <MyMoreComplexValue xmlns="">
-            <stringArray>TestString_3</stringArray>
-            <stringArray>TestString_4</stringArray>
-            <intArray>100</intArray>
-            <intArray>200</intArray>
-        </MyMoreComplexValue>
-    </property>
-
-    <component name="ABCDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
-        <reference name="ab" target="ABComponent"/>
-        <reference name="cd" target="CDComponent"/>
-    </component>
-
-    <component name="ABComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
-        <property name="a" source="$complex/foo:MyComplexValue/foo:a"/>
-        <property name="b" source="$complex/foo:MyComplexValue/foo:b"/>
-        <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property>
-        <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/>
-        <property name="one" source="$number"/>
-        <property name="foobar" many="true">"Apache" "Tuscany" "Java SCA"</property>
-        <property name="fooInts" many="true">123 456 789</property>
-    </component>
-    
-
-    <component name="CDComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
-        <property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
-        <property name="d" source="$complex/foo:MyComplexValue/foo:d"/>
-        <property name="nosource">aValue</property>
-        <property name="fileProperty" file="fileProperty.txt"/>
-        <property name="manyValuesFileProperty" many="true" file="manyValuesFileProperty.txt"/>
-        <property name="nonFileProperty"  file="fileProperty.txt" source="$complex/foo:MyComplexValue/foo:c"/>
-        <property name="two" source="$number">25</property>
-    </component>
-
-    <component name="PropertyComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/>
-        <property name="complexPropertyOne" source="$moreComplex"></property>
-        <property name="complexPropertyTwo">
-            <MyAnotherComplexValue xmlns="">
-                <stringArray>TestString_1</stringArray>
-                <stringArray>TestString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </MyAnotherComplexValue>
-        </property>
-        <property name="complexPropertyThree" element="foo:PropertyThreeElement">
-            <PropertyThreeElement xmlns="">
-                <stringArray>TestElementString_1</stringArray>
-                <stringArray>TestElementString_2</stringArray>
-                <intArray>10</intArray>
-                <integerNumber>27</integerNumber>
-                <floatNumber>79.34</floatNumber>
-                <doubleArray>25.52</doubleArray>
-                <doubleNumber>184.52</doubleNumber>
-                <doubleArray>50.05</doubleArray>
-                <intArray>20</intArray>
-                <numberSetArray>
-                    <integerNumber>1</integerNumber>
-                    <floatNumber>11</floatNumber>
-                    <doubleNumber>111</doubleNumber>
-                </numberSetArray>
-                <numberSetArray>
-                    <integerNumber>2</integerNumber>
-                    <floatNumber>22</floatNumber>
-                    <doubleNumber>222</doubleNumber>
-                </numberSetArray>
-                <numberSet>
-                    <integerNumber>54</integerNumber>
-                    <floatNumber>158.68</floatNumber>
-                    <doubleNumber>369.04</doubleNumber>
-                </numberSet>
-            </PropertyThreeElement>
-        </property>
-        <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true">
-            <PropertyFourElement xmlns="">
-                <integerNumber>1</integerNumber>
-                <floatNumber>11.11</floatNumber>
-                <doubleNumber>111.111</doubleNumber>
-                <numberSet>
-                    <integerNumber>11</integerNumber>
-                    <floatNumber>1111.1111</floatNumber>
-                    <doubleNumber>11111.11111</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="">
-                <integerNumber>2</integerNumber>
-                <floatNumber>22.22</floatNumber>
-                <doubleNumber>222.222</doubleNumber>
-                <numberSet>
-                    <integerNumber>22</integerNumber>
-                    <floatNumber>2222.2222</floatNumber>
-                    <doubleNumber>22222.22222</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-            <PropertyFourElement xmlns="">
-                <integerNumber>3</integerNumber>
-                <floatNumber>33.33</floatNumber>
-                <doubleNumber>333.333</doubleNumber>
-                <numberSet>
-                    <integerNumber>33</integerNumber>
-                    <floatNumber>3333.3333</floatNumber>
-                    <doubleNumber>33333.33333</doubleNumber>
-                </numberSet>
-            </PropertyFourElement>
-        </property>
-        <property name="complexPropertyFive" source="$complexFoo"/>
-        <property name="sdoProperty" type="cust:Customer">	
-        	<cust:customer>
-        		<cust:firstName>Firstly Name</cust:firstName>
-        		<cust:middleName>Middler Name</cust:middleName>
-        		<cust:lastName>Lasting Name</cust:lastName>
-       		</cust:customer>
-        </property>
-        <property name="customerSdo" type="cust:Customer">	
-        	<cust:customer>
-        		<cust:firstName>Sdo Firstly Name</cust:firstName>
-        		<cust:middleName>Sdo Middler Name</cust:middleName>
-        		<cust:lastName>Sdo Lasting Name</cust:lastName>
-       		</cust:customer>
-        </property>
-        <property name="location" type="xsd:string">RTP</property>	
-        <property name="year" type="xsd:string">2006</property>	
-        <property name="daysOfTheWeek" many="true" type="xsd:string">"Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday" "Sunday"</property>
-        <property name="integerNumbers" many="true" type="xsd:int">1 2 3 4 5 6 7 8 9 10</property>
-        <property name="intNumbers" many="true" type="xsd:int">10 9 8 7 6 5 4 3 2 1 0</property>
-        <property name="sdoArray" many="true" type="cust:Customer">
-            <cust:customer>
-                <cust:firstName>Firstly Name 1</cust:firstName>
-                <cust:middleName>Middler Name 1</cust:middleName>
-                <cust:lastName>Lasting Name 1</cust:lastName>
-            </cust:customer>
-            <cust:customer>
-                <cust:firstName>Firstly Name 2</cust:firstName>
-                <cust:middleName>Middler Name 2</cust:middleName>
-                <cust:lastName>Lasting Name 2</cust:lastName>
-            </cust:customer>
-            <cust:customer>
-                <cust:firstName>Firstly Name 3</cust:firstName>
-                <cust:middleName>Middler Name 3</cust:middleName>
-                <cust:lastName>Lasting Name 3</cust:lastName>
-            </cust:customer>
-        </property>
-        <property name="complexJAXBPropertyOne" type="rcp:ReturnCodeProperties">
-            <MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-                <AInt>10</AInt>
-                <BInteger>10</BInteger>
-            </MyRCProps>
-        </property>
-        <property name="complexJAXBPropertyTwo" type="rcp:ReturnCodeProperties" file="rcProps.txt"/>
-    </component>
-</composite>
-
-
diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/customer.xsd b/tags/java/sca/1.3/itest/properties/src/main/resources/customer.xsd
deleted file mode 100644
index 8861d7e7b8..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/customer.xsd
+++ /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.    

--->

-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">

-

-    <xsd:element name="customer" type="Customer"/>

-    <xsd:complexType name="Customer">

-        <xsd:sequence>

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

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

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

-        </xsd:sequence>

-    </xsd:complexType>

- </xsd:schema>

diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/fileProperty.txt b/tags/java/sca/1.3/itest/properties/src/main/resources/fileProperty.txt
deleted file mode 100644
index 0d3d9ead83..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/fileProperty.txt
+++ /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.
--->
-
-<filePropertyTest>fileValue</filePropertyTest>
diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/manyValuesFileProperty.txt b/tags/java/sca/1.3/itest/properties/src/main/resources/manyValuesFileProperty.txt
deleted file mode 100644
index 450f397b30..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ /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.

--->

-

-<manyFilePropertyValues>

-	"fileValueOne" "fileValueTwo" "fileValueThree" "fileValueFour"

-</manyFilePropertyValues>

diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/mySimpleService.composite b/tags/java/sca/1.3/itest/properties/src/main/resources/mySimpleService.composite
deleted file mode 100644
index 75fdd24add..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/mySimpleService.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 autowire="false" local="true" name="MySimpleService"

-    targetNamespace="http://foo" xmlns:foo="http://foo" 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 ">

-

-

-    <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService">

-        <interface.java interface="mysca.test.myservice.impl.MyService" />

-    </service>

-

-    <property name="newLocation" type="xsd:anyURI">Raleigh</property>

-    <property name="newYear" type="xsd:anyURI">2008</property>

-

-

-    <component name="MyServiceComponentNew">

-        <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />

-        <property name="location" source="$newLocation" />

-        <property name="year" source="$newYear" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/rcProps.txt b/tags/java/sca/1.3/itest/properties/src/main/resources/rcProps.txt
deleted file mode 100644
index 052c291fd0..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/rcProps.txt
+++ /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
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<MyRCProps xmlns="http://test.sca.jaxb/rcprops">
-    <AInt>20</AInt>
-    <BInteger>20</BInteger>
-</MyRCProps>
diff --git a/tags/java/sca/1.3/itest/properties/src/main/resources/rcprops.xsd b/tags/java/sca/1.3/itest/properties/src/main/resources/rcprops.xsd
deleted file mode 100644
index 21289fa7b2..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/main/resources/rcprops.xsd
+++ /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
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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" targetNamespace="http://test.sca.jaxb/rcprops"
-    xmlns:tns="http://test.sca.jaxb/rcprops" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
-    xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-    <!-- Use some JAXB customizations -->
-
-    <annotation>
-        <appinfo>
-            <jaxb:schemaBindings>
-                <jaxb:package name="test.jaxb.props" />
-            </jaxb:schemaBindings>
-        </appinfo>
-    </annotation>
-
-    <element name="MyRCProps" type="tns:ReturnCodeProperties" />
-
-    <complexType name="ReturnCodeProperties">
-        <sequence>
-            <element name="AInt" type="xsd:int">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="a" />
-                    </appinfo>
-                </annotation>
-            </element>
-            <element name="BInteger" type="xsd:integer">
-                <annotation>
-                    <appinfo>
-                        <jaxb:property name="b" />
-                    </appinfo>
-                </annotation>
-            </element>
-        </sequence>
-    </complexType>
-</schema>
-
-
diff --git a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
deleted file mode 100644
index 8cf182e24a..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.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.itest;
-
-import static junit.framework.Assert.assertEquals;
-import mysca.test.myservice.impl.MyService;
-
-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 MyService service1;
-    private static MyService service2;
-    private static MyService service3;
-
-    private static SCADomain domain;
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the local
-     *       property variables defined in the implementation file with the expected values 'RTP' and '2006'
-     */
-    @Test
-    public void testPropertyDefault() {
-        assertEquals("RTP", service1.getLocation());
-        assertEquals("2006", service1.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using service2 from the SCA runtime environment with the expected values 'Raleigh'
-     *       and '2008'. This overrides the local property values
-     */
-    @Test
-    public void testPropertyOverride() {
-        assertEquals("Raleigh", service2.getLocation());
-        assertEquals("2008", service2.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using service3 from the SCA runtime environment with the expected values 'Durham'
-     *       and '2009'
-     */
-    @Test
-    public void testPropertyNestedOverride() {
-        assertEquals("Durham", service3.getLocation());
-        assertEquals("2009", service3.getYear());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test
-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-
-        domain = SCADomain.newInstance("Outer.composite");
-        service1 = domain.getService(MyService.class, "MyServiceComponent/MyService");
-        service2 = domain.getService(MyService.class, "MyServiceComponentNew/MyService");
-        service3 = domain.getService(MyService.class, "MySimpleServiceInRecursiveAnother");
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the
-     *             domain, close any previously opened connections etc
-     */
-    @AfterClass
-    public static void tearDown() {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
deleted file mode 100644
index 28357c5bbe..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.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.itest;

-

-import static junit.framework.Assert.assertEquals;

-

-import java.util.Iterator;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-/**

- * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used

- * to test different property values returned from the SCA Runtime Environment which is initialized with the composite

- * 'OuterPropertyTest.composite'. It basically tests the Simple type of property and Complex type of property from the

- * SCA Runtime Environment.

- */

-public class OuterPropertyTestCase {

-

-    private static SCADomain domain;

-    private static ABComponent outerABService;

-

-    /**

-     * Method annotated with

-     * 

-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test

-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to the 'outerABService' service

-     */

-    @BeforeClass

-    public static void init() throws Exception {

-        domain = SCADomain.newInstance("OuterPropertyTest.composite");

-        outerABService = domain.getService(ABComponent.class, "OuterComponent");

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the

-     *             domain, close any previously opened connections etc

-     */

-    @AfterClass

-    public static void destroy() throws Exception {

-        domain.close();

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       A'

-     */

-    @Test

-    public void testOverridenA() {

-        assertEquals("Overriden A", outerABService.getA());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       B'

-     */

-    @Test

-    public void testOverridenB() {

-        assertEquals("Overriden B", outerABService.getB());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       A'

-     */

-    @Test

-    public void testOverridenF() {

-        assertEquals("Overriden A", outerABService.getF());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 'Overriden

-     *       Z'

-     */

-    @Test

-    public void testOverridenZ() {

-        assertEquals("Overriden Z", outerABService.getZ());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 125

-     */

-    @Test

-    public void testOverridenIntValue() {

-        assertEquals(125, outerABService.getIntValue());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property value obtained using a service from the SCA runtime environment with the expected value 125

-     */

-    @Test

-    public void testDefaultValue() {

-        assertEquals(125, outerABService.getIntValue());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property values obtained using a service from the SCA runtime environment with the expected values 'Apache' ,

-     *       'Tuscany' and 'Java SCA' respectively .

-     */

-    @Test

-    public void testManySimpleStringValues() {

-        Iterator<String> iterator = outerABService.getManyStringValues().iterator();

-        assertEquals("Apache", iterator.next());

-        assertEquals("Tuscany", iterator.next());

-        assertEquals("Java SCA", iterator.next());

-    }

-

-    /**

-     * Method annotated with

-     * 

-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the

-     *       property values obtained using a service from the SCA runtime environment with the expected values 123, 456

-     *       and 789

-     */

-    @Test

-    public void testManySimpleIntegerValues() {

-        Iterator<Integer> iterator = outerABService.getManyIntegers().iterator();

-        assertEquals(123, iterator.next().intValue());

-        assertEquals(456, iterator.next().intValue());

-        assertEquals(789, iterator.next().intValue());

-    }

-}

diff --git a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
deleted file mode 100644
index 6979659ece..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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 static junit.framework.Assert.assertNotNull;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import java.math.BigInteger;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import test.jaxb.props.ReturnCodeProperties;
-import commonj.sdo.DataObject;
-
-/**
- * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used
- * to test different property values returned from the SCA Runtime Environment which is initialized with the composite
- * 'PropertyTest.composite'. It basically tests all types of property values returned from SCA runtime environment.
- */
-public class PropertyTestCase {
-    private static SCADomain domain;
-    private static ABComponent abService;
-    private static CDComponent cdService;
-    private static ABCDComponent abcdService;
-    private static PropertyComponent propertyService;
-
-
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'a'
-     */
-    @Test
-    public void testA() {
-        assertEquals("a", abService.getA());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'b'
-     */
-    @Test
-    public void testB() {
-        assertEquals("b", abService.getB());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'c'
-     */
-    @Test
-    public void testC() {
-        assertEquals("c", cdService.getC());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'c'
-     */
-    @Test
-    public void testC2() {
-        assertEquals("c", cdService.getC2());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'd'
-     */
-    @Test
-    public void testD() {
-        assertEquals("d", cdService.getD());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'a'
-     */
-    @Test
-    public void testF() {
-        assertEquals("a", abService.getF());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'z'
-     */
-    @Test
-    public void testZ() {
-        assertEquals("z", abService.getZ());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testIntValue() {
-        assertEquals(1, abService.getIntValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testDefaultValue() {
-        assertEquals(1, abService.getIntValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 1.
-     */
-    @Test
-    public void testDefaultValueOverride() {
-        assertEquals(1, cdService.getOverrideValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value 'aValue'
-     */
-    @Test
-    public void testNoSource() {
-        assertEquals("aValue", cdService.getNoSource());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected value
-     *       'fileValue'
-     */
-    @Test
-    public void testFileProperty() {
-        assertEquals("fileValue", cdService.getFileProperty());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 4 and
-     *       'fileValueTwo' respectively.
-     */
-    @Test
-    public void testManyValuesFileProperty() {
-        Iterator<String> iterator = cdService.getManyValuesFileProperty().iterator();
-        iterator.next();
-        String secondValue = iterator.next();
-        assertEquals(4, cdService.getManyValuesFileProperty().size());
-        assertEquals("fileValueTwo", secondValue);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'a' ,
-     *       'b', 'c' and 'd' respectively.
-     */
-    @Test
-    public void testABCD() {
-        assertEquals("a", abcdService.getA());
-        assertEquals("b", abcdService.getB());
-        assertEquals("c", abcdService.getC());
-        assertEquals("d", abcdService.getD());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'RTP'
-     *       and '2006' respectively
-     */
-    @Test
-    public void testDefaultProperty() {
-        assertEquals("RTP", propertyService.getLocation());
-        assertEquals("2006", propertyService.getYear());
-
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 'Apache' ,
-     *       'Tuscany' and 'Java SCA' respectively .
-     */
-    @Test
-    public void testManySimpleStringValues() {
-        Iterator<String> iterator = abService.getManyStringValues().iterator();
-        assertEquals("Apache", iterator.next());
-        assertEquals("Tuscany", iterator.next());
-        assertEquals("Java SCA", iterator.next());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values 123, 456
-     *       and 789 respectively.
-     */
-    @Test
-    public void testManySimpleIntegerValues() {
-        Iterator<Integer> iterator = abService.getManyIntegers().iterator();
-        assertEquals(123, iterator.next().intValue());
-        assertEquals(456, iterator.next().intValue());
-        assertEquals(789, iterator.next().intValue());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values
-     *       'TestString_1' and 2 respectively.
-     */
-    @Test
-    public void testComplexPropertyOne() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
-        assertNotNull(propBean);
-        assertEquals("TestString_1", propBean.getStringArray()[0]);
-        assertEquals(2, propBean.numberSetArray[1].integerNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected integer number
-     *       and a float number
-     */
-    @Test
-    public void testComplexPropertyTwo() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo();
-        assertNotNull(propBean);
-        assertEquals(10, propBean.intArray[0]);
-        assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected value first
-     *       element in the string array and the float number
-     */
-    @Test
-    public void testComplexPropertyThree() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyThree();
-        assertNotNull(propBean);
-        assertEquals("TestElementString_1", propBean.stringArray[0]);
-        assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       complex property value obtained using a service from the SCA runtime environment with the expected values
-     *       1, 222.222 and 33 respectively.
-     */
-    @Test
-    public void testComplexPropertyFour() {
-        Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray();
-        assertNotNull(propBeanCollection);
-        assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber());
-        assertEquals(222.222, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber());
-        assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected values
-     *       'TestString_3', 'TestString_4', 100 and 200.
-     */
-    @Test
-    public void testComplexPropertyFive() {
-        ComplexPropertyBean propBean = propertyService.getComplexPropertyFive();
-        assertNotNull(propBean);
-        assertEquals("TestString_3", propBean.getStringArray()[0]);
-        assertEquals("TestString_4", propBean.getStringArray()[1]);
-        assertEquals(100, propBean.getIntArray()[0]);
-        assertEquals(200, propBean.getIntArray()[1]);
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property values obtained using a service from the SCA runtime environment with the expected string values
-     *       'Firstly Name' , 'Middler Name' and 'Lasting Name' respectively
-     */
-    @Test
-    public void testSDOProperty1() {
-        DataObject dataObject = propertyService.getSdoProperty();
-        assertNotNull(dataObject);
-        assertEquals("Firstly Name", dataObject.get("firstName"));
-        assertEquals("Middler Name", dataObject.getString("middleName"));
-        assertEquals("Lasting Name", dataObject.getString("lastName"));
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @Test is a test method where testing logic is written using various assert methods. This test verifies the
-     *       property value obtained using a service from the SCA runtime environment with the expected string values
-     *       'Sdo Firstly Name', 'Sdo Middler Name' and 'Sdo Lasting Name' respectively
-     */
-    @Test
-    public void testSDOProperty2() {
-        DataObject dataObject = propertyService.getCustomerSdo();
-        assertNotNull(dataObject);
-        assertEquals("Sdo Firstly Name", dataObject.get("firstName"));
-        assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
-        assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
-    }
-     
-
-    @Test
-    public void testGetLocationFromComponentContext() {
-        String location = propertyService.getLocation();
-        assertNotNull(location);
-        String locationFromCC = propertyService.getLocationFromComponentContext();
-        assertNotNull(locationFromCC);
-        assertEquals(location, locationFromCC);
-    }
-
-    @Test
-    public void testGetInjectedStringArrayProperty() {
-        String[] daysOfWeek = propertyService.getDaysOfTheWeek();
-        assertNotNull(daysOfWeek);
-
-        String[] expected = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"};
-        Assert.assertTrue(Arrays.equals(expected, daysOfWeek));
-    }
-
-    @Test
-    public void testGetInjectedIntegerArrayProperty() {
-        Integer[] numbers = propertyService.getIntegerNumbers();
-        assertNotNull(numbers);
-
-        Integer[] expected = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-        Assert.assertTrue(Arrays.equals(expected, numbers));
-    }
-
-    @Test
-    public void testGetInjectedIntArrayProperty() {
-        int[] numbers = propertyService.getIntNumbers();
-        assertNotNull(numbers);
-
-        int[] expected = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
-        Assert.assertTrue(Arrays.equals(expected, numbers));
-    }
-
-    @Test
-    public void testGetInjectedSdoArrayProperty() {
-        DataObject[] sdos = propertyService.getSdoArrayProperty();
-        assertNotNull(sdos);
-
-        for (int i = 1; i <= 3; i++) {
-            DataObject dataObject = sdos[i - 1];
-            assertEquals("Firstly Name " + i, dataObject.get("firstName"));
-            assertEquals("Middler Name " + i, dataObject.getString("middleName"));
-            assertEquals("Lasting Name " + i, dataObject.getString("lastName"));
-        }
-    }
-
-    @Test
-    public void testComplexJAXBProperty() {
-        ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyOne();
-        assertEquals(10, rc.getA());
-        assertEquals(new BigInteger("10"), rc.getB());
-    }
-
-    @Test
-    public void testComplexJAXBPropertyFromFile() {
-        ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyTwo();
-        System.out.println("SKSK: a =" + rc.getA());
-        System.out.println("SKSK: b =" + rc.getB());
-        assertEquals(20, rc.getA());
-        assertEquals(new BigInteger("20"), rc.getB());
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test
-     *              Embedded SCA Domain, to start the SCA Domain and to get a reference to 4 services namely 'abService'
-     *              service, 'cdService' service, 'abcdService' service and 'propertyService' service
-     */
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("PropertyTest.composite");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        abService = domain.getService(ABComponent.class, "ABComponent");
-        cdService = domain.getService(CDComponent.class, "CDComponent");
-        abcdService = domain.getService(ABCDComponent.class, "ABCDComponent");
-        propertyService = domain.getService(PropertyComponent.class, "PropertyComponent");
-    }
-
-    /**
-     * Method annotated with
-     * 
-     * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the
-     *             domain, close any previously opened connections etc
-     */
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
deleted file mode 100644
index 8ee5dce91f..0000000000
--- a/tags/java/sca/1.3/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.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.cdi;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class ConstructorPropertyInjectionTestCase extends TestCase {
-
-    public void testFoo1() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo1Component");
-        assertEquals("fubar", foo.getBar());
-    }
-
-    public void testFoo2() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo2Component");
-        assertEquals("fubar", foo.getBar());
-    }
-
-    public void testFoo3() throws Exception {
-        SCADomain sca = SCADomain.newInstance("ConstructorPropertyInjection.composite");
-        Bar foo = sca.getService(Bar.class, "Foo3Component");
-        assertEquals("fubar", foo.getBar());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/pom.xml b/tags/java/sca/1.3/itest/recursive-multi-level/pom.xml
deleted file mode 100644
index 373ad4155e..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/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>1.3</version>
-        <!--relativePath>../pom.xml</relativePath-->
-    </parent>
-    <artifactId>itest-recursive-multi-level</artifactId>
-    <name>Apache Tuscany SCA Recusive Multi-Level Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>       
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
deleted file mode 100644
index 214d4d8a1f..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.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 mysca.test.myservice;
-
-
-public interface MyService {
-    String getLocation();
-    String getYear();
-}
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
deleted file mode 100644
index 51948a3b81..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.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 mysca.test.myservice;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-import mysca.test.myservice.MyService;
-
-@Service(MyService.class)
-public class MyServiceImpl implements MyService {
-	
-	@Property(name="location")
-	protected String location = "ABC";
-
-    @Property(name="year")
-    protected String year = "2006";
-    
-
-    public String getLocation()
-    {
-       return location;
-    }
-
-    public String getYear()
-    {
-        return year;
-    }
-	
-
-}
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
deleted file mode 100644
index 08df8ade17..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.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 mysca.test.myservice;
-
-public interface MySimpleTotalService {
-    String getLocation();
-    String getYear();
-}
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
deleted file mode 100644
index 2ad9f815f0..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.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 mysca.test.myservice;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import mysca.test.myservice.MyService;
-import mysca.test.myservice.MySimpleTotalService;
-
-@Service(MySimpleTotalService.class)
-public class MySimpleTotalServiceImpl implements MySimpleTotalService
-{
-    // default required==true so it is 1:1
-    @Reference
-    public MyService myService;
-
-
-    public String getLocation()
-    {
-        return myService.getLocation();
-    }
-
-    public String getYear()
-    {
-        return myService.getYear();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
deleted file mode 100644
index 975f61c664..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService1Auto.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: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="TotalComposite1Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-
-    <property name="newLocation" type="xsd:anyURI">Level 1</property>
-    <property name="newYear" type="xsd:anyURI">2001</property>
-
-    <component name="ServiceComponentLevel1Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location" source="$newLocation"/>
-        <property name="year" source="$newYear"/>
-    </component>
-
-    <service name="MyServiceLevel1Auto" promote="TotalServiceComponentLevel1Auto/MySimpleTotalService">
-        <interface.java interface="mysca.test.myservice.MySimpleTotalService"/>
-    </service>
-    
-    <component name="TotalServiceComponentLevel1Auto">
-        <implementation.java class="mysca.test.myservice.MySimpleTotalServiceImpl"/>
-        <reference name="myService" autowire="true"/>
-    </component>
-
-    <reference name="myServiceReference1Auto" promote="TotalServiceComponentLevel1Auto/myService">
-        <interface.java interface="mysca.test.myservice.MyService"/>
-   </reference>
-</composite>
-
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
deleted file mode 100644
index f9bbcc76d8..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService2Auto.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: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="TotalComposite2Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-    
-    <property name="newLocation" type="xsd:anyURI">Level 2</property>
-    <property name="newYear" type="xsd:anyURI">2002</property>
-  
-    <component name="ServiceComponentLevel2Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location">Default 2</property>
-        <property name="year">1992</property>
-    </component>
-  
-    <service name="MyServiceLevel2Auto" promote="TotalServiceInRecursive2Auto/MyServiceLevel1Auto"/>
-  
-    <component name="TotalServiceInRecursive2Auto">
-        <implementation.composite name="foo:TotalComposite1Auto"/>
-        <reference name="myServiceReference1Auto" autowire="true"/>
-        <property name="newLocation" source="$newLocation"/>
-        <property name="newYear" source="$newYear"/>
-    </component>
-  
-    <reference name="myServiceReference2Auto" promote="TotalServiceInRecursive2Auto/myServiceReference1Auto"/>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
deleted file mode 100644
index 09fd10fb7e..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/main/resources/TotalService3Auto.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: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="TotalComposite3Auto"
-           targetNamespace="http://foo" 
-           local="true" 
-           autowire="false">
-
-    <property name="newLocation" type="xsd:anyURI">Level 3</property>
-    <property name="newYear" type="xsd:anyURI">2003</property>
-
-    <component name="ServiceComponentLevel3Auto">
-        <implementation.java class="mysca.test.myservice.MyServiceImpl"/>
-        <property name="location">Default 3</property>
-        <property name="year">1993</property>
-    </component>
-  
-    <service name="MyServiceLevel3Auto" promote="TotalServiceInRecursive3Auto/MyServiceLevel2Auto">
-    </service>
-
-    <component name="TotalServiceInRecursive3Auto" autowire="true">
-        <implementation.composite name="foo:TotalComposite2Auto"/>
-        <reference name="myServiceReference2Auto"/>
-        <property name="newLocation" source="$newLocation"/>
-        <property name="newYear" source="$newYear"/>
-    </component>
-    
-    <reference name="myServiceReference3Auto" promote="TotalServiceInRecursive3Auto/myServiceReference2Auto">
-    </reference>
-
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/tags/java/sca/1.3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
deleted file mode 100644
index d8d6fe0dc5..0000000000
--- a/tags/java/sca/1.3/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.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 test.sca.tests;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import mysca.test.myservice.MySimpleTotalService;
-import junit.framework.TestCase;
-
-
-/**
- * Tests to make sure that autowiring and recusive composite work together
- *
- */
-public class MultiLevelTestCase extends TestCase
-{
-    private SCADomain domain1;
-    private SCADomain domain2;
-    private SCADomain domain3;
-    private MySimpleTotalService myService1;
-    private MySimpleTotalService myService2;
-    private MySimpleTotalService myService3;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        domain1 = SCADomain.newInstance("TotalService1Auto.composite");
-        domain2 = SCADomain.newInstance("TotalService2Auto.composite");
-        domain3 = SCADomain.newInstance("TotalService3Auto.composite");
-
-        myService1 = domain1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto");
-        myService2 = domain2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto");
-        myService3 = domain3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto");
-    }
-   
-    public void testLevel1()
-    {
-        assertEquals("Level 1",myService1.getLocation());
-        assertEquals("2001",myService1.getYear());
-    }
-    
-    public void testLevel2()
-    {
-        assertEquals("Default 2",myService2.getLocation());
-        assertEquals("1992",myService2.getYear());
-    }
-
-    public void testLevel3()
-    {
-        assertEquals("Default 3",myService3.getLocation());
-        assertEquals("1993",myService3.getYear());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive-ws/pom.xml b/tags/java/sca/1.3/itest/recursive-ws/pom.xml
deleted file mode 100644
index bf97ecccc6..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</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>1.3</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/Target.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/Target.java
deleted file mode 100644
index c77fcea868..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index 87e412829e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index e565055252..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/Composer.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/Composer.java
deleted file mode 100644
index e53f99d9c3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Composer {
-    public String Compose(String s);
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
deleted file mode 100644
index 7956d153cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
deleted file mode 100644
index 3d75b7b165..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
deleted file mode 100644
index 8b77484922..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/tags/java/sca/1.3/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
deleted file mode 100644
index 5035d1cbd9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Client.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Client.composite
deleted file mode 100644
index 56d7c01377..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Inner.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Inner.composite
deleted file mode 100644
index b054ae0944..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Outer.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/Outer.composite
deleted file mode 100644
index 3c3f327b28..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
deleted file mode 100644
index b5c180919c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
deleted file mode 100644
index 891cac0b79..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4b398743eb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index b50bc29a1f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/definitions.xml b/tags/java/sca/1.3/itest/recursive-ws/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 3ae202f4aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/tags/java/sca/1.3/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
deleted file mode 100644
index c6e46564f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.3/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index 3e71246da2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/tags/java/sca/1.3/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
deleted file mode 100644
index 6638d65551..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/tags/java/sca/1.3/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
deleted file mode 100644
index 214379bcea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/pom.xml b/tags/java/sca/1.3/itest/recursive/pom.xml
deleted file mode 100644
index 472ea12c00..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/circular/include/DemoClass.java b/tags/java/sca/1.3/itest/recursive/src/main/java/circular/include/DemoClass.java
deleted file mode 100644
index fe42911486..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/composite/CompositeClient.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index 5edc305970..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/composite/Source.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/composite/SourceCallback.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/composite/SourceImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/composite/Target.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/composite/TargetImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/foo/A.java b/tags/java/sca/1.3/itest/recursive/src/main/java/foo/A.java
deleted file mode 100644
index e87cbde26d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(I.class)
-public class A implements I {
-    public String get(int i) {
-        return A.class.getName();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/foo/B.java b/tags/java/sca/1.3/itest/recursive/src/main/java/foo/B.java
deleted file mode 100644
index 9d060cab59..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/foo/I.java b/tags/java/sca/1.3/itest/recursive/src/main/java/foo/I.java
deleted file mode 100644
index f6d55baef3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/policy/Target.java b/tags/java/sca/1.3/itest/recursive/src/main/java/policy/Target.java
deleted file mode 100644
index c77fcea868..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Target {
-    String hello(String arg);
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/policy/TargetClientImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/policy/TargetClientImpl.java
deleted file mode 100644
index 87e412829e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/policy/TargetServiceImpl.java
deleted file mode 100644
index e565055252..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetServiceImpl implements Target {
-
-    public String hello(String arg) {
-        return "Target: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentAImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentAImpl.java
deleted file mode 100644
index f513949105..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentCImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentCImpl.java
deleted file mode 100644
index 586a9ee6a7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentEImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentEImpl.java
deleted file mode 100644
index dbf2735aa7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentFImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/sample/ComponentFImpl.java
deleted file mode 100644
index 5e136e536c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/sample/Service1.java b/tags/java/sca/1.3/itest/recursive/src/main/java/sample/Service1.java
deleted file mode 100644
index 81bdce79f1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/test/Aggregator.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test/Aggregator.java
deleted file mode 100644
index 88b3bed1b2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/test/AggregatorImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test/AggregatorImpl.java
deleted file mode 100644
index f6ac6c8741..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/main/java/test/InnerSourceImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test/InnerSourceImpl.java
deleted file mode 100644
index c8dad5ae35..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class InnerSourceImpl implements Source {
-
-    public String getData() {
-        return "InnerSource";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/test/OuterSourceImpl.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test/OuterSourceImpl.java
deleted file mode 100644
index 11816e82cf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(Source.class)
-public class OuterSourceImpl implements Source {
-
-    public String getData() {
-        return "OuterSource";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/test/Source.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test/Source.java
deleted file mode 100644
index 9b93740d9d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Source {
-    String getData();
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/Target.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/Target.java
deleted file mode 100644
index 4883e12f49..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/TargetOne.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/TargetOne.java
deleted file mode 100644
index a7c68f4ffd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetOne implements Target {
-
-    public String hello(String arg) {
-        return "TargetOne: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/tags/java/sca/1.3/itest/recursive/src/main/java/test1/composite/TargetTwo.java
deleted file mode 100644
index 7fff8e2e9b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(Target.class)
-public class TargetTwo implements Target {
-
-    public String hello(String arg) {
-        return "TargetTwo: Hello " + arg + "!";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/resources/AComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/AComposite.composite
deleted file mode 100644
index 1b5dee8762..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/BComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/BComposite.composite
deleted file mode 100644
index 7d4588eba4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/CComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/CComposite.composite
deleted file mode 100644
index 6d7b4ec600..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite1.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite1.composite
deleted file mode 100644
index 56fd7c621f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite2.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite2.composite
deleted file mode 100644
index 54f10673a4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite3.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Composite3.composite
deleted file mode 100644
index 040653493f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Demo1Composite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Demo1Composite.composite
deleted file mode 100644
index 6b2a964b9b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Demo2Composite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Demo2Composite.composite
deleted file mode 100644
index 6b8c0a348e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Inner.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Inner.composite
deleted file mode 100644
index 398ebdf6e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/InnerComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/InnerComposite2.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 289b92a3f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/Outer.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/Outer.composite
deleted file mode 100644
index 987990d854..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/OuterComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/foo.png b/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/foo.png
deleted file mode 100644
index 0f2ec78aaf..0000000000
--- a/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/foo.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o1.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o1.composite
deleted file mode 100644
index 1d31c2f424..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o2.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o2.composite
deleted file mode 100644
index 4f21c21860..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o3.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o3.composite
deleted file mode 100644
index 72c732c03e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o4.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/foo/o4.composite
deleted file mode 100644
index f8f07eed09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
deleted file mode 100644
index 4a6df023b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
deleted file mode 100644
index 25007aebb2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/definitions.xml b/tags/java/sca/1.3/itest/recursive/src/main/resources/policy/definitions.xml
deleted file mode 100644
index 957028e3bd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/test1/InnerComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/test1/InnerComposite.composite
deleted file mode 100644
index 177fa10550..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/main/resources/test1/OuterComposite.composite b/tags/java/sca/1.3/itest/recursive/src/main/resources/test1/OuterComposite.composite
deleted file mode 100644
index d05a67f45f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
deleted file mode 100644
index 1f7c35dd91..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/composite/CompositeTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 5482e47463..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
deleted file mode 100644
index f042113f7a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.osoa.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/tags/java/sca/1.3/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
deleted file mode 100644
index 87eb948452..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException but did not when invoking service with async");

-        } catch (org.osoa.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/tags/java/sca/1.3/itest/recursive/src/test/java/foo/O2TestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/foo/O2TestCase.java
deleted file mode 100644
index d617ec8592..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/foo/O4TestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/foo/O4TestCase.java
deleted file mode 100644
index 15626c75ac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/policy/PolicyTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/policy/PolicyTestCase.java
deleted file mode 100644
index c9cc84f7d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/C.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/C.java
deleted file mode 100644
index bf8391348b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/CImpl.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/CImpl.java
deleted file mode 100644
index 466284983e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/NestedTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/NestedTestCase.java
deleted file mode 100644
index fc5d251460..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
deleted file mode 100644
index a543add69b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/X.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/X.java
deleted file mode 100644
index e3a9335068..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/XImpl.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/XImpl.java
deleted file mode 100644
index e430807568..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/Y.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/Y.java
deleted file mode 100644
index c15a4f635a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/sample/YImpl.java b/tags/java/sca/1.3/itest/recursive/src/test/java/sample/YImpl.java
deleted file mode 100644
index 994c9eb95f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/recursive/src/test/java/test/InnerTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/test/InnerTestCase.java
deleted file mode 100644
index ebb4bc7acb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/recursive/src/test/java/test/OuterTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/test/OuterTestCase.java
deleted file mode 100644
index 17de5ca4a8..0000000000
--- a/tags/java/sca/1.3/itest/recursive/src/test/java/test/OuterTestCase.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 OuterTestCase extends TestCase {
-
-    private SCADomain domain;
-    private Aggregator aggregator;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("Outer.composite");
-        aggregator = domain.getService(Aggregator.class, "Inner");
-    }
-
-    @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("OuterSource"));
-            System.out.println(result);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/tags/java/sca/1.3/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
deleted file mode 100644
index b3abcac06e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/references/pom.xml b/tags/java/sca/1.3/itest/references/pom.xml
deleted file mode 100644
index 4a8584e61d..0000000000
--- a/tags/java/sca/1.3/itest/references/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-references</artifactId>
-    <name>Apache Tuscany SCA References Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
deleted file mode 100644
index f8c0850118..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/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.itest.references;
-
-public interface AComponent {
-
-    String fooB();
-
-    String fooC();
-
-    String fooBC();
-
-    String fooD1();
-
-    String fooD2();
-
-    String fooMultipleD();
-
-    String fooMultipleDArray();
-
-    String fooMultipleDServiceRef();
-
-    DComponent getDReference();
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
deleted file mode 100644
index 647fff0159..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.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.itest.references;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-
-public class AComponentImpl implements AComponent {
-
-    @Reference(name = "bReference")
-    protected BComponent b;
-
-    @Reference
-    protected CComponent cReference;
-
-    @Reference(required = false)
-    protected DComponent dReference;
-
-    @Reference(name = "dReferences")
-    public Collection<DComponent> dReferences;
-    
-    @Reference(name = "dReferenceArray")
-    public DComponent[] dReferenceArray;
-
-
-    @Reference(name = "dServiceReferences")
-    public List<ServiceReference<DComponent>> dServiceReferences;
-
-    private DComponent dReference1;
-
-    private DComponent dReference2;
-
-    @Reference(name = "dReference1")
-    public void setDReference(DComponent dReference) {
-        this.dReference1 = dReference;
-    }
-
-    @Reference
-    public void setDReference2(DComponent dReference2) {
-        this.dReference2 = dReference2;
-    }
-
-    public String fooB() {
-        return b.bFoo();
-    }
-
-    public String fooC() {
-        return cReference.cFoo();
-    }
-
-    public String fooBC() {
-        return b.fooC();
-    }
-
-    public String fooD() {
-        return dReference1.dFoo();
-    }
-
-    public String fooD1() {
-        return dReference1.dFoo();
-    }
-
-    public String fooD2() {
-        return dReference2.dFoo();
-    }
-
-    public String fooMultipleDArray() {
-        StringBuffer str = new StringBuffer();
-        for (DComponent d : dReferenceArray) {
-            str.append(d.getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }    
-    
-    public String fooMultipleD() {
-        StringBuffer str = new StringBuffer();
-        for (DComponent d : dReferences) {
-            str.append(d.getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }
-    
-    public String fooMultipleDServiceRef() {
-        StringBuffer str = new StringBuffer();
-        for (ServiceReference<DComponent> d : dServiceReferences) {
-            str.append(d.getService().getComponentName());
-            str.append(',');
-        }
-        if (str.length() > 0) {
-            str.deleteCharAt(str.length() - 1);
-        }
-        return str.toString();
-    }
-
-    public DComponent getDReference() {
-        return dReference;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
deleted file mode 100644
index 785920bb2d..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.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.references;
-
-public interface BComponent {
-
-    String bFoo();
-
-    String fooC();
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
deleted file mode 100644
index 6b1065ab0d..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.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.references;
-
-import org.osoa.sca.annotations.Reference;
-
-public class BComponentImpl implements BComponent {
-
-    protected CComponent cReference;
-
-    public BComponentImpl(@Reference(name = "cReference") CComponent cReference) {
-        this.cReference = cReference;
-    }
-
-    public String bFoo() {
-        return "BComponent";
-    }
-
-    public String fooC() {
-        return "B" + cReference.cFoo();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
deleted file mode 100644
index d436c28adc..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.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.itest.references;
-
-public interface CComponent {
-
-    String cFoo();
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
deleted file mode 100644
index a1823e1cdc..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.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.references;
-
-public class CComponentImpl implements CComponent {
-
-    public String cFoo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
deleted file mode 100644
index 2618ec7095..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.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.references;
-
-import org.osoa.sca.annotations.Remotable;
-
-public interface DComponent {
-
-    String dFoo();
-    String getComponentName();
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
deleted file mode 100644
index 79c802bc97..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.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.references;
-
-import org.osoa.sca.annotations.ComponentName;
-
-public class DComponentImpl implements DComponent {
-    @ComponentName
-    public String name;
-
-    public String dFoo() {
-        return "DComponent";
-    }
-
-    public String getComponentName() {
-        return name;
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/tags/java/sca/1.3/itest/references/src/main/resources/AutoWiredReferencesTest.composite
deleted file mode 100644
index 9f88f05abe..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/resources/AutoWiredReferencesTest.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

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  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="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">

-

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />

-    </service>

-

-    <component name="AComponent" autowire="false">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" autowire="true" />

-        <reference name="dReference1" />

-        <!-- 

-            <reference name="dReference1" target="DComponent" />

-        -->

-        <reference name="DReference2" target="DComponent" />

-        <reference name="dReferences" autowire="true" />

-        <reference name="dReferenceArray" autowire="true" />

-        <reference name="dServiceReferences" target="DComponent DComponent1" />

-

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/references/src/main/resources/InnerReferencesTest.composite b/tags/java/sca/1.3/itest/references/src/main/resources/InnerReferencesTest.composite
deleted file mode 100644
index 6cadc52c13..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/resources/InnerReferencesTest.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: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.references.AComponent" />

-    </service>

-

-    <component name="AComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

-        <reference name="bReference" target="BComponent" />

-        <reference name="cReference" target="CComponent" />

-        <reference name="dReference1" target="DComponent" />

-        <reference name="DReference2" target="DComponent" />

-        <reference name="dReferences" target="DComponent DComponent1" />

-        <reference name="dReferenceArray" target="DComponent1" />

-        <reference name="dServiceReferences" target="DComponent DComponent1" />

-    </component>

-

-    <component name="BComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />

-        <reference name="cReference" target="CComponent" />

-    </component>

-

-    <component name="CComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />

-    </component>

-

-    <component name="DComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-    

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />

-    </component>

-        

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/tags/java/sca/1.3/itest/references/src/main/resources/ManualWiredReferencesTest.composite
deleted file mode 100644
index 3b546a34e0..0000000000
--- a/tags/java/sca/1.3/itest/references/src/main/resources/ManualWiredReferencesTest.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
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  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="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
-
-    <service name="AComponent" promote="AComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />
-    </service>
-
-    <component name="AComponent" >
-        <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />
-        <reference name="bReference" target="BComponent" />
-        <reference name="cReference" target="CComponent/CComponent">
-            <binding.sca uri="DComponent"/>
-        </reference>
-        <reference name="dReference1" >
-            <binding.sca uri="DComponent"/>
-        </reference>
-        <reference name="DReference2" target="DComponent" >
-            <!-- binding.ws uri="DComponent"/-->
-        </reference>
-        <reference name="dReferences" target="DComponent DComponent1" />
-        <reference name="dReferenceArray" target="DComponent DComponent1" />
-        <reference name="dServiceReferences" target="DComponent DComponent1" />
-
-    </component>
-
-    <component name="BComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" />
-    </component>
-
-    <component name="CComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" />
-    </component>
-
-    <component name="DComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />
-        <service name="DComponentImpl">
-            <binding.sca/>
-            <!-- binding.ws/-->
-        </service>
-    </component>
-
-    <component name="DComponent1">
-        <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" />
-    </component>
-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
deleted file mode 100644
index b803f4bfa4..0000000000
--- a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.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.itest.references;
-
-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 AutoWiredReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("AutoWiredReferencesTest.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 testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testD1Reference() {
-        acomponent.fooD1();
-    }
-
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }        
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
deleted file mode 100644
index 1d8284f0fd..0000000000
--- a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.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.references;
-
-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 InnerReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("InnerReferencesTest.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 testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testD1Reference() {
-        assertEquals("DComponent", acomponent.fooD1());
-    }
-
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReference() {
-        String components = acomponent.fooMultipleD();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.equals("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-
-    @Test(expected = NullPointerException.class)
-    public void testRequiredFalseReference() {
-        acomponent.getDReference().dFoo();
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
deleted file mode 100644
index 4b3a745a19..0000000000
--- a/tags/java/sca/1.3/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.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.itest.references;
-
-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.Ignore;
-import org.junit.Test;
-
-public class ManualWiredReferenceTestCase {
-    private static SCADomain domain;
-    private static AComponent acomponent;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        domain = SCADomain.newInstance("ManualWiredReferencesTest.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 testCReference() {
-        assertEquals("CComponent", acomponent.fooC());
-    }
-
-    @Test
-    public void testBCReference() {
-        assertEquals("BCComponent", acomponent.fooBC());
-    }
-
-    @Test
-    public void testD1Reference() {
-        acomponent.fooD1();
-    }
-
-    @Ignore
-    @Test
-    public void testD2Reference() {
-        assertEquals("DComponent", acomponent.fooD2());
-    }
-    
-    @Test
-    public void testMultiDReferenceArray() {
-        String components = acomponent.fooMultipleDArray();
-        Assert.assertTrue(components.contains("DComponent1"));
-    }    
-    
-    @Test
-    public void testMultiDServiceReference() {
-        String components = acomponent.fooMultipleDServiceRef();
-        Assert.assertTrue(components.contains("DComponent"));
-        Assert.assertTrue(components.contains("DComponent1"));
-    }        
-
-    @Test
-    public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/scopes/pom.xml b/tags/java/sca/1.3/itest/scopes/pom.xml
deleted file mode 100644
index 65750a511a..0000000000
--- a/tags/java/sca/1.3/itest/scopes/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <name>Apache Tuscany SCA Scopes Integration Tests</name>
-    <artifactId>itest-scopes</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
deleted file mode 100644
index 4aa414be8e..0000000000
--- a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.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.scopes;
-
-import org.osoa.sca.annotations.Scope;
-
-/**
- * Test Composite scope
- */
-@Scope("COMPOSITE")
-public class CompositeScopeStateVerifierImpl implements StateVerifier {
-
-    // State data for this module (composite).
-    // In order to support thread-based state verification,
-    // the module state needs to be a ThreadLocal.
-    ThreadLocal<Integer> moduleState;
-
-    public CompositeScopeStateVerifierImpl() {
-      moduleState = new ThreadLocal<Integer>();
-    }
-
-    public void setState(int i) {
-      moduleState.set(i);
-    }
-
-    public boolean checkState(int i) {
-      return (moduleState.get() == i);
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
deleted file mode 100644
index fae4dcd586..0000000000
--- a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.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.scopes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * Test request scope
- */
-@Scope("REQUEST")
-public class RequestScopeStateVerifierImpl implements StateVerifier {
-    // State data for this request thread.
-    int requestState;
-
-    public void setState(int i) {
-      requestState = i;
-    }
-
-    public boolean checkState(int i) {
-      return (requestState == i);
-    }
-    
-    @Init
-    public void init() {
-        requestState = 0;
-    }
-    
-    @Destroy
-    public void destroy() {
-        requestState = -1; 
-    }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
deleted file mode 100644
index 878f7e4cc6..0000000000
--- a/tags/java/sca/1.3/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.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.scopes;
-
-public interface StateVerifier {
-    void setState(int i);
-    boolean checkState(int i);
-}
-
diff --git a/tags/java/sca/1.3/itest/scopes/src/main/resources/scopes.composite b/tags/java/sca/1.3/itest/scopes/src/main/resources/scopes.composite
deleted file mode 100644
index 54a1b66830..0000000000
--- a/tags/java/sca/1.3/itest/scopes/src/main/resources/scopes.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="Scopes">

-

-    <!-- Components used to test scopes. -->

-

- 	<component name="RequestScopeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.RequestScopeStateVerifierImpl"/>

-    </component>

-

- 	<component name="ModuleScopeComponent">

-		<implementation.java class="org.apache.tuscany.sca.itest.scopes.CompositeScopeStateVerifierImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/tags/java/sca/1.3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
deleted file mode 100644
index ce2519cbc0..0000000000
--- a/tags/java/sca/1.3/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.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;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.scopes.StateVerifier;
-
-public class ScopeTestCase extends TestCase {
-
-    final static int numThreads = 4; // number of threads to drive each scope container
-    final static int iterations = 200; // number of iterations per thread
-    private SCADomain domain;
-
-    // Test scope containers.
-    // The request scope container isn't hooked up for some reason so the code below
-    // that tests request scope is commented out.
-    // Code could be added to test session scope once it is supported in a standalone environment.
-
-    public void testScopes() throws InterruptedException {
-
-      Thread[] moduleScopeThreadTable = new Thread[numThreads];
-      Thread[] requestScopeThreadTable = new Thread[numThreads];
-
-      for(int i=0; i<numThreads; i++)
-      {
-        moduleScopeThreadTable[i] = new ModuleScopeTestThread();
-        requestScopeThreadTable[i] = new RequestScopeTestThread();
-      }
-      for(int j=0; j<numThreads; j++)
-      {
-        moduleScopeThreadTable[j].start();
-        requestScopeThreadTable[j].start();
-      }
-      for(int k=0; k<numThreads; k++)
-      {
-        moduleScopeThreadTable[k].join();
-        requestScopeThreadTable[k].join();
-      }
-    }
-
-    private  class ModuleScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier moduleScopeService = domain.getService(StateVerifier.class, "ModuleScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          moduleScopeService.setState(i);
-          if (!moduleScopeService.checkState(i))
-            fail("The module scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    private class RequestScopeTestThread extends Thread {
-      @Override
-    public void run() {
-        StateVerifier requestScopeService = domain.getService(StateVerifier.class, "RequestScopeComponent");
-        for(int i=1; i<=iterations; i++) {
-          requestScopeService.setState(i);
-          if (!requestScopeService.checkState(i))
-            fail("The request scope service lost its state on iteration " + i);
-        }
-      }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("scopes.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/itest/serialization/pom.xml b/tags/java/sca/1.3/itest/serialization/pom.xml
deleted file mode 100644
index 325ca725d5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>       
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>  
-           
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
deleted file mode 100644
index fa0f1c88d6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
deleted file mode 100644
index 85d5dd860c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
deleted file mode 100644
index 50c98d1afc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
deleted file mode 100644
index a83f69a1e4..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.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.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 Callback to a Stateless Service as managed
-     * SCA code
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToStatelessServiceInsideSCA() throws Exception;
-}
diff --git a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
deleted file mode 100644
index 146123dd2b..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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;
-
-    /**
-     * Tests Serializing a Stateless ServiceReference
-     * 
-     * @throws Exception Test failed
-     */
-    public void testSerializeStatelessServiceReference() throws Exception {
-        Assert.assertNotNull(statelessServiceRef);
-
-        StatelessService service = statelessServiceRef.getService();
-        service.getCurrentTime();
-        
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(statelessServiceRef);
-        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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
deleted file mode 100644
index d8d35a4f7c..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.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.servicereference;
-
-import org.osoa.sca.annotations.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 Callback to a Conversational Service as managed
-     * SCA code.
-     * 
-     * @throws Exception Test failed
-     */
-    void testSerializeCallbackToConversationalServiceInsideSCA() throws Exception;
-}
diff --git a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
deleted file mode 100644
index 469b9c38f9..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.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.itest.servicereference;
-
-import org.apache.tuscany.sca.itest.servicereference.utils.ServiceReferenceUtils;
-import org.junit.Assert;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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;
-
-    /**
-     * 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 {
-        Assert.assertNotNull(conversationalServiceRef);
-
-        ConversationalService service = conversationalServiceRef.getService();
-        Object origConvID = service.getConversationID();
-        Assert.assertNotNull(origConvID);
-
-        // Serialize the ServiceReference
-        byte[] serializedSR = ServiceReferenceUtils.serialize(conversationalServiceRef);
-        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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
deleted file mode 100644
index 8a1fe48436..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
deleted file mode 100644
index ffe3a3b8ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
deleted file mode 100644
index 24d43f79e3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/tags/java/sca/1.3/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
deleted file mode 100644
index 2749891bd4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.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/tags/java/sca/1.3/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/tags/java/sca/1.3/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
deleted file mode 100644
index ebc8e667de..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.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: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"/>
-    </component>
-
-    <component name="SCAManagedConversationalClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.servicereference.SCAManagedConversationalClientImpl" />
-        <reference name="conversationalService" target="ConversationalComponent"/>
-    </component>
-</composite>
diff --git a/tags/java/sca/1.3/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/tags/java/sca/1.3/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
deleted file mode 100644
index bee2913cb5..0000000000
--- a/tags/java/sca/1.3/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.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.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 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 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/tags/java/sca/1.3/itest/services/pom.xml b/tags/java/sca/1.3/itest/services/pom.xml
deleted file mode 100644
index 367eca881a..0000000000
--- a/tags/java/sca/1.3/itest/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-itest</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-services</artifactId>
-    <name>Apache Tuscany SCA Services Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
deleted file mode 100644
index 1304ba4288..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.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.services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AComponent {
-	String foo();
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
deleted file mode 100644
index 3577e09add..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.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.services;
-
-public class AComponentImpl implements AComponent {
-
-	public String foo() {
-		return "AComponent";
-	}
-
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
deleted file mode 100644
index 2e9b56d64d..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.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.services;
-
-public interface BComponent {
-
-	String foo();
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
deleted file mode 100644
index cda3f38636..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.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.services;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(BComponent.class)
-public class BComponentImpl implements BComponent {
-
-	public String foo() {
-		return "BComponent";
-	}
-
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
deleted file mode 100644
index 39806a8101..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/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.services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CComponent {
-    String foo();
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
deleted file mode 100644
index 8713e5ab22..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.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.services;
-
-public class CComponentImpl implements CComponent {
-
-    public String foo() {
-        return "CComponent";
-    }
-
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
deleted file mode 100644
index aa745deb63..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.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.services;
-
-
-public interface D1Component {
-	String foo1();
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
deleted file mode 100644
index 83da15089f..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.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.services;
-
-
-public interface DComponent {
-	String foo();
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
deleted file mode 100644
index 36189f94bb..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.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.services;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(interfaces = {DComponent.class, D1Component.class})
-public class DComponentImpl implements DComponent, D1Component {
-
-    public String foo() {
-        return "DComponent";
-    }
-
-    public String foo1() {
-        return "DComponent";
-    }
-}
diff --git a/tags/java/sca/1.3/itest/services/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/itest/services/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 37ea8f677d..0000000000
--- a/tags/java/sca/1.3/itest/services/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" targetNamespace="http://foo" xmlns:foo="http://foo">
-    <deployable composite="foo:InnerServicesTest" />
-</contribution>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/services/src/main/resources/ServicesTest.composite b/tags/java/sca/1.3/itest/services/src/main/resources/ServicesTest.composite
deleted file mode 100644
index eda885f9ec..0000000000
--- a/tags/java/sca/1.3/itest/services/src/main/resources/ServicesTest.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:foo="http://foo" targetNamespace="http://foo"

-    name="InnerServicesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-

-    <component name="AComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" />

-    </component>

-    

-    <component name="AComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" />

-	    <service name="AComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.AComponent" />

-	    </service>

-    </component> 

-

-    <component name="BComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" />

-    </component>

-    

-    <component name="BComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" />

-	    <service name="BComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.BComponent" />

-	    </service>

-    </component> 

-

-    <component name="CComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" />

-    </component>

-    

-    <component name="CComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" />

-	    <service name="CComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.CComponent" />

-	    </service>

-    </component> 

-    

-    <component name="DComponent1">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" />

-    </component>

-    

-    <component name="DComponent2">

-        <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" />

-	    <service name="DComponent">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.DComponent" />

-	    </service>

-	    <service name="D1Component">

-	        <interface.java interface="org.apache.tuscany.sca.itest.services.D1Component" />

-	    </service>

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/tags/java/sca/1.3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
deleted file mode 100644
index ba6cac279c..0000000000
--- a/tags/java/sca/1.3/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.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.itest.services;
-
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class ServicesTestCase {
-    private static SCADomain domain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        if (domain == null) {
-            domain = SCADomain.newInstance("ServicesTest.composite");
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-    @Test
-    public void testAService() {
-        AComponent a1 = domain.getService(AComponent.class, "AComponent1");
-        assertEquals("AComponent", a1.foo());
-
-        AComponent a2 = domain.getService(AComponent.class, "AComponent2/AComponent");
-        assertEquals("AComponent", a2.foo());
-    }
-
-    @Test
-    public void testBService() {
-        BComponent a1 = domain.getService(BComponent.class, "BComponent1");
-        assertEquals("BComponent", a1.foo());
-
-        BComponent a2 = domain.getService(BComponent.class, "BComponent2/BComponent");
-        assertEquals("BComponent", a2.foo());
-    }
-
-    @Test
-    public void testCService() {
-        CComponent a1 = domain.getService(CComponent.class, "CComponent1");
-        assertEquals("CComponent", a1.foo());
-
-        CComponent a2 = domain.getService(CComponent.class, "CComponent2/CComponent");
-        assertEquals("CComponent", a2.foo());
-    }
-
-    @Test
-    public void testDService() {
-        DComponent a1 = domain.getService(DComponent.class, "DComponent1/DComponent");
-        assertEquals("DComponent", a1.foo());
-
-        D1Component a2 = domain.getService(D1Component.class, "DComponent1/D1Component");
-        assertEquals("DComponent", a2.foo1());
-
-        try {
-            domain.getService(DComponent.class, "DComponent1");
-            Assert.fail("The service name is required");
-        } catch (ServiceRuntimeException e) {
-            Assert.assertTrue("The service name is required", true);
-        }
-
-        DComponent a3 = domain.getService(DComponent.class, "DComponent2/DComponent");
-        assertEquals("DComponent", a3.foo());
-
-        D1Component a4 = domain.getService(D1Component.class, "DComponent2/D1Component");
-        assertEquals("DComponent", a4.foo1());
-
-    }
-
-    public static void main(String[] args) throws Exception {
-        ServicesTestCase.init();
-        ServicesTestCase tester = new ServicesTestCase();
-        tester.testAService();
-        tester.testBService();
-        tester.testCService();
-        tester.testDService();
-        ServicesTestCase.destroy();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/spring/pom.xml b/tags/java/sca/1.3/itest/spring/pom.xml
deleted file mode 100644
index f87b34bda3..0000000000
--- a/tags/java/sca/1.3/itest/spring/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-itest</artifactId>
-        <version>1.3</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-policy-transaction</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </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/tags/java/sca/1.3/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/tags/java/sca/1.3/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
deleted file mode 100644
index 7068224183..0000000000
--- a/tags/java/sca/1.3/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.springframework.org/schema/sca/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/tags/java/sca/1.3/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.3/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index 3b87979ab2..0000000000
--- a/tags/java/sca/1.3/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.springframework.org/schema/sca/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/tags/java/sca/1.3/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/tags/java/sca/1.3/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
deleted file mode 100644
index 70b2d5fdab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/tags/java/sca/1.3/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
deleted file mode 100644
index bab9ecb528..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 634e3d34af..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
deleted file mode 100644
index e0b1a79c95..0000000000
--- a/tags/java/sca/1.3/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 = (T)domain.getService(getServiceClass(), "ClientComponent");
-    }
-
-    abstract protected Class 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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
deleted file mode 100644
index 3957e49bf3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
deleted file mode 100644
index d75d19295d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
deleted file mode 100644
index 4088691ccd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
deleted file mode 100644
index 840bf59b73..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
deleted file mode 100644
index fa7967c964..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/tags/java/sca/1.3/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
deleted file mode 100644
index b57cc7f366..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/pom.xml b/tags/java/sca/1.3/itest/transaction/pom.xml
deleted file mode 100644
index 1b5606e75e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
deleted file mode 100644
index d7d18181d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
deleted file mode 100644
index ac986dd417..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
deleted file mode 100644
index a6ea036da7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
deleted file mode 100644
index 3e1cb29f33..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
deleted file mode 100644
index 4d504a6a36..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
deleted file mode 100644
index 156b34227d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
deleted file mode 100644
index b7ea5f2663..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/tags/java/sca/1.3/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
deleted file mode 100644
index 341a7e53e3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/transaction/src/main/resources/accounts.composite b/tags/java/sca/1.3/itest/transaction/src/main/resources/accounts.composite
deleted file mode 100644
index f4c6b650c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/resources/definitions.xml b/tags/java/sca/1.3/itest/transaction/src/main/resources/definitions.xml
deleted file mode 100644
index 8aa6ba313a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/main/resources/log4j.properties b/tags/java/sca/1.3/itest/transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/tags/java/sca/1.3/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
deleted file mode 100644
index c23628ff91..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/tags/java/sca/1.3/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
deleted file mode 100644
index 36884f6098..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/pom.xml b/tags/java/sca/1.3/itest/validation/pom.xml
deleted file mode 100644
index f9e0e5c4a6..0000000000
--- a/tags/java/sca/1.3/itest/validation/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-itest</artifactId>
-        <version>1.3</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-monitor-logging</artifactId>
-            <version>1.3</version>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <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-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>1.3</version>
-        </dependency>
-               
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/account/Customer.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/account/Customer.java
deleted file mode 100644
index acb74c38ae..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
deleted file mode 100644
index 52ddfa9aba..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
deleted file mode 100644
index aec8998083..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
deleted file mode 100644
index 5df24b6379..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/jms/HelloWorldService.java
deleted file mode 100644
index 33bfe1d0ea..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a6a40b0ed1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddService.java
deleted file mode 100644
index 35ba2cbfac..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-    String getServiceName();
-
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
deleted file mode 100644
index ef305370cc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
deleted file mode 100644
index aacde27842..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
deleted file mode 100644
index 185f17a5ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorService.java
deleted file mode 100644
index f472d6aaf6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
deleted file mode 100644
index 77aafe83de..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/DivideService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/DivideService.java
deleted file mode 100644
index a93d23e61c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
deleted file mode 100644
index 080594034b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/MultiplyService.java
deleted file mode 100644
index 20d48e93d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
deleted file mode 100644
index 96f0b55fa2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/PropertyService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/PropertyService.java
deleted file mode 100644
index 4f1ccc96f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
deleted file mode 100644
index 429daf5f2d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractService.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractService.java
deleted file mode 100644
index 40e382dc74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
deleted file mode 100644
index 8cdbe0813d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/tags/java/sca/1.3/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
deleted file mode 100644
index d5e9fcf020..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/AddService.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/AddService.java
deleted file mode 100644
index 0db8ce4f5c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/AddServiceImpl.java
deleted file mode 100644
index 83f2685d54..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorClient.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorClient.java
deleted file mode 100644
index e34ce3db26..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorService.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorService.java
deleted file mode 100644
index 5d583fd604..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
deleted file mode 100644
index 0183e2a259..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/DivideService.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/DivideService.java
deleted file mode 100644
index 85ebadc9a0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
deleted file mode 100644
index 863c298234..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/MultiplyService.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/MultiplyService.java
deleted file mode 100644
index e1bf7fbddc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
deleted file mode 100644
index 6346ea3582..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/SubtractService.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/SubtractService.java
deleted file mode 100644
index 57759bb496..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
deleted file mode 100644
index 16e3e6a23d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
deleted file mode 100644
index 6f9df2c034..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- */
-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/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
deleted file mode 100644
index bafff878cd..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.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 impl.osgi;
-
-/**
- *
- * Test class - Interface for an OSGi service
- *
- */
-public interface OSGiTestInterface {
-
-    String testService() throws Exception ;
-
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
deleted file mode 100644
index e44d93e6be..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.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 impl.osgi;
-
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osoa.sca.annotations.Property;
-
-/**
- * 
- * Test class - Implementation of an OSGi service
- *
- */
-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/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/HelloWorld.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/HelloWorld.java
deleted file mode 100644
index ef0b491617..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
deleted file mode 100644
index 2e3458f0d3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/tags/java/sca/1.3/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
deleted file mode 100644
index 87904f2a72..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/tags/java/sca/1.3/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
deleted file mode 100644
index fa1a621f12..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/tags/java/sca/1.3/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
deleted file mode 100644
index ebf7a79589..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
deleted file mode 100644
index b2e7da05a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
deleted file mode 100644
index 4ba9f0724b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
deleted file mode 100644
index b935dd194a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
deleted file mode 100644
index 2b633f3139..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
deleted file mode 100644
index 940e27a1e7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
deleted file mode 100644
index 50d78cb2a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
deleted file mode 100644
index bd788e47b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
deleted file mode 100644
index 7281878c0f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index a37a01004e..0000000000
--- a/tags/java/sca/1.3/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.springframework.org/schema/sca/spring-sca.xsd">
-
-    <bean id="testBean" class="impl.spring.TestHelloWorldBean" lazy-init="true">
-    </bean>
-
-</beans>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
deleted file mode 100644
index 08e18decc1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
deleted file mode 100644
index 36e71e398b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
deleted file mode 100644
index 9a46e09363..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
deleted file mode 100644
index b3ed5f98ba..0000000000
--- a/tags/java/sca/1.3/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/>
-        </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/tags/java/sca/1.3/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
deleted file mode 100644
index 462a95dd02..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
deleted file mode 100644
index 4b6c44bd58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
deleted file mode 100644
index a397e3384c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
deleted file mode 100644
index 08fab865fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
deleted file mode 100644
index 3a5f59b17c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
deleted file mode 100644
index 8221e41430..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
deleted file mode 100644
index 9c5ae7027f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
deleted file mode 100644
index 3c85ed32e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
deleted file mode 100644
index 2d1a1e01f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
deleted file mode 100644
index efb457ac9e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
deleted file mode 100644
index a5beaf4ec9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
deleted file mode 100644
index 06c3eeeaca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
deleted file mode 100644
index 821ce570c8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/XsdValidation/Calculator.composite
deleted file mode 100644
index 63ccaa9957..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
deleted file mode 100644
index da565081f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
deleted file mode 100644
index 6153d40c3d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
deleted file mode 100644
index a3eb60bf58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
deleted file mode 100644
index 6233d47d8d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
deleted file mode 100644
index 6a9af9e070..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
deleted file mode 100644
index 49b26c78f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
deleted file mode 100644
index c34a160b61..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
deleted file mode 100644
index 293c4d725d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index b7ff1e304f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index 8cda0b007e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
deleted file mode 100644
index 781319d619..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
deleted file mode 100644
index 8a0dfac98b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
deleted file mode 100644
index fcfe408582..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
deleted file mode 100644
index ede3b3fd40..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
deleted file mode 100644
index a8c89a0bf5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
deleted file mode 100644
index b4e56d1789..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
deleted file mode 100644
index e68eb75d64..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
deleted file mode 100644
index 00c7a3f86b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
deleted file mode 100644
index d656d47cfd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
deleted file mode 100644
index ad1daacfcf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
deleted file mode 100644
index fb35f5d1b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
deleted file mode 100644
index fcdf25455c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
deleted file mode 100644
index 14f1314a1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
deleted file mode 100644
index 1a3cb21ac6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
deleted file mode 100644
index 80b8f9d938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
deleted file mode 100644
index 8fd1e2f554..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
deleted file mode 100644
index b74682e1bd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
deleted file mode 100644
index f439ab6260..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
deleted file mode 100644
index e22f30152e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
deleted file mode 100644
index 6ef7558d95..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
deleted file mode 100644
index 77a2715373..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
deleted file mode 100644
index d7fa82635e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
deleted file mode 100644
index 7f5eb546e0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
deleted file mode 100644
index 0dfe52985a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
deleted file mode 100644
index d3f249720d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
deleted file mode 100644
index 575927a5de..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
deleted file mode 100644
index 973d1f618a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
deleted file mode 100644
index 5d2aeddc3d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
deleted file mode 100644
index 077df56290..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
deleted file mode 100644
index 68df3156a8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
deleted file mode 100644
index a8eb389704..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
deleted file mode 100644
index 695fd60887..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index f3cf93ddaa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
deleted file mode 100644
index f9016219a5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
deleted file mode 100644
index 7b470c6d37..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
deleted file mode 100644
index 0d1861f2f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
deleted file mode 100644
index 634c13b3cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
deleted file mode 100644
index 5fc50ac45d..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
deleted file mode 100644
index 881c24854b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
deleted file mode 100644
index 4e680f1200..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
deleted file mode 100644
index e01643ed8f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
deleted file mode 100644
index d776882ed0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
deleted file mode 100644
index 0d1ffc97e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ /dev/null
diff --git a/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
deleted file mode 100644
index 99c529d77f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
deleted file mode 100644
index c75f209b6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
deleted file mode 100644
index a5874707da..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
deleted file mode 100644
index 393b9fe674..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
deleted file mode 100644
index 1dca444938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
deleted file mode 100644
index 9a60183c5c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 70f91d1a7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
deleted file mode 100644
index bc7bf3f250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
deleted file mode 100644
index a1a699fc75..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
deleted file mode 100644
index 7446e4f06a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
deleted file mode 100644
index 0bbb10706e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
deleted file mode 100644
index 9d9376ad6c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
deleted file mode 100644
index 3885357625..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
deleted file mode 100644
index d9252ba54f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
deleted file mode 100644
index 53d1a581f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
deleted file mode 100644
index ac45d95ce8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
deleted file mode 100644
index 5cf6963a96..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
deleted file mode 100644
index d31c705fb5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
deleted file mode 100644
index d214a7f40a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
deleted file mode 100644
index ede1786942..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
deleted file mode 100644
index fcb43c949b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
deleted file mode 100644
index 6faca15da0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ /dev/null
@@ -1,241 +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"
-	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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
deleted file mode 100644
index 48c3c5ffc0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/tags/java/sca/1.3/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
deleted file mode 100644
index 60f4de5cd3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
deleted file mode 100644
index 9b0d51eb59..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.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 assembly.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ContributionReadException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
deleted file mode 100644
index e8476991a9..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.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 assembly.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyImplValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
deleted file mode 100644
index 8ae156d63e..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.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 assembly.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PolicyServiceValidationException", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
deleted file mode 100644
index d757ff98dd..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.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 assembly.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedBindingElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
deleted file mode 100644
index 9a231a18c7..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.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 assembly.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnexpectedImplementationElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
deleted file mode 100644
index 4ae88b9ba3..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.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 org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
deleted file mode 100644
index 1cef8a902e..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.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 binding.ejb;
-
-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 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 {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBSessionType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
deleted file mode 100644
index bacddc93a8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.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 binding.ejb;
-
-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 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 {
-        //node.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownEJBVersion", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
deleted file mode 100644
index e0e5347d96..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
deleted file mode 100644
index 9e08afec09..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
deleted file mode 100644
index bae9656433..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.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.jms;
-
-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 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();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
deleted file mode 100644
index a2a5b0b872..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
deleted file mode 100644
index 64b41623de..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 86fbe51dad..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
deleted file mode 100644
index 6e884c41cd..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
deleted file mode 100644
index c237f8af18..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
deleted file mode 100644
index 949ec02134..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
deleted file mode 100644
index a974ef0db4..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingActivationSpecName", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
deleted file mode 100644
index adbaa50dc0..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
deleted file mode 100644
index 4bba6b74de..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
deleted file mode 100644
index 8f4fc1a739..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
deleted file mode 100644
index d9e1c782a8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustStartWithSchema", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
deleted file mode 100644
index 3e4e36d839..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedElement", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
deleted file mode 100644
index 60ea47a85f..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnexpectedResponseElement", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
deleted file mode 100644
index 6a75a35f99..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.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.jms;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("UnknownTokenInURI", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
deleted file mode 100644
index c0f60a848f..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.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.wsxml;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
deleted file mode 100644
index 5a74194796..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.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.wsxml;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MustUseWsdlBinding", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
deleted file mode 100644
index 7991de7176..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.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.wsxml;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
deleted file mode 100644
index a0a7d12b9f..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.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.wsxml;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
deleted file mode 100644
index 84c77ae297..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("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 = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
deleted file mode 100644
index ff1bd6cb09..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.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.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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateComponentNameTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateComponentName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateComponentName").toURL().toString()));
-        /*
-        node = SCANode2Factory.createSCANodeWithComposite("DuplicateComponentName/Calculator.composite");
-        */
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
deleted file mode 100644
index 65dab38ee3..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
deleted file mode 100644
index 6c10d1279c..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class DuplicateImplementationReferenceNameTestCase extends TestCase {
-
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
deleted file mode 100644
index 4531564ccb..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
deleted file mode 100644
index 3b024c58c7..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("DuplicateComponentReferenceName", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
deleted file mode 100644
index 4f54b023f4..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("MultipleBindingsForService", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
deleted file mode 100644
index 14af754860..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.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.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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
deleted file mode 100644
index 2f2e87f9af..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/NoCompositeNamespace/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/NoCompositeNamespace").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoCompositeNamespace", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
deleted file mode 100644
index eb1f514240..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.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.warning;
-
-import java.io.File;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class NoMatchingBindingTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        try {
-            SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/NoMatchingBinding/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
-            		                                     new File("src/main/resources/NoMatchingBinding").toURL().toString()));
-    
-            node.start();
-            calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
-        } catch (Exception ex){
-            // do nothing
-            return;
-        }
-        Assert.fail();
-    }
-
-    @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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("NoMatchingBinding", problem.getMessageId());
-        */
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
deleted file mode 100644
index 07c75decbc..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
deleted file mode 100644
index 26c988c1c1..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PromotedServiceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PromotedServiceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PromotedServiceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
deleted file mode 100644
index 3753fc278c..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyNull", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
deleted file mode 100644
index 08e5a9861b..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
deleted file mode 100644
index 4af2675c09..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
deleted file mode 100644
index 11fde0a73d..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/PropertyAttribute").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
deleted file mode 100644
index 19b04e6940..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleComponentInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
deleted file mode 100644
index 3180539898..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleInterface/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleInterface").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
deleted file mode 100644
index 87ae0f0e3c..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceIncompatibleMultiplicity").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
deleted file mode 100644
index 4856ba507f..0000000000
--- a/tags/java/sca/1.3/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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ReferenceNotFoundTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.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 {
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceNotFound", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
deleted file mode 100644
index f456ae40af..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ReferenceWithoutTargets/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceWithoutTargets").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ReferenceWithoutTargets", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
deleted file mode 100644
index 51adc22848..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.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 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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ServiceNotFoundForComponentService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ServiceNotFoundForComponentService").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
deleted file mode 100644
index 918108c275..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.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.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.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-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 SCANode2 node;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/UnresolvedComponentImplementation/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
deleted file mode 100644
index 93edfa2e21..0000000000
--- a/tags/java/sca/1.3/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.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class XSDValidationTestCase extends TestCase {
-
-    private CalculatorService calculatorService;
-    private SCANode2 node;
-    private Exception startUpException;
-
-    @Override
-    protected void setUp() throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            node = nodeFactory.createSCANode(new File("src/main/resources/XsdValidation/Calculator.composite").toURL().toString(),
-            		                 new SCAContribution("TestContribution", 
-            		                                     new File("src/main/resources/XsdValidation").toURL().toString()));
-            node.start();
-            calculatorService = ((SCAClient)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.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
-   
-    }
- 
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
deleted file mode 100644
index 04135ab2cc..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.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 contribution.java;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
deleted file mode 100644
index ab0afc6f65..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.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 contribution.namespace;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
deleted file mode 100644
index a1b42bf815..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.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 contribution.resource;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
deleted file mode 100644
index 32c1a8b3a8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.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 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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
- 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/tags/java/sca/1.3/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
deleted file mode 100644
index 9ad5407ed6..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/domain/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 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.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.definitions.SCADefinitions;
-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.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-
-public class CustomCompositeBuilder {
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private ModelResolverExtensionPoint modelResolvers;
-    private ModelFactoryExtensionPoint modelFactories;
-    private WorkspaceFactory workspaceFactory;
-    private AssemblyFactory assemblyFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> xmlProcessor; 
-    private ContributionDependencyBuilder contributionDependencyBuilder;
-    private CompositeBuilder domainCompositeBuilder;
-    private CompositeBuilder nodeCompositeBuilder;
-    private NodeImplementationFactory nodeFactory;
-    //private AtomBindingFactory atomBindingFactory;
-    private static Workspace workspace;
-    private List<SCADefinitions> 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(ModelFactoryExtensionPoint.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);
-        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, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, null, monitor);
-    }
-    
-    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
-        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 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 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/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
deleted file mode 100644
index 9d97e3611a..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
deleted file mode 100644
index 80c15dc444..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AttributeWithoutNamespace", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
deleted file mode 100644
index 81e8aecfeb..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("BPELProcessNotFound", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
deleted file mode 100644
index fb0c525aea..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CannotResolveWSDLReference", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
deleted file mode 100644
index 445629457e..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
deleted file mode 100644
index 00b904ae65..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
-
-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
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
deleted file mode 100644
index b7a4ee6fef..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.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.bpel;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
deleted file mode 100644
index 32d3211f36..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.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.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-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
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
-    	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-    	assertNotNull(problem);
-        assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
-        
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
deleted file mode 100644
index 3a7745722a..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.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 org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 59fc3ce79c..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.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 impl.java;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	
-    	assertNotNull(problem);
-        assertEquals("ContributionResolveException", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
deleted file mode 100644
index 6f54ad140c..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.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 impl.osgi;
-
-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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CouldNotLocateOSGiBundleTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        //OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-       OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
deleted file mode 100644
index 3d75fa8ccc..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.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 impl.osgi;
-
-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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class MissingComponentTypeFileTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/MissingComponentTypeFile/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MissingComponentTypeFile", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
deleted file mode 100644
index 398c028dd8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.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 impl.osgi;
-
-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 {
-    
-    public static void createBundle(String jarName,
-            Class<?> interfaceClass, Class<?> implClass) throws Exception {
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-        
-        String packageName = interfaceClass.getPackage().getName();
-        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/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
deleted file mode 100644
index 117a94337a..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.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 impl.osgi;
-
-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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-import domain.CustomCompositeBuilder;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class PropertyShouldSpecifySRTestCase extends TestCase {
-
-    private CustomCompositeBuilder customDomain;
-	
-    @Override
-    protected void setUp() throws Exception 
-    {
-        OSGiTestBundles.createBundle("src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar", OSGiTestInterface.class, OSGiTestImpl.class);
-    	
-        customDomain = CustomCompositeBuilder.getInstance();
-        try {
-              customDomain.loadContribution("src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite", 
-                        "TestContribution", "src/main/resources/impl/osgi/PropertyShouldSpecifySR/");
-        } catch (Exception ex){
-            //throw ex;
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	//nothing to do
-    	OSGiRuntime.stop();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("PropertyShouldSpecifySR", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index 14ba8e992e..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.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.Assert;
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 461895f824..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.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.resource;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index 9b7dbef3dd..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.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 impl.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-
-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();
-    }
-
-    public void testCalculator() {
-    	Monitor monitor = customDomain.getMonitorInstance();        
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
deleted file mode 100644
index cd38b53f66..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.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.spring;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
deleted file mode 100644
index 83550ae58d..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.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.spring;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("UnableToResolveComponentType", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
deleted file mode 100644
index d098bb4bf8..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.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.Assert;
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        Assert.assertNotNull(problem);
-        Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 2f85d8ed4a..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.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.widget;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-        assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
deleted file mode 100644
index f90fc3b83f..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.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.xquery;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("CouldNotLocateFile", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
deleted file mode 100644
index 01450a8836..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.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.xquery;
-
-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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("LocationAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
deleted file mode 100644
index a03e056298..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.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 interfacejava.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ClassNotFoundException", problem.getMessageId()); 
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
deleted file mode 100644
index e0524f57b7..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/interfacejava/xml/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 interfacejava.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	//assertNotNull(problem);
-        //assertEquals("ContributionResolveException", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
deleted file mode 100644
index e212477c61..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.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 interfacewsdl.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
deleted file mode 100644
index df2a2671df..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.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 interfacewsdl.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
deleted file mode 100644
index 361e2f2bfb..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.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 policy.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
deleted file mode 100644
index a85dc334f4..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.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 policy.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-        assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
deleted file mode 100644
index 3f98757ce5..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
-
-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();
-    }
-
-    public void testCalculator() {
-       Monitor monitor = customDomain.getMonitorInstance();
-       assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
-       /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); 
-       assertNotNull(problem);
-       assertEquals("IntentNotSpecified", problem.getMessageId());*/  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
deleted file mode 100644
index 3b8d075165..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.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 policy.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("MayProvideIntentNotFound", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
deleted file mode 100644
index bcf1f82392..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.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 policy.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-       assertNotNull(problem);
-       assertEquals("RequiredAttributeMissing", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
deleted file mode 100644
index 2a767d3550..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
-
-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();
-    }
-
-    public void testCalculator() {
-        Monitor monitor = customDomain.getMonitorInstance();
-        assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("UnableToMapPolicies"));
-        /*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
-        assertNotNull(problem);
-        assertEquals("UnableToMapPolicies", problem.getMessageId());*/  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
deleted file mode 100644
index eec39d711e..0000000000
--- a/tags/java/sca/1.3/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.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 policy.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 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 = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
-        
-    	assertNotNull(problem);
-       assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());  
-    }
-}
diff --git a/tags/java/sca/1.3/itest/wasAdmin.py b/tags/java/sca/1.3/itest/wasAdmin.py
deleted file mode 100644
index 2be2b1eff7..0000000000
--- a/tags/java/sca/1.3/itest/wasAdmin.py
+++ /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.    
-"""
-import sys
-
-def getCellName():
-    """Return the name of the cell connected to"""
-    return AdminControl.getCell()
-
-def getNodeName():
-    """Return the name of the node connected to"""
-    return AdminControl.getNode()
-
-def startApplicationOnServer(appName,serverName):
-    """Start the named application on one server"""
-    print "startApplicationOnServer: Entry. appname=%s servername=%s" % ( appName,serverName )
-    cellName = getCellName()
-    nodeName = getNodeName()
-    # Get the application manager 
-    appManager = AdminControl.queryNames('cell=%s,node=%s,type=ApplicationManager,process=%s,*' %(cellName,nodeName,serverName))
-    print "startApplicationOnServer: appManager=%s" % ( repr(appManager) )
-    # start it
-    rc = AdminControl.invoke(appManager, 'startApplication', appName)
-    print "startApplicationOnServer: Exit. rc=%s" % ( repr(rc) )
-
-def stopApplicationOnServer(appName,serverName):
-    """Stop the named application on one server"""
-    print "stopApplicationOnServer: Entry. appname=%s servername=%s" % ( appName,serverName )
-    cellName = getCellName()
-    nodeName = getNodeName()
-    # Get the application manager 
-    appManager = AdminControl.queryNames('cell=%s,node=%s,type=ApplicationManager,process=%s,*' %(cellName,nodeName,serverName))
-    print "stopApplicationOnServer: appManager=%s" % ( repr(appManager) )
-    # start it
-    rc = AdminControl.invoke(appManager, 'stopApplication', appName)
-    print "stopApplicationOnServer: Exit. rc=%s" % ( repr(rc) )
-
-def installApplicationOnServer( fileName, appName, contextRoot, serverName ):
-    """Install given application on the named server using given context root"""
-    print "installApplicationOnServer: fileName=%s appName=%s contextRoot=%s ServerName=%s" % ( fileName, appName,contextRoot,serverName )
-    AdminApp.install(fileName,'[-appname ' + appName + ' -contextroot ' + contextRoot  + ' -server ' + serverName + ' -usedefaultbindings ]')
-    AdminConfig.save()
-    """modify classloader model for application"""
-    deploymentID = AdminConfig.getid('/Deployment:' + appName + '/')
-    deploymentObject = AdminConfig.showAttribute(deploymentID, 'deployedObject')
-    classldr = AdminConfig.showAttribute(deploymentObject, 'classloader')
-    print AdminConfig.showall(classldr)
-    AdminConfig.modify(classldr, [['mode', 'PARENT_LAST']])
-    """Modify WAR class loader model"""
-    AdminConfig.show(deploymentObject, 'warClassLoaderPolicy')
-    AdminConfig.modify(deploymentObject, [['warClassLoaderPolicy', 'SINGLE']])
-    AdminConfig.save()
-
-def uninstallApplicationOnServer( appName ):
-    """Delete the named application from the cell"""
-    AdminApp.uninstall( appName )
-    AdminConfig.save()
-
-
-
-"""-----------------------------------------------------------
-   Phyton script to interface with WAS Admin/Management Tools
------------------------------------------------------------"""
-
-if len(sys.argv) < 1:
-    print "wasAdmin.py : need parameters : functionName [args]"
-    sys.exit(0)
-if(sys.argv[0] == 'installApplicationOnServer'):
-    installApplicationOnServer(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
-elif(sys.argv[0] == 'startApplicationOnServer'):
-    startApplicationOnServer(sys.argv[1], sys.argv[2])
-elif(sys.argv[0] == 'uninstallApplicationOnServer'):
-    uninstallApplicationOnServer(sys.argv[1])
-else:
-    print "Exiting without doing anything"
-
diff --git a/tags/java/sca/1.3/itest/wires/pom.xml b/tags/java/sca/1.3/itest/wires/pom.xml
deleted file mode 100644
index 8d41197043..0000000000
--- a/tags/java/sca/1.3/itest/wires/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-wires</artifactId>
-    <name>Apache Tuscany SCA Wires Basic Integration Tests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
deleted file mode 100644
index 09d5b0278e..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the client interface for the wires tests 
- */
-@Remotable
-public interface WireClient {
-
-    /**
-     * This tests the wires.
-     */
-    void runTests();
-}
diff --git a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
deleted file mode 100644
index f0964ebb93..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.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.itest;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the client implementation for the wires tests 
- */
-@Service(WireClient.class)
-public class WireClientImpl implements WireClient {
-    /**
-     * This is our injected reference to the WireService
-     */
-    @Reference
-    protected WireService aWireService;
-
-    /**
-     * This tests the wire reference
-     */
-    public void runTests() {
-        // Make sure the wire has injected a reference
-        Assert.assertNotNull(aWireService);
-        
-        // Test the injected reference
-        String msg = aWireService.sayHello("MCC");
-        
-        // Validate the response
-        Assert.assertNotNull(msg);
-        Assert.assertEquals("Hello MCC", msg);
-    }
-}
diff --git a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
deleted file mode 100644
index c19a0b4f74..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Sample Wire Service 
- */
-@Remotable
-public interface WireService {
-    /**
-     * Returns "Hello " + aName
-     * 
-     * @param aName The name to say hello
-     * @return "Hello " + aName
-     */
-    String sayHello(String aName);
-}
diff --git a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
deleted file mode 100644
index b7ccdbf8d1..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.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 org.osoa.sca.annotations.Service;
-
-/**
- * Sample WireService Implementation 
- */
-@Service(WireService.class)
-public class WireServiceImpl implements WireService {
-
-    /**
-     * Returns "Hello " + aName
-     * 
-     * @param aName The name to say hello
-     * @return "Hello " + aName
-     */
-    public String sayHello(String aName) {
-        return "Hello " + aName;
-    }
-}
diff --git a/tags/java/sca/1.3/itest/wires/src/main/resources/WireTest.composite b/tags/java/sca/1.3/itest/wires/src/main/resources/WireTest.composite
deleted file mode 100644
index 8b764d0e7d..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/main/resources/WireTest.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://wires" name="WireTest">

-

-    <component name="WireClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>

-<!-- We are not using a reference - we are using a wire - see below -->

-<!-- The equivalent reference for the wire would be as follows -->

-<!--    <reference name="aWireService" target="WireService"/>-->

-    </component> 

-    

-    <component name="AnotherWireClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/>

-    </component> 

-    

-    <component name="WireServiceComponent">

-      <implementation.java class="org.apache.tuscany.sca.itest.WireServiceImpl"/>

-    </component>  

-  

-    <wire source="WireClient/aWireService" target="WireServiceComponent"/>

-    <wire source="AnotherWireClient/aWireService" target="WireServiceComponent/WireService"/>

-</composite>

diff --git a/tags/java/sca/1.3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/tags/java/sca/1.3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
deleted file mode 100644
index 95f721cd8e..0000000000
--- a/tags/java/sca/1.3/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.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;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This test case will attempt to use a wire
- */
-public class WireTestCase extends TestCase {
-
-    /**
-     * The SCADomain we are using 
-     */
-    private SCADomain domain;
-    
-    /**
-     * The client the tests should use
-     */
-    private WireClient aWireClient;
-
-    /**
-     * Run the wire tests
-     */
-    public void testWire() {
-        aWireClient.runTests(); 
-    }
-
-    /**
-     * Load the Wire composite and look up the client.
-     */
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("WireTest.composite");
-        aWireClient = domain.getService(WireClient.class, "WireClient");
-        Assert.assertNotNull(aWireClient);
-        
-        aWireClient = domain.getService(WireClient.class, "AnotherWireClient");
-        Assert.assertNotNull(aWireClient);
-    }
-
-    /**
-     * Shutdown the SCA domain
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/itest/ws-void-args-return/pom.xml b/tags/java/sca/1.3/itest/ws-void-args-return/pom.xml
deleted file mode 100644
index bef9a05c8d..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-    

-</project>

diff --git a/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
deleted file mode 100644
index 43e251369d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
deleted file mode 100644
index dc949b5191..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
deleted file mode 100644
index 4777f793e0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
deleted file mode 100644
index d549bccaf0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
deleted file mode 100644
index 1cdd094c50..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/ws-void-args-return/src/main/resources/voidtest.composite b/tags/java/sca/1.3/itest/ws-void-args-return/src/main/resources/voidtest.composite
deleted file mode 100644
index 0f31c4cd2c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/tags/java/sca/1.3/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
deleted file mode 100644
index eaaa67c22c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/pom.xml b/tags/java/sca/1.3/itest/wsdl-multiple/pom.xml
deleted file mode 100644
index d8afff78fe..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</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-incubating</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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
deleted file mode 100644
index 842ae0a692..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldCallback {
-
-    public void getGreetingsCallback(String name);
-}
diff --git a/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index d2d898e9c4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index d4fbd434fe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index a46f763960..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
deleted file mode 100644
index 9d9ed57cc7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
deleted file mode 100644
index 0c1dc5d353..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
deleted file mode 100644
index ea2f93c3e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/tags/java/sca/1.3/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
deleted file mode 100644
index 1e50e146f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
deleted file mode 100644
index 6a872faa17..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/tags/java/sca/1.3/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
deleted file mode 100644
index 5852f8d802..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/pom.xml b/tags/java/sca/1.3/itest/wsdl/pom.xml
deleted file mode 100644
index d8b9c94d2b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</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-incubating</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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 265b11f7dd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index f8c9c28f26..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index f16d20689d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index cba6f2ee6c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 9f15be0236..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index f174e1af07..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index 4a5b7bceef..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c9076ebba6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index d706517b76..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 9d147dc013..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 7556e02b36..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index e7031ff41c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.3/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index 7a049ed7b0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.3/itest/wsdl/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 62596ee62a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/main/resources/WSDLTest.composite b/tags/java/sca/1.3/itest/wsdl/src/main/resources/WSDLTest.composite
deleted file mode 100644
index 2024578dae..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd
deleted file mode 100644
index 4fc5b10e7c..0000000000
--- a/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-
-        <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/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 1966acc957..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.3/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 12441753fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.3/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index fd30d69c79..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl2java/pom.xml b/tags/java/sca/1.3/itest/wsdl2java/pom.xml
deleted file mode 100644
index e2424eca4a..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-ws-axis2</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-axiom</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>1.3</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.1-incubating</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-incubating</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>1.3</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/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/AccountService.wsdl b/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 9e5650e7dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/EchoService.wsdl b/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/EchoService.wsdl
deleted file mode 100644
index 50d580f299..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/EchoService.xsd b/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/EchoService.xsd
deleted file mode 100644
index 8069d4861f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/tags/java/sca/1.3/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
deleted file mode 100644
index c44229c162..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/pom.xml b/tags/java/sca/1.3/itest/wsdlless/pom.xml
deleted file mode 100644
index ea92f40fde..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</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-incubating</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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 5886ebc6ff..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index df658428fd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
deleted file mode 100644
index d39df8c00e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
deleted file mode 100644
index d4a06780c3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
deleted file mode 100644
index 6dc46c60b5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
deleted file mode 100644
index 8471000152..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
deleted file mode 100644
index 859c61a724..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index e747eb041f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index ca7c25f3fa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 8b234599aa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 03984f7252..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
deleted file mode 100644
index 45bb697437..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
deleted file mode 100644
index 9342c8e6ee..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
deleted file mode 100644
index 6c5ac96b67..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
deleted file mode 100644
index ebaf33f568..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/AnObject.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/AnObject.java
deleted file mode 100644
index 65ba52f356..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/MoreComplexObject.java
deleted file mode 100644
index 69eba6701d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/SomeService.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/SomeService.java
deleted file mode 100644
index f6aaacb23a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface SomeService {
-
-    public AnObject getUsingString(String stringParam);
-
-    public AnObject getUsingMoreComplexObject(MoreComplexObject moreComplexParam);
-
-}
diff --git a/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/tags/java/sca/1.3/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
deleted file mode 100644
index 39a2131024..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/tags/java/sca/1.3/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
deleted file mode 100644
index 16d3806318..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/resources/WSDLTest.composite b/tags/java/sca/1.3/itest/wsdlless/src/main/resources/WSDLTest.composite
deleted file mode 100644
index e69cdbc282..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/resources/some.composite b/tags/java/sca/1.3/itest/wsdlless/src/main/resources/some.composite
deleted file mode 100644
index 1b099239d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/tags/java/sca/1.3/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 73f9ed4bfc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index bc6fe0e89a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
deleted file mode 100644
index 33f541b21b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
deleted file mode 100644
index 82bf7ce650..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
deleted file mode 100644
index 7c62287c57..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/AnObject.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/AnObject.java
deleted file mode 100644
index effeb3c701..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
deleted file mode 100644
index 284e961788..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
deleted file mode 100644
index 4113aa1a0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
deleted file mode 100644
index 532b948b47..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
deleted file mode 100644
index 82bfb2d2aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
deleted file mode 100644
index 61c7c6cb19..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
deleted file mode 100644
index 1ba0c497d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/SomeService.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/SomeService.java
deleted file mode 100644
index 4a584a8da2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
deleted file mode 100644
index 44c2b67256..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/package-info.java b/tags/java/sca/1.3/itest/wsdlless/src/test/java/service/generated/package-info.java
deleted file mode 100644
index d7b3fef82e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/assembly-xml/LICENSE b/tags/java/sca/1.3/modules/assembly-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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/tags/java/sca/1.3/modules/assembly-xml/NOTICE b/tags/java/sca/1.3/modules/assembly-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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/tags/java/sca/1.3/modules/assembly-xml/pom.xml b/tags/java/sca/1.3/modules/assembly-xml/pom.xml
deleted file mode 100644
index 7f051ee1a1..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly-xml</artifactId>
-    <name>Apache Tuscany SCA XML Assembly Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-		<!-- Test Dependencies -->        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-       
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</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.assembly.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.assembly.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
deleted file mode 100644
index ae33a4da16..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.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.    
- */
-
-package org.apache.tuscany.sca.assembly.xml;
-
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-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.ConfiguredOperation;
-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.Multiplicity;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-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.contribution.ContributionFactory;
-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.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.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-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.impl.IntentAttachPointTypeFactoryImpl;
-import org.apache.tuscany.sca.policy.util.PolicyValidationException;
-import org.apache.tuscany.sca.policy.util.PolicyValidationUtils;
-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 implements Constants {
-
-    protected ContributionFactory contributionFactory;
-    protected AssemblyFactory assemblyFactory;
-    protected PolicyFactory policyFactory;
-    protected StAXArtifactProcessor<Object> extensionProcessor;
-    protected PolicyAttachPointProcessor policyProcessor;
-    private DocumentBuilderFactory documentBuilderFactory;
-    protected IntentAttachPointTypeFactory intentAttachPointTypeFactory;
-    private Monitor monitor;
-
-    /**
-     * Constructs a new BaseArtifactProcessor.
-     * @param contribFactory
-     * @param factory
-     * @param policyFactory
-     */
-    @SuppressWarnings("unchecked")
-    public BaseAssemblyProcessor(ContributionFactory contribFactory,
-                                 AssemblyFactory factory,
-                                 PolicyFactory policyFactory,
-                                 StAXArtifactProcessor extensionProcessor,
-                                 Monitor monitor) {
-        this.assemblyFactory = factory;
-        this.policyFactory = policyFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-        this.contributionFactory = contribFactory;
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = new IntentAttachPointTypeFactoryImpl();
-        this.monitor = monitor;
-    }
-
-    /**
-     * Constructs a new BaseArtifactProcessor.
-     * @param factory
-     * @param policyFactory
-     */
-    @SuppressWarnings("unchecked")
-    public BaseAssemblyProcessor(AssemblyFactory factory,
-                                 PolicyFactory policyFactory,
-                                 StAXArtifactProcessor extensionProcessor,
-                                 Monitor monitor) {
-        this.assemblyFactory = factory;
-        this.policyFactory = policyFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-        
-        //TODO - this constructor should take a monitor too. 
-    }
-    
-    /**
-     * 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);
-    	}
-    }
-    
-    /**
-     * 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 = new ProblemImpl(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);
-        }
-    }
-
-    /**
-     * 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, PolicyValidationException {
-        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()) {
-                        //resolve policies
-                        if ( implementation instanceof PolicySetAttachPoint ) {
-                            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-                            resolveIntents(policiedImpl.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(policiedImpl, policiedImpl.getType());
-                            
-                            resolvePolicySets(policiedImpl.getPolicySets(), resolver);
-                            PolicyValidationUtils.validatePolicySets(policiedImpl);
-                            
-                            if ( implementation instanceof OperationsConfigurator ) {
-                                OperationsConfigurator opsConfigurator = (OperationsConfigurator)implementation;
-                                for ( ConfiguredOperation implOp : opsConfigurator.getConfiguredOperations() ) {
-                                    resolveIntents(implOp.getRequiredIntents(), resolver);
-                                    PolicyValidationUtils.validateIntents(implOp, policiedImpl.getType());
-                                    
-                                    resolvePolicySets(implOp.getPolicySets(), resolver);
-                                    PolicyValidationUtils.validatePolicySets(implOp, 
-                                                                             policiedImpl.getType(),
-                                                                             policiedImpl.getApplicablePolicySets());
-                                }
-                            }
-                            
-                            for ( Service service : implementation.getServices() ) {
-                                resolveIntents(service.getRequiredIntents(), resolver);
-                                resolvePolicySets(service.getPolicySets(), resolver);
-                                
-                                for ( ConfiguredOperation svcOp : service.getConfiguredOperations() ) {
-                                    resolveIntents(svcOp.getRequiredIntents(), resolver);
-                                    resolvePolicySets(svcOp.getPolicySets(), resolver);
-                                }
-                            }
-                            
-                            for ( Reference reference : implementation.getReferences() ) {
-                                resolveIntents(reference.getRequiredIntents(), resolver);
-                                resolvePolicySets(reference.getPolicySets(), resolver);
-                            }
-                        }
-                        
-                        resolver.addModel(implementation);
-                    }
-                }
-            }
-            
-            if ( implementation instanceof IntentAttachPoint &&
-                ((IntentAttachPoint)implementation).getType() != null && 
-                ((IntentAttachPoint)implementation).getType().isUnresolved() ) {
-                ((IntentAttachPoint)implementation).setType(
-                               resolver.resolveModel(IntentAttachPointType.class, 
-                                                     ((IntentAttachPoint)implementation).getType()));
-            }
-        }
-        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) {
-            try {
-                //resolve the intents and policysets as they need to be copied over into the
-                //child binding elements
-                resolveIntents(contract.getRequiredIntents(), resolver);
-                resolvePolicySets(contract.getPolicySets(), resolver);
-                resolvePolicySets(contract.getApplicablePolicySets(), resolver);
-                
-                // Inherit the composite / component level applicable policy sets.
-                if ( parent != null && parent instanceof PolicySetAttachPoint )  {
-                    addInheritedPolicySets(((PolicySetAttachPoint)parent).getApplicablePolicySets(), contract.getApplicablePolicySets());
-                }
-                
-                for ( ConfiguredOperation confOp : contract.getConfiguredOperations() ) {
-                    resolveIntents(confOp.getRequiredIntents(), resolver);
-                    resolvePolicySets(confOp.getPolicySets(), resolver);
-                    resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                    
-                    //inherit applicable policy sets from parent contract
-                    addInheritedPolicySets(contract.getApplicablePolicySets(), confOp.getApplicablePolicySets());
-                }
-                                
-                // 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);
-                    
-                    if (binding instanceof IntentAttachPoint) {
-                        IntentAttachPoint policiedBinding = (IntentAttachPoint)binding;
-                        
-                        if ( policiedBinding.getType() != null && policiedBinding.getType().isUnresolved() ) {
-                            IntentAttachPointType resolved = 
-                                resolver.resolveModel(IntentAttachPointType.class, 
-                                                      policiedBinding.getType());
-                            policiedBinding.setType(resolved);
-                        }
-                        
-                        resolveIntents(policiedBinding.getRequiredIntents(), resolver);
-                        PolicyValidationUtils.validateIntents(policiedBinding, policiedBinding.getType());
-                    }
-                    
-                    if (binding instanceof PolicySetAttachPoint) {
-                        PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;
-                        resolvePolicySets(policiedBinding.getPolicySets(), resolver);
-                        //validate if attached policysets apply to the binding
-                        resolvePolicySets(policiedBinding.getApplicablePolicySets(), resolver);
-                        //inherit the applicable policysets from parent contract as whatever applies to that
-                        //applies to the binding as well
-                        addInheritedPolicySets(contract.getApplicablePolicySets(), policiedBinding.getApplicablePolicySets());
-                        PolicyValidationUtils.validatePolicySets(policiedBinding);
-                    }
-                    
-                    if (binding instanceof OperationsConfigurator) {
-                        OperationsConfigurator opConfigurator = (OperationsConfigurator)binding;
-                        for (ConfiguredOperation confOp : opConfigurator.getConfiguredOperations()) {
-                            resolveIntents(confOp.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(confOp, ((PolicySetAttachPoint)binding).getType());
-                            
-                            resolvePolicySets(confOp.getPolicySets(), resolver);
-                            resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                            //inherit the applicable policysets from parent binding as whatever applies to that
-                            //applies to the binding as well
-                            addInheritedPolicySets(((PolicySetAttachPoint)binding).getApplicablePolicySets(), 
-                                                   confOp.getApplicablePolicySets());
-                            PolicyValidationUtils.validatePolicySets(confOp, ((PolicySetAttachPoint)binding).getType());
-                        }
-                    }
-                }
-    
-                // Resolve callback bindings
-                if (contract.getCallback() != null) {
-                    resolveIntents(contract.getCallback().getRequiredIntents(), resolver);
-                    resolvePolicySets(contract.getCallback().getPolicySets(), resolver);
-                    resolvePolicySets(contract.getCallback().getApplicablePolicySets(), resolver);
-                    //inherit the contract's policy intents and policysets
-                    addInheritedPolicySets(contract.getApplicablePolicySets(), contract.getCallback().getApplicablePolicySets());
-                    
-                    for (int i = 0, n = contract.getCallback().getBindings().size(); i < n; i++) {
-                        Binding binding = contract.getCallback().getBindings().get(i);
-                        extensionProcessor.resolve(binding, resolver);
-    
-                        if (binding instanceof IntentAttachPoint) {
-                            IntentAttachPoint policiedBinding = (IntentAttachPoint)binding;
-                            
-                            if ( policiedBinding.getType().isUnresolved() ) {
-                                IntentAttachPointType resolved = 
-                                    resolver.resolveModel(IntentAttachPointType.class, 
-                                                          policiedBinding.getType());
-                                policiedBinding.setType(resolved);
-                            }
-                            
-                            resolveIntents(policiedBinding.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(policiedBinding, policiedBinding.getType());
-                        }
-                        
-                        if (binding instanceof PolicySetAttachPoint) {
-                            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;
-                            resolvePolicySets(policiedBinding.getPolicySets(), resolver);
-                            //validate if attached policysets apply to the binding
-                            resolvePolicySets(policiedBinding.getApplicablePolicySets(), resolver);
-                            //inherit the applicable policysets from parent contract as whatever applies to that
-                            //applies to the binding as well
-                            addInheritedPolicySets(contract.getApplicablePolicySets(), policiedBinding.getApplicablePolicySets());
-                            PolicyValidationUtils.validatePolicySets(policiedBinding);
-                        }
-                        
-                        if (binding instanceof OperationsConfigurator) {
-                            OperationsConfigurator opConfigurator = (OperationsConfigurator)binding;
-                            for (ConfiguredOperation confOp : opConfigurator.getConfiguredOperations()) {
-                                resolveIntents(confOp.getRequiredIntents(), resolver);
-                                PolicyValidationUtils.validateIntents(confOp, ((PolicySetAttachPoint)binding).getType());
-                                
-                                resolvePolicySets(confOp.getPolicySets(), resolver);
-                                resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                                //inherit the applicable policysets from parent binding as whatever applies to that
-                                //applies to the binding as well
-                                addInheritedPolicySets(((PolicySetAttachPoint)binding).getApplicablePolicySets(), 
-                                                       confOp.getApplicablePolicySets());
-                                PolicyValidationUtils.validatePolicySets(confOp, ((PolicySetAttachPoint)binding).getType());
-                            }
-                        }
-                    }
-                }
-            } catch ( PolicyValidationException e ) {
-            	error("PolicyServiceValidationException", contract, contract.getName(), parentName, e.getMessage());
-                //throw new ContributionResolveException("PolicyValidation exceptions when processing service/reference '" 
-                                                       //+ contract.getName() + "' in '" + parentName + "'");
-            }
-        }
-    }
-
-    /**
-     * 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();
-            }
-        }
-    }
-
-    /**
-     * Resolve policy intents attached to a specific SCA Artifact
-     * @param policyIntents list of policy intents
-     * @param resolver
-     */
-    protected void resolveIntents(List<Intent> policyIntents, ModelResolver resolver) {
-        List<Intent> requiredIntents = new ArrayList<Intent>();
-        Intent resolvedIntent = null;
-        for (Intent intent : policyIntents) {
-            resolvedIntent = resolver.resolveModel(Intent.class, intent);
-            requiredIntents.add(resolvedIntent);
-        }
-        policyIntents.clear();
-        policyIntents.addAll(requiredIntents);
-    }
-
-    /**
-     * Resolve policy sets attached to a specific SCA Construct
-     * @param policySets list of attached policy sets
-     * @param resolver
-     */
-    protected void resolvePolicySets(List<PolicySet> policySets, ModelResolver resolver) {
-        List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
-        PolicySet resolvedPolicySet = null;
-        for (PolicySet policySet : policySets) {
-            if (policySet.isUnresolved()) {
-                resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
-                resolvedPolicySets.add(resolvedPolicySet);
-            } else {
-                resolvedPolicySets.add(policySet);
-            }
-        }
-        policySets.clear();
-        policySets.addAll(resolvedPolicySets);
-    }
-
-    /**
-     * 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);
-        }
-    }
-    
-    
-    /*protected void validatePolicySets(PolicySetAttachPoint policySetAttachPoint) 
-                                                            throws ContributionResolveException {
-        validatePolicySets(policySetAttachPoint, policySetAttachPoint.getApplicablePolicySets());
-    }
-     
-    
-    protected void validatePolicySets(PolicySetAttachPoint 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
-        IntentAttachPointType 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/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
deleted file mode 100644
index b07c91d1b3..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.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;
-
-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.assembly.ComponentType;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-
-/**
- * A componentType processor.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentTypeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<ComponentType> {
-    private XMLInputFactory inputFactory;
-    
-    /**
-     * Constructs a new componentType processor.
-     * @param factory
-     * @param policyFactory
-     * @param registry
-     */
-    public ComponentTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, 
-    									  XMLInputFactory inputFactory, 
-    									  Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = inputFactory;
-    }
-    
-    /**
-     * Constructs a new componentType processor.
-     * @param modelFactories
-     * @param staxProcessor
-     */
-    public ComponentTypeDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    									  StAXArtifactProcessor staxProcessor,
-    									  Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-    }
-    
-    public ComponentType 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();
-            
-            // Reader the componentType model 
-            ComponentType componentType = (ComponentType)extensionProcessor.read(reader);
-            if (componentType != null) {
-                componentType.setURI(uri.toString());
-            }
-
-            // For debugging purposes, write it back to XML
-//            if (componentType != null) {
-//                try {
-//                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-//                    XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-//                    outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-//                    extensionProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-//                    Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().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);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-            
-            return componentType;
-            
-        } catch (XMLStreamException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } catch (IOException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } finally {
-            try {
-                if (urlStream != null) {
-                    urlStream.close();
-                    urlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(ComponentType componentType, ModelResolver resolver) throws ContributionResolveException {
-        extensionProcessor.resolve(componentType, resolver);
-    }
-    
-    public String getArtifactType() {
-        return ".componentType";
-    }
-    
-    public Class<ComponentType> getModelType() {
-        return ComponentType.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
deleted file mode 100644
index d0d11cd02b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.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;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-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.java.JavaImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for ComponentType models.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentTypeModelResolver implements ModelResolver {
-	private Contribution contribution;
-    private Map<String, ComponentType> map = new HashMap<String, ComponentType>();
-    
-    public ComponentTypeModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-    	this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-        ComponentType componentType = (ComponentType)resolved;
-        map.put(componentType.getURI(), componentType);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((ComponentType)resolved).getURI());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
-    	//get componentType artifact URI
-        String uri = ((ComponentType)unresolved).getURI();
-        if (uri == null) {
-        	return (T)unresolved;
-        }
-        
-        //lookup the componentType
-        ComponentType resolved = (ComponentType) 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 java imports)
-        //compute the package name from the componentType URI
-        if (unresolved instanceof ComponentType) {
-            //FIXME The core assembly model now depends on java imports to 
-            // resolve componentTypes of all kinds, this is not right at all!!!
-            int s = uri.lastIndexOf('/');
-            if (s != -1) {
-                String packageName = uri.substring(0, uri.lastIndexOf("/"));
-                for (Import import_ : this.contribution.getImports()) {
-                    if (import_ instanceof JavaImport) {
-                    	JavaImport javaImport = (JavaImport)import_;
-                    	//check the import location against the computed package name from the componentType URI
-                        if (javaImport.getPackage().equals(packageName)) {
-                            // Delegate the resolution to the import resolver
-                            resolved = javaImport.getModelResolver().resolveModel(ComponentType.class, (ComponentType)unresolved);
-                            if (!resolved.isUnresolved()) {
-                                return modelClass.cast(resolved);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return (T)unresolved;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
deleted file mode 100644
index 73a64702e4..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.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.assembly.xml;
-
-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.AssemblyFactory;
-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.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;
-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.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-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 factory
-     * @param policyFactory
-     * @param registry
-     */
-    public ComponentTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, 
-    							  StAXArtifactProcessor extensionProcessor, Monitor monitor) {
-        super(factory, policyFactory, extensionProcessor, monitor);
-    }
-
-    /**
-     * Constructs a new componentType processor.
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     */
-    public ComponentTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    							  StAXArtifactProcessor extensionProcessor,
-    							  Monitor monitor) {
-        super(modelFactories.getFactory(AssemblyFactory.class),
-              modelFactories.getFactory(PolicyFactory.class), extensionProcessor, monitor);
-    }
-    
-    public ComponentType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ComponentType componentType = null;
-        Service service = null;
-        Reference reference = null;
-        Contract contract = null;
-        Property property = null;
-        Callback callback = null;
-        QName name = null;
-        
-        // 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();
-            }
-        }
-        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()),
-                  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 IntentAttachPoint) {
-            if (!((IntentAttachPoint)componentType).getRequiredIntents().isEmpty()) {
-                writeImplementation = true;
-            }
-        }
-        if (componentType instanceof PolicySetAttachPoint) {
-            if (!((PolicySetAttachPoint)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);
-        if ( componentType instanceof PolicySetAttachPoint ) {
-            resolveIntents(((PolicySetAttachPoint)componentType).getRequiredIntents(), resolver);
-            resolvePolicySets(((PolicySetAttachPoint)componentType).getPolicySets(), resolver);
-        }
-    }
-    
-    public QName getArtifactType() {
-        return COMPONENT_TYPE_QNAME;
-    }
-    
-    public Class<ComponentType> getModelType() {
-        return ComponentType.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
deleted file mode 100644
index a2e67dc6c5..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.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.assembly.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-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.Composite;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
-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.definitions.SCADefinitions;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
-
-/**
- * A composite processor.
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<Composite> {
-    private XMLInputFactory inputFactory;
-    private List scaDefnSink;
-    private Collection<PolicySet> domainPolicySets = null;
-    private int scaDefnsCount = 0;
-
-    /**
-     * Construct a new composite processor
-     * @param assemblyFactory
-     * @param policyFactory
-     * @param staxProcessor
-     */
-    public CompositeDocumentProcessor(StAXArtifactProcessor staxProcessor, 
-    								  XMLInputFactory inputFactory, List scaDefnsSink, Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = inputFactory;
-        this.scaDefnSink = scaDefnsSink;
-    }
-
-    /**
-     * Constructs a new composite processor.
-     * @param modelFactories
-     * @param staxProcessor
-     */
-    public CompositeDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    								  StAXArtifactProcessor staxProcessor, Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-    }
-    
-    public Composite read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
-        InputStream scdlStream = null;
-        try {
-            if (scaDefnSink != null ) {
-                fillDomainPolicySets(scaDefnSink);
-            }
-            
-            Composite composite = null;
-            
-            byte[] transformedArtifactContent;
-            try {
-                if ( domainPolicySets != null ) {
-                    transformedArtifactContent =
-                        PolicyComputationUtils.addApplicablePolicySets(url, domainPolicySets);
-                    scdlStream = new ByteArrayInputStream(transformedArtifactContent);
-                } else {
-                    URLConnection connection = url.openConnection();
-                    connection.setUseCaches(false);
-                    scdlStream = connection.getInputStream();
-                }
-            } catch ( IOException e ) {
-            	ContributionReadException ce = new ContributionReadException(e);
-            	error("ContributionReadException", scdlStream, ce);
-            	throw ce;
-            } catch ( Exception e ) {
-            	ContributionReadException ce = new ContributionReadException(e);
-            	error("ContributionReadException", scdlStream, ce);
-                //throw ce;
-            }
-            
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(scdlStream);
-            
-            reader.nextTag();
-            
-            // Read the composite model
-            composite = (Composite)extensionProcessor.read(reader);
-            if (composite != null) {
-                composite.setURI(uri.toString());
-            }
-
-            // For debugging purposes, write it back to XML
-//            if (composite != null) {
-//                try {
-//                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-//                    XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-//                    outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-//                    extensionProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-//                    Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().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);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-            
-            return composite;
-            
-        } catch (XMLStreamException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } finally {
-            try {
-                if (scdlStream != null) {
-                    scdlStream.close();
-                    scdlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(Composite composite, ModelResolver resolver) throws ContributionResolveException {
-        if (composite != null)
-    	    extensionProcessor.resolve(composite, resolver);
-    }
-
-    public String getArtifactType() {
-        return ".composite";
-    }
-    
-    public Class<Composite> getModelType() {
-        return Composite.class;
-    }
-    
-    private void fillDomainPolicySets(List scaDefnsSink) {
-        Map<QName, PolicySet> domainPolicySetMap = null;
-        if ( scaDefnsSink.size() > scaDefnsCount ) {
-        //if ( !scaDefnsSink.isEmpty() ) {
-            domainPolicySetMap = new Hashtable<QName, PolicySet>();
-            
-            if ( domainPolicySets != null ) {
-                for ( PolicySet policySet : domainPolicySets ) {
-                    domainPolicySetMap.put(policySet.getName(), policySet);
-                } 
-            }
-            
-            for ( Object object : scaDefnsSink ) {
-                if ( object instanceof SCADefinitions ) {
-                    for ( PolicySet policySet : ((SCADefinitions)object).getPolicySets() ) {
-                        domainPolicySetMap.put( policySet.getName(), policySet);
-                    }
-                }
-            }
-            domainPolicySets =  domainPolicySetMap.values();
-            //scaDefnsSink.clear();
-            scaDefnsCount = scaDefnsSink.size();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
deleted file mode 100644
index 72744259f6..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.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.assembly.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-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.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for Composite models.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeModelResolver implements ModelResolver {
-
-    private Contribution contribution;
-    private Map<QName, Composite> map = new HashMap<QName, Composite>();
-    
-    public CompositeModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-        Composite composite = (Composite)resolved;
-        map.put(composite.getName(), composite);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((Composite)resolved).getName());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        
-        // Lookup a definition for the given namespace
-        QName qname = ((Composite)unresolved).getName();
-        Composite resolved = (Composite) map.get(qname);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-        
-        // No definition found, delegate the resolution to the imports
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                if (namespaceImport.getNamespace().equals(qname.getNamespaceURI())) {
-                    
-                    // Delegate the resolution to the import resolver
-                    resolved = namespaceImport.getModelResolver().resolveModel(Composite.class, (Composite)unresolved);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            }
-        }
-        return (T)unresolved;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
deleted file mode 100644
index c1a8bb5b86..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-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.AssemblyFactory;
-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.ConfiguredOperation;
-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.OperationsConfigurator;
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ResolverExtension;
-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.core.ExtensionPointRegistry;
-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.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-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.util.PolicyComputationUtils;
-import org.apache.tuscany.sca.policy.util.PolicyValidationException;
-import org.apache.tuscany.sca.policy.util.PolicyValidationUtils;
-import org.w3c.dom.Document;
-
-/**
- * A composite processor. 
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Composite> {
-    // FIXME: to be refactored
-    private XPathFactory xPathFactory = XPathFactory.newInstance();
-    
-    /**
-     * Construct a new composite processor
-     * 
-     * @param extensionPoints
-     * @param extensionProcessor
-     */
-    public CompositeProcessor(ExtensionPointRegistry extensionPoints, 
-    						  StAXArtifactProcessor extensionProcessor,
-    						  Monitor monitor) {
-        this(modelFactories(extensionPoints), extensionProcessor, monitor(extensionPoints));
-    }
-    
-    /**
-     * Constructs a new composite processor
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     * @param monitor
-     */
-    private CompositeProcessor(ModelFactoryExtensionPoint modelFactories,
-                               StAXArtifactProcessor extensionProcessor,
-                               Monitor monitor) {
-        super(modelFactories.getFactory(ContributionFactory.class),
-            modelFactories.getFactory(AssemblyFactory.class),
-            modelFactories.getFactory(PolicyFactory.class),
-            extensionProcessor, monitor);
-    }
-    
-    /**
-     * Construct a new composite processor
-     * 
-     * @param contributionFactory
-     * @param assemblyFactory
-     * @param policyFactory
-     * @param extensionProcessor
-     */
-    public CompositeProcessor(ContributionFactory contributionFactory,
-                              AssemblyFactory assemblyFactory,
-                              PolicyFactory policyFactory,
-                              StAXArtifactProcessor extensionProcessor,
-                              Monitor monitor) {
-        super(contributionFactory, assemblyFactory, policyFactory, extensionProcessor, monitor);
-    }    
-
-    public Composite read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        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;
-
-        // 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.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));
-                        }
-                        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));
-                            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);
-                            }
-
-                            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));
-                            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();) {
-                                    ComponentReference promotedReference =
-                                        assemblyFactory.createComponentReference();
-                                    promotedReference.setUnresolved(true);
-                                    promotedReference.setName(tokens.nextToken());
-                                    compositeReference.getPromotedReferences().add(promotedReference);
-                                }
-                            }
-                            compositeReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
-                            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));
-                            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));
-                        }
-                        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);
-
-                        composite.getWires().add(wire);
-                        policyProcessor.readPolicies(wire, reader);
-
-                    } else if (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>
-                        ConfiguredOperation operation = assemblyFactory.createConfiguredOperation();
-                        operation.setName(getString(reader, NAME));
-                        operation.setUnresolved(true);
-                        if (callback != null) {
-                            policyProcessor.readPolicies(operation, reader);
-                        } else {
-                            policyProcessor.readPolicies(operation, reader);
-                        }
-                        
-                        OperationsConfigurator opConfigurator = null;
-                        if ( compositeService != null ) {
-                            opConfigurator = compositeService;
-                        } else if ( componentService != null ) {
-                            opConfigurator = componentService;
-                        } else if ( compositeReference != null ) {
-                            opConfigurator = compositeReference;
-                        } else if ( componentReference != null ) {
-                            opConfigurator = componentReference;
-                        }
-                        
-                        opConfigurator.getConfiguredOperations().add(operation);
-                    } else if (IMPLEMENTATION_COMPOSITE_QNAME.equals(name)) {
-
-                        // Read an implementation.composite
-                        Composite implementation = assemblyFactory.createComposite();
-                        implementation.setName(getQName(reader, NAME));
-                        implementation.setUnresolved(true);
-                        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 PolicySetAttachPoint ) {
-                                    IntentAttachPointType bindingType = intentAttachPointTypeFactory.createBindingType();
-                                    bindingType.setName(name);
-                                    bindingType.setUnresolved(true);
-                                    ((PolicySetAttachPoint)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 PolicySetAttachPoint ) {
-                                    IntentAttachPointType implType = intentAttachPointTypeFactory.createImplementationType();
-                                    implType.setName(name);
-                                    implType.setUnresolved(true);
-                                    ((PolicySetAttachPoint)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();
-            }
-        }
-        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(AUTOWIRE, composite.getAutowire()),
-                           policyProcessor.writePolicies(composite));
-
-        // 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));
-            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 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 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 the component implementation
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                writeStart(writer, IMPLEMENTATION_COMPOSITE, new XAttr(NAME, ((Composite)implementation).getName()));
-                writeEnd(writer);
-            } else {
-                extensionProcessor.write(component.getImplementation(), writer);
-            }
-            
-            // Write <service> elements
-            for (ComponentService service : component.getServices()) {
-                writeStart(writer, SERVICE, new XAttr(NAME, service.getName()),
-                           policyProcessor.writePolicies(service));
-
-                // 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 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()),
-                           writeTargets(reference),
-                           policyProcessor.writePolicies(reference));
-
-                // 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 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 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),
-                       policyProcessor.writePolicies(reference));
-
-            // 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 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 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 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 intents and policy sets
-        List<Intent> compositeIntents = null;
-        List<PolicySet> compositePolicySets = null;
-        List<PolicySet> compositeApplicablePolicySets = null;
-        resolveIntents(composite.getRequiredIntents(), resolver);
-        resolvePolicySets(composite.getPolicySets(), resolver);
-        resolvePolicySets(composite.getApplicablePolicySets(), resolver);
-        compositeIntents = composite.getRequiredIntents();
-        compositePolicySets = composite.getPolicySets();
-        compositeApplicablePolicySets = composite.getApplicablePolicySets();
-
-        //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 intents and policy sets
-            resolveIntents(component.getRequiredIntents(), resolver);
-            resolvePolicySets(component.getPolicySets(), resolver);
-            resolvePolicySets(component.getApplicablePolicySets(), resolver);
-            
-            //inherit composite intents and policysets
-            PolicyComputationUtils.addDefaultPolicies(compositeIntents,
-                                                      compositePolicySets,
-                                                      component.getRequiredIntents(),
-                                                      component.getPolicySets());
-
-            addInheritedPolicySets(compositeApplicablePolicySets, component.getApplicablePolicySets());
-
-            //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) {
-                try {
-                    //resolve intents and policysets specified on this implementation
-                    //before copying them over to the component.  Before that, from the component
-                    //copy over the applicablePolicySets alone as it might have to be
-                    //used to validate the policysets specified on the implementation
-                    
-                    resolveImplIntentsAndPolicySets(implementation, 
-                                                    component.getApplicablePolicySets(), 
-                                                    resolver);
-
-                    copyPoliciesToComponent(component, implementation, resolver, true);
-                    
-                    //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);
-                    
-                    //resolved implementation may contain intents and policysets specified at 
-                    //componentType (either in the componentType side file or in annotations if its a 
-                    //java implementation).  This has to be consolidated in to the component.
-                    copyPoliciesToComponent(component, implementation, resolver, false);
-                    
-                    component.setImplementation(implementation);
-                } catch ( PolicyValidationException e ) {
-                	error("PolicyImplValidationException", resolver, component.getName(), e.getMessage());
-                    //throw new ContributionResolveException("PolicyValidation exception when processing implementation of component '" 
-                                                           //+ component.getName() + "' due to " + e.getMessage(), e);
-                }
-            
-            }
-
-            //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);
-            }
-        }
-    }
-    
-    private void resolveImplIntentsAndPolicySets(Implementation implementation,
-                                                 List<PolicySet> inheritedApplicablePolicySets,
-                                                 ModelResolver resolver) throws ContributionResolveException,
-                                                                                 PolicyValidationException
-                                                        {
-        if ( implementation instanceof PolicySetAttachPoint ) {
-            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-            
-            policiedImpl.getApplicablePolicySets().addAll(inheritedApplicablePolicySets);
-            
-            resolveIntents(policiedImpl.getRequiredIntents(), resolver);
-            PolicyValidationUtils.validateIntents(policiedImpl, policiedImpl.getType());
-            
-            resolvePolicySets(policiedImpl.getPolicySets(), resolver);
-            resolvePolicySets(policiedImpl.getApplicablePolicySets(), resolver);
-            
-            PolicyValidationUtils.validatePolicySets(policiedImpl);
-            
-            if ( implementation instanceof OperationsConfigurator ) {
-                for ( ConfiguredOperation implConfOp : ((OperationsConfigurator)implementation).getConfiguredOperations() ) {
-                    resolveIntents(implConfOp.getRequiredIntents(), resolver);
-                    PolicyValidationUtils.validateIntents(implConfOp, policiedImpl.getType());
-                    
-                    resolvePolicySets(implConfOp.getPolicySets(), resolver);
-                    resolvePolicySets(implConfOp.getApplicablePolicySets(), resolver);
-                    //add the inherited applicablePolicysets
-                    addInheritedPolicySets(policiedImpl.getApplicablePolicySets(), implConfOp.getApplicablePolicySets());
-                    
-                    PolicyValidationUtils.validatePolicySets(implConfOp, policiedImpl.getType());
-                    
-                    PolicyComputationUtils.addDefaultPolicies(
-                                            ((PolicySetAttachPoint)implementation).getRequiredIntents(),
-                                            ((PolicySetAttachPoint)implementation).getPolicySets(),
-                                            implConfOp.getRequiredIntents(),
-                                            implConfOp.getPolicySets());
-                }
-            }
-        }
-    }
-    
-    private void copyPoliciesToComponent(Component component, 
-                                         Implementation implementation, 
-                                         ModelResolver resolver,
-                                         boolean clearImplSettings) throws ContributionResolveException {
-        if (implementation instanceof PolicySetAttachPoint) {
-            // Add implementation policies into component, since implementation instances are 
-            // reused and it's likely that this implementation instance will not hold after its resolution.
-            // On the first call to this method (clearImplSettings=true), we are moving policies from the
-            // implementation XML element up to the component.  In this case if there are mutually exclusive
-            // policies we must clear the component policy so that the implementation policy "wins".
-            // On the second call to this method (clearImplSettings=false), we are moving policies from the
-            // componentType implementation up to the component.  In this case if there are mutually
-            // exclusive policies it is an error.  This error will be detected later in the PolicyComputer.
-            if (clearImplSettings) {
-                for (Intent intent : ((PolicySetAttachPoint)implementation).getRequiredIntents()) {
-                    for (Intent excluded : intent.getExcludedIntents()) {
-                        if (component.getRequiredIntents().contains(excluded)) {
-                            component.getRequiredIntents().remove(excluded);
-                        }
-                        for (Iterator i = component.getPolicySets().iterator(); i.hasNext(); ) {
-                            PolicySet cmpPolicySet = (PolicySet) i.next();
-                            if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                i.remove();
-                            }
-                        }
-                    }
-                }
-                for (PolicySet policySet : ((PolicySetAttachPoint)implementation).getPolicySets()) {
-                    for (Intent intent : policySet.getProvidedIntents()) {
-                        for (Intent excluded : intent.getExcludedIntents()) {
-                            if (component.getRequiredIntents().contains(excluded)) {
-                                component.getRequiredIntents().remove(excluded);
-                            }
-                            for (Iterator i = component.getPolicySets().iterator(); i.hasNext(); ) {
-                                PolicySet cmpPolicySet = (PolicySet) i.next();
-                                if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                    i.remove();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            component.getRequiredIntents().addAll(((PolicySetAttachPoint)implementation).getRequiredIntents());
-            component.getPolicySets().addAll(((PolicySetAttachPoint)implementation).getPolicySets());
-            component.getApplicablePolicySets().addAll(((PolicySetAttachPoint)implementation).getApplicablePolicySets());
-            
-            if ( implementation instanceof OperationsConfigurator ) {
-                boolean notFound;
-                List<ConfiguredOperation> opsFromImplementation = new ArrayList<ConfiguredOperation>();
-                List<ConfiguredOperation> implConfOperations = 
-                    new ArrayList<ConfiguredOperation>(((OperationsConfigurator)implementation).getConfiguredOperations());
-                for ( ConfiguredOperation implConfOp : implConfOperations ) {
-                    notFound = true;
-                    for ( ConfiguredOperation compConfOp : ((OperationsConfigurator)component).getConfiguredOperations() ) {
-                        if ( implConfOp.getName().equals(compConfOp.getName()) ) {
-                            notFound = false;
-
-                            if (clearImplSettings) {
-                                for (Intent intent : implConfOp.getRequiredIntents()) {
-                                    for (Intent excluded : intent.getExcludedIntents()) {
-                                        if (compConfOp.getRequiredIntents().contains(excluded)) {
-                                            compConfOp.getRequiredIntents().remove(excluded);
-                                        }
-                                    }
-                                }
-                                for (PolicySet policySet : implConfOp.getPolicySets()) {
-                                    for (Intent intent : policySet.getProvidedIntents()) {
-                                        for (Intent excluded : intent.getExcludedIntents()) {
-                                            if (compConfOp.getRequiredIntents().contains(excluded)) {
-                                                compConfOp.getRequiredIntents().remove(excluded);
-                                            }
-                                            for (Iterator i = compConfOp.getPolicySets().iterator(); i.hasNext(); ) {
-                                                PolicySet cmpPolicySet = (PolicySet) i.next();
-                                                if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                                    i.remove();
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            addInheritedIntents(implConfOp.getRequiredIntents(), compConfOp.getRequiredIntents());
-                            addInheritedPolicySets(implConfOp.getPolicySets(), compConfOp.getPolicySets());
-                            addInheritedPolicySets(implConfOp.getApplicablePolicySets(), compConfOp.getApplicablePolicySets());
-                        }
-                    }
-                    
-                    if ( notFound ) {
-                        opsFromImplementation.add(implConfOp);
-                    }
-                    
-                    if ( clearImplSettings ) {
-                        ((OperationsConfigurator)implementation).getConfiguredOperations().remove(implConfOp);
-                    }
-                }
-                ((OperationsConfigurator)component).getConfiguredOperations().addAll(opsFromImplementation);
-            }
-            
-            if ( clearImplSettings ) {
-                ((PolicySetAttachPoint)implementation).getRequiredIntents().clear();
-                ((PolicySetAttachPoint)implementation).getPolicySets().clear();
-            }
-        }
-    }
-    
-    
-    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 ModelFactoryExtensionPoint modelFactories(ExtensionPointRegistry extensionPoints) {
-        return extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
deleted file mode 100644
index aa4980fcb6..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.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.assembly.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.ConfiguredOperation;
-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;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * Processor for dealing with  'operation' elements from composite definitions
- *
- * @version $Rev$ $Date$
- */
-public class ConfiguredOperationProcessor implements StAXArtifactProcessor<ConfiguredOperation>, Constants{
-    
-    private AssemblyFactory assemblyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private PolicyFactory policyFactory;
-    private Monitor monitor;
-    
-    public ConfiguredOperationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.monitor = monitor;
-    }
-    
-    public ConfiguredOperation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ConfiguredOperation  configuredOp = assemblyFactory.createConfiguredOperation();
-        
-        //Read an <operation>
-        configuredOp.setName(reader.getAttributeValue(null, NAME));
-        configuredOp.setContractName(reader.getAttributeValue(null, SERVICE));
-        configuredOp.setUnresolved(true);
-        
-        // Read policies
-        policyProcessor.readPolicies(configuredOp, reader);
-
-        //Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && OPERATION_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        return configuredOp;
-    }
-    
-    public void write(ConfiguredOperation configuredOperation, XMLStreamWriter writer)
-        throws ContributionWriteException, XMLStreamException {
-
-        // Write an <operation>
-        policyProcessor.writePolicyPrefixes(configuredOperation, writer);
-        writer.writeStartElement(Constants.SCA10_NS, OPERATION);
-        policyProcessor.writePolicyAttributes(configuredOperation, writer);
-
-        writer.writeAttribute(NAME, configuredOperation.getName());
-        if ( configuredOperation.getContractName() != null ) {
-            writer.writeAttribute(SERVICE, configuredOperation.getContractName());
-        }
-        writer.writeEndElement();
-    }
-    
-    public void resolve(ConfiguredOperation configuredOperation, ModelResolver resolver)
-        throws ContributionResolveException {
-    }
-    
-    public QName getArtifactType() {
-        return OPERATION_QNAME;
-    }
-    
-    public Class<ConfiguredOperation> getModelType() {
-        return ConfiguredOperation.class;
-    }
-
-}
-
-
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
deleted file mode 100644
index 3bf5a1173b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.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.assembly.xml;
-
-import javax.xml.namespace.QName;
-
-/**
- * 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/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
deleted file mode 100644
index 4c5d6f8f49..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-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.assembly.ConstrainingType;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
-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.monitor.Monitor;
-
-/**
- * A contrainingType content handler.
- * 
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<ConstrainingType> {
-    private XMLInputFactory inputFactory;
-
-    /**
-     * Construct a new constrainingType processor.
-     * @param factory
-     * @param policyFactory
-     * @param staxProcessor
-     */
-    public ConstrainingTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, 
-    									     XMLInputFactory inputFactory,
-    									     Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = inputFactory;
-    }
-
-    /**
-     * Constructs a new constrainingType processor.
-     * @param modelFactories
-     * @param staxProcessor
-     */
-    public ConstrainingTypeDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    										 StAXArtifactProcessor staxProcessor,
-    										 Monitor monitor) {
-        super(null, null, staxProcessor, monitor);
-        this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-    }
-    
-    public ConstrainingType 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 constrainingType model 
-            ConstrainingType constrainingType = (ConstrainingType)extensionProcessor.read(reader);
-
-            // For debugging purposes, write it back to XML
-//            if (constrainingType != null) {
-//                try {
-//                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-//                    XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-//                    outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-//                    extensionProcessor.write(constrainingType, outputFactory.createXMLStreamWriter(bos));
-//                    Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().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);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-            
-            return constrainingType;
-            
-        } catch (XMLStreamException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } catch (IOException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } finally {
-            try {
-                if (urlStream != null) {
-                    urlStream.close();
-                    urlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(ConstrainingType constrainingType, ModelResolver resolver) throws ContributionResolveException {
-        extensionProcessor.resolve(constrainingType, resolver);
-    }
-    
-    public String getArtifactType() {
-        return ".constrainingType";
-    }
-    
-    public Class<ConstrainingType> getModelType() {
-        return ConstrainingType.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
deleted file mode 100644
index 7dd95e3944..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.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.assembly.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for ConstrainingType models.
- *
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeModelResolver implements ModelResolver {
-
-    private Contribution contribution;
-    private Map<QName, ConstrainingType> map = new HashMap<QName, ConstrainingType>();
-    
-    public ConstrainingTypeModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-        ConstrainingType composite = (ConstrainingType)resolved;
-        map.put(composite.getName(), composite);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((ConstrainingType)resolved).getName());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        
-        // Lookup a definition for the given namespace
-        QName qname = ((ConstrainingType)unresolved).getName();
-        ConstrainingType resolved = (ConstrainingType) map.get(qname);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-        
-        // No definition found, delegate the resolution to the imports
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                if (namespaceImport.getNamespace().equals(qname.getNamespaceURI())) {
-                    
-                    // Delegate the resolution to the import resolver
-                    resolved = namespaceImport.getModelResolver().resolveModel(ConstrainingType.class, (ConstrainingType)unresolved);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            }
-        }
-        return (T)unresolved;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
deleted file mode 100644
index 334b6c6b97..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-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.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.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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;
-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.policy.PolicyFactory;
-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> {
-
-    /**
-     * Construct a new constrainingType processor.
-     * @param factory
-     * @param policyFactory
-     * @param extensionProcessor
-     */
-    public ConstrainingTypeProcessor(AssemblyFactory factory, PolicyFactory policyFactory, 
-    								 StAXArtifactProcessor extensionProcessor, Monitor monitor) {
-        super(factory, policyFactory, extensionProcessor, monitor);
-    }
-
-    /**
-     * Constructs a new constrainingType processor.
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     */
-    public ConstrainingTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    								 StAXArtifactProcessor extensionProcessor,
-    								 Monitor monitor) {
-        super(modelFactories.getFactory(AssemblyFactory.class),
-              modelFactories.getFactory(PolicyFactory.class), extensionProcessor, monitor);
-    }
-    
-    public ConstrainingType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ConstrainingType constrainingType = null;
-        AbstractService abstractService = null;
-        AbstractReference abstractReference = null;
-        AbstractProperty abstractProperty = null;
-        AbstractContract abstractContract = null;
-        QName name = null;
-        
-        // 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();
-            }
-        }
-        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()),
-                       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);
-        
-        resolveIntents(constrainingType.getRequiredIntents(), resolver);
-        for ( AbstractService service  : constrainingType.getServices() ) {
-            resolveIntents(service.getRequiredIntents(), resolver);
-        }
-        
-        for ( AbstractReference reference : constrainingType.getReferences() ) {
-            resolveIntents(reference.getRequiredIntents(), resolver);
-        }
-    }
-    
-    public QName getArtifactType() {
-        return CONSTRAINING_TYPE_QNAME;
-    }
-    
-    public Class<ConstrainingType> getModelType() {
-        return ConstrainingType.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
deleted file mode 100644
index a63ccdf151..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.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.assembly.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-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.Base;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.monitor.Monitor;
-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.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Default Model Processor for beans.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultBeanModelProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor {
-
-    private QName artifactType;
-    private Class<Implementation> modelClass;
-    private Object modelFactory;
-    private Method factoryMethod;
-    private Map<String, Method> setterMethods = new HashMap<String, Method>();
-    private Map<String, Method> getterMethods = new HashMap<String, Method>();
-
-    public DefaultBeanModelProcessor(AssemblyFactory assemblyFactory,
-                                       PolicyFactory policyFactory,
-                                       QName artifactType,
-                                       Class<Implementation> modelClass,
-                                       Object modelFactory,
-                                       Monitor monitor) {
-        super(assemblyFactory, policyFactory, null, monitor);
-        this.artifactType = artifactType;
-        this.modelClass = modelClass;
-        this.modelFactory = modelFactory;
-        
-        // Introspect the factory class and bean model class
-        if (modelFactory != null) {
-            
-            // Find the model create method
-            for (Method method: modelFactory.getClass().getMethods()) {
-                if (method.getName().startsWith("create") && method.getReturnType() == modelClass) {
-                    factoryMethod = method;
-                    break;
-                }
-            }
-        }
-        
-        // Index the bean's setter methods
-        for (Method method: modelClass.getMethods()) {
-            Method getter;
-            String name = method.getName();
-            if (name.startsWith("set") && name.length() > 3) {
-                
-                // Get the corresponding getter method
-                try {
-                    getter = modelClass.getMethod("get" + name.substring(3));
-                } catch (Exception e) {
-                    getter = null;
-                    continue;
-                }
-                
-                // Get the property name
-                name = name.substring(3);
-                if (name.length() > 1) {
-                    if (!name.toUpperCase().equals(name)) {
-                        name = name.substring(0, 1).toLowerCase() + name.substring(1);
-                    }
-                }
-            } else {
-                continue;
-            }
-            
-            // Map an uppercase property name to a lowercase attribute name 
-            if (name.toUpperCase().equals(name)) {
-                name = name.toLowerCase();
-            }
-            
-            // Trim trailing _ from property names
-            if (name.endsWith("_")) {
-                name = name.substring(0, name.length()-1);
-            }
-            setterMethods.put(name, method);
-            getterMethods.put(name, getter);
-        }
-    }
-
-    public Object read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Read an element
-        try {
-            
-            // Create a new instance of the model
-            Object model;
-            if (modelFactory != null) {
-                // Invoke the factory create method
-                model = factoryMethod.invoke(modelFactory);
-            } else {
-                // Invoke the model bean class default constructor
-                model = modelClass.newInstance();
-            }
-
-            // Initialize the bean properties with the attributes found in the
-            // XML element
-            for (int i = 0, n = reader.getAttributeCount(); i < n; i++) {
-                String attributeName = reader.getAttributeLocalName(i);
-                Method setter = setterMethods.get(attributeName);
-                if (setter != null) {
-                    String value = reader.getAttributeValue(i);
-                    setter.invoke(model, value);
-                }
-            }
-
-            // Read policies
-            policyProcessor.readPolicies(model, reader);
-
-            // FIXME read extension elements
-            
-            // By default mark the model object unresolved
-            if (model instanceof Base) {
-                ((Base)model).setUnresolved(true);
-            }
-            
-            // Skip to end element
-            while (reader.hasNext()) {
-                if (reader.next() == END_ELEMENT && artifactType.equals(reader.getName())) {
-                    break;
-                }
-            }
-            return model;
-
-        } catch (Exception e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", reader, ce);
-            throw ce;
-        }
-    }
-
-    public void write(Object bean, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        try {
-            // Write the bean properties as attributes
-            List<XAttr> attrs = new ArrayList<XAttr>();
-            for (Map.Entry<String, Method> entry: getterMethods.entrySet()) {
-                if (entry.getValue().getReturnType() == String.class) {
-                    String value = (String)entry.getValue().invoke(bean);
-                    attrs.add(new XAttr(entry.getKey(), value));
-                }
-            }
-            
-            // Write element
-            writeStart(writer, artifactType.getNamespaceURI(), artifactType.getLocalPart(),
-                       policyProcessor.writePolicies(bean), new XAttr(null, attrs));
-
-            writeEnd(writer);
-
-        } catch (Exception e) {
-        	ContributionWriteException ce = new ContributionWriteException(e);
-        	error("ContributionWriteException", writer, ce);
-            throw ce;
-        }
-    }
-
-    public void resolve(Object bean, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve and merge the component type associated with an
-        // implementation model
-        if (bean instanceof Implementation) {
-            Implementation implementation = (Implementation)bean;
-            String uri = implementation.getURI();
-            if (uri != null) {
-                int d = uri.lastIndexOf('.');
-                if (d != -1) {
-                    uri = uri.substring(0, d) + ".componentType";
-                    
-                    // Resolve the component type
-                    ComponentType componentType = assemblyFactory.createComponentType();
-                    componentType.setURI(uri);
-                    componentType.setUnresolved(true);
-                    
-                    componentType = resolver.resolveModel(ComponentType.class, componentType);
-                    if (componentType != null && !componentType.isUnresolved()) {
-                        
-                        // We found a component type, merge it into the implementation model
-                        implementation.getServices().addAll(componentType.getServices());
-                        implementation.getReferences().addAll(componentType.getReferences());
-                        implementation.getProperties().addAll(componentType.getProperties());
-                        implementation.setConstrainingType(componentType.getConstrainingType());
-                        
-                        if (implementation instanceof PolicySetAttachPoint &&
-                                componentType instanceof PolicySetAttachPoint ) {
-                            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-                            PolicySetAttachPoint policiedCompType = (PolicySetAttachPoint)componentType;
-                            
-                            if ( policiedImpl.getPolicySets() != null) {
-                                policiedImpl.getPolicySets().addAll(policiedCompType.getPolicySets());
-                            }
-                            if (policiedImpl.getRequiredIntents() != null) {
-                                policiedImpl.getRequiredIntents().addAll(policiedCompType.getRequiredIntents());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        // Mark the model resolved
-        if (bean instanceof Base) {
-            ((Base)bean).setUnresolved(false);
-        }
-    }
-
-    public QName getArtifactType() {
-        return artifactType;
-    }
-
-    public Class<?> getModelType() {
-        return modelClass;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
deleted file mode 100644
index fc4e10654d..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.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.assembly.xml;
-
-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.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.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * A Policy Attach Point processor.
- *
- * @version $Rev$ $Date$
- */
-public class PolicyAttachPointProcessor extends BaseStAXArtifactProcessor implements Constants {
-    
-    private PolicyFactory policyFactory;
-    
-    public PolicyAttachPointProcessor(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 IntentAttachPoint))
-            return;
-        IntentAttachPoint intentAttachPoint = (IntentAttachPoint)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 PolicySetAttachPoint)) {
-            return;
-        }
-        PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)attachPoint;
-        String value = reader.getAttributeValue(null, POLICY_SETS);
-        if (value != null) {
-            List<PolicySet> policySets = policySetAttachPoint.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);
-            }
-        }
-        
-        value = reader.getAttributeValue(SCA10_TUSCANY_NS, APPLICABLE_POLICY_SETS);
-        if (value != null) {
-            List<PolicySet> applicablePolicySets = policySetAttachPoint.getApplicablePolicySets();
-            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);
-                }
-                applicablePolicySets.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 IntentAttachPoint)) {
-            return null;
-        }
-        IntentAttachPoint intentAttachPoint = (IntentAttachPoint)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 PolicySetAttachPoint)) {
-            return null;
-        }
-        PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)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 PolicySetAttachPoint ) {
-            PolicySetAttachPoint policySetAttachPoint = (PolicySetAttachPoint)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/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 7a190dea9c..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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.ComponentTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
-org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#composite,model=org.apache.tuscany.sca.assembly.Composite
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 403c049b48..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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.ComponentTypeDocumentProcessor;type=.componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;type=.constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
-org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;type=.composite,model=org.apache.tuscany.sca.assembly.Composite
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index ecc34942f1..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite

-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType

-org.apache.tuscany.sca.assembly.xml.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType

diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/tags/java/sca/1.3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
deleted file mode 100644
index 95edf89e30..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/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}
-
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
deleted file mode 100644
index 5f8f976b84..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.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;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-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.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.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading SCA XML assembly documents.
- * 
- * @version $Rev: 561254 $ $Date: 2007-07-31 13:16:27 +0530 (Tue, 31 Jul 2007) $
- */
-public class BuildPolicyTestCase extends TestCase { 
-    private URLArtifactProcessor<Object> documentProcessor;
-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
-    private ModelResolver resolver; 
-    private CompositeBuilder compositeBuilder;
-    private Composite composite;
-    private Monitor monitor;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        List<SCADefinitions> policyDefinitions = new ArrayList<SCADefinitions>();
-        resolver = new DefaultModelResolver();
-        
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();
-        monitor = monitorFactory.createMonitor();
-        
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, monitor);
-        URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
-        
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
-        
-        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("TestAllPolicyCalculator.composite");
-        uri = URI.create("TestAllCalculator.constrainingType");
-        composite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-        
-        url = getClass().getResource("another_test_definitions.xml");
-        uri = URI.create("another_test_definitions.xml");
-        SCADefinitions definitions = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(definitions);
-        policyDefinitions.add(definitions);
-        
-        documentProcessor.resolve(definitions, resolver);
-        documentProcessor.resolve(composite, resolver);
-        
-        compositeBuilder.build(composite);
-    }
-
-    public void testPolicyIntentInheritance() throws Exception {
-        String namespaceUri = "http://test";
-        
-        IntentAttachPoint policiedComposite = (IntentAttachPoint)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).getConfiguredOperations().get(0).getRequiredIntents().size(), 5);
-        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(((IntentAttachPoint)composite.getServices().get(0).getBindings().get(0)).getRequiredIntents().size(), 3);
-        assertEquals(((OperationsConfigurator)composite.getServices().get(0).getBindings().get(0)).getConfiguredOperations().size(), 1);
-        assertEquals(((OperationsConfigurator)composite.getServices().get(0).getBindings().get(0)).getConfiguredOperations().get(0).getRequiredIntents().size(), 5);
-        
-        assertEquals(composite.getReferences().get(0).getRequiredIntents().size(), 5);
-        assertEquals(composite.getReferences().get(0).getConfiguredOperations().size(), 1);
-        assertEquals(composite.getReferences().get(0).getConfiguredOperations().get(0).getRequiredIntents().size(), 4);
-        assertEquals(composite.getReferences().get(0).getRequiredIntents().get(1).getName(), new QName(namespaceUri, "tuscanyIntent_1"));
-        assertEquals(((IntentAttachPoint)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).getServices().get(0).getConfiguredOperations().get(0).getRequiredIntents().size(), 5);
-        assertEquals(composite.getComponents().get(0).getReferences().get(0).getRequiredIntents().size(), 5);
-        assertEquals(composite.getComponents().get(0).getReferences().get(0).getConfiguredOperations().get(0).getRequiredIntents().size(), 5);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
deleted file mode 100644
index e2aeb85d32..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.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.assembly.xml;
-
-import java.io.InputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-
-import junit.framework.TestCase;
-
-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.PolicySetAttachPoint;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadAllTestCase extends TestCase {
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private XMLInputFactory inputFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        inputFactory = XMLInputFactory.newInstance();
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    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(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getName(), new QName("http://test",
-                                                                                "confidentiality"));
-        assertEquals(((PolicySetAttachPoint)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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
deleted file mode 100644
index ae187d0805..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-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 junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-/**
- * Test reading SCA XML assembly documents.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadDocumentTestCase extends TestCase {
-
-    private URLArtifactProcessor<Object> documentProcessor;
-    private ModelResolver resolver;
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor; 
-
-    @Override
-    public 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();
-    }
-
-    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-sca.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()));
-    }
-
-    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-sca.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()));
-    }
-        
-    public void testReadImplementation() throws Exception { 
-        
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-        schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
-        CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, null, null);
-        
-        URL url = getClass().getResource("JavaScriptReference.composite");
-        URI uri = URI.create("JavaScriptReference.composite");
-        Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-    }
-        
-    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-sca.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()));
-    }
-        
-    public void testReadBinding() throws Exception {
-        
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-        schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, null);
-        CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, null, null);
-        
-        URL url = getClass().getResource("RMIBindingTest.composite");
-        URI uri = URI.create("RMIBindingTest.composite");
-        Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-    }
-        
-    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.constrainingType");
-        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);
-    }
-
-    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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
deleted file mode 100644
index 1aede413a5..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.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.assembly.xml;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-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;
-
-/**
- * Test reading SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-
-    @Override
-    public 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);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-    }
-
-    public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        assertNotNull(staxProcessor.read(reader));
-        is.close();
-
-    }
-
-    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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
deleted file mode 100644
index 32a2d94220..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.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.assembly.xml; 
-
-import java.net.URI;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-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.SCADefinitions;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Test reading SCA XML assembly documents.
- * 
- * @version $Rev: 561254 $ $Date: 2007-07-31 13:16:27 +0530 (Tue, 31 Jul 2007) $
- */
-public class ResolvePolicyTestCase extends TestCase {
-
-    private URLArtifactProcessor<Object> documentProcessor;
-    private ModelResolver resolver;  
-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
-
-    @Override
-    public 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(SCADefinitions.class);
-        
-        // Create StAX processors
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
-    }
-
-    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.constrainingType");
-        Composite composite = (Composite)documentProcessor.read(null, uri, url);
-        assertNotNull(composite);
-        
-        url = getClass().getResource("test_definitions.xml");
-        uri = URI.create("test_definitions.xml");
-        SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        
-        preResolvePolicyTests(composite);
-        documentProcessor.resolve(scaDefns, resolver);
-        documentProcessor.resolve(composite, resolver);
-        postResolvePolicyTests(composite);
-        
-        assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-    
-    private void preResolvePolicyTests(Composite composite) {
-        assertNull(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getDescription());
-        assertTrue(((PolicySetAttachPoint)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(((PolicySetAttachPoint)composite).getRequiredIntents().get(0).getDescription());
-        assertFalse(((PolicySetAttachPoint)composite).getPolicySets().get(0).getProvidedIntents().isEmpty());
-        assertNotNull(((PolicySetAttachPoint)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());
-        
-        
-    }
-
-    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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
deleted file mode 100644
index df09a56c38..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.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.assembly.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.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;
-
-/**
- * Test resolving SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class ResolveTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessorExtensionPoint staxProcessors;
-    private ModelResolver resolver; 
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        resolver = new DefaultModelResolver();
-    }
-
-    public void testResolveConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        StAXArtifactProcessor<ConstrainingType> constrainingTypeReader = staxProcessors.getProcessor(ConstrainingType.class);
-        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(Composite.class);
-        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);
-    }
-
-    public void testResolveComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        StAXArtifactProcessor<Composite> compositeReader = staxProcessors.getProcessor(Composite.class);
-        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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
deleted file mode 100644
index 16cefc58cf..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.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.assembly.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.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.Policy;

-

-/**

- * A Policy Processor used for testing.

- *

- * @version $Rev$ $Date$

- */

-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {

-

-    public QName getArtifactType() {

-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

-    }

-

-    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() {

-        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", "PolicyAttachment");

-        }

-

-        public boolean isUnresolved() {

-            return false;

-        }

-

-        public void setUnresolved(boolean unresolved) {

-        }

-        

-    }

-}

diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
deleted file mode 100644
index c423df6f7d..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.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.assembly.xml;
-
-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();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
deleted file mode 100644
index af25109de1..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.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.assembly.xml;
-
-import java.util.ArrayList;
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-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;
-
-/**
- * A test cheel for the SCA binding.
- * 
- * @version $Rev$ $Date$
- */
-public class TestSCABindingImpl implements SCABinding, OptimizableBinding, PolicySetAttachPoint, OperationsConfigurator {
-    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 IntentAttachPointType bindingType = new TestSCABindingType();
-    private List<ConfiguredOperation>  configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    /**
-     * 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 IntentAttachPointType getType() {
-        // TODO Auto-generated method stub
-        return bindingType;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.bindingType = type;
-    }
-    
-    private class TestSCABindingType implements IntentAttachPointType {
-        private QName name = new QName("http://www.osoa.org/xmlns/sca/1.0","binding");
-
-        public List<Intent> getAlwaysProvidedIntents() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public List<Intent> getMayProvideIntents() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        public QName getName() {
-            return name;
-        }
-
-        public boolean isUnresolved() {
-            // TODO Auto-generated method stub
-            return false;
-        }
-
-        public void setName(QName type) {
-            // TODO Auto-generated method stub
-            
-        }
-
-        public void setUnresolved(boolean unresolved) {
-            // TODO Auto-generated method stub
-            
-        }
-        
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public void setConfiguredOperations(List<ConfiguredOperation> configuredOperations) {
-        this.configuredOperations = configuredOperations;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
deleted file mode 100644
index 76361d4b70..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.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.assembly.xml;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-
-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.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.impl.CompositeBuilderImpl;
-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.DefaultModelResolver;
-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.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test the wiring of SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WireTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private ModelResolver resolver; 
-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
-    private CompositeBuilder compositeBuilder;
-    private Monitor monitor;
-
-    @Override
-    public 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 DefaultMonitorFactoryImpl();
-        monitor = monitorFactory.createMonitor();
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, monitor);
-
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    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");
-        SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite);
-        
-        assertEquals(composite.getConstrainingType(), constrainingType);
-        assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
-    }
-
-    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");
-        SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite);
-        
-        assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
deleted file mode 100644
index b859779437..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.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.assembly.xml;
-
-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 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.ConstrainingType;
-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.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.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test writing SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteAllTestCase extends TestCase {
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private ExtensibleStAXArtifactProcessor staxProcessor;
-    private ModelResolver resolver; 
-    private CompositeBuilder compositeBuilder;
-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
-    private Monitor monitor;
-
-    @Override
-    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);
-        resolver = new DefaultModelResolver();
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = new TestSCABindingFactoryImpl();
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();
-        monitor = monitorFactory.createMonitor();
-        
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, monitor);
-
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    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);
-        
-    }
-
-    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");
-        SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
-        assertNotNull(scaDefns);
-        policyDefinitionsProcessor.resolve(scaDefns, resolver);
-        
-        staxProcessor.resolve(composite, resolver);
-        compositeBuilder.build(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, bos);
-    }
-    
-    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);
-    }
-
-    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/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
deleted file mode 100644
index 5188b1c91a..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.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;
-
-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 junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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;
-
-/**
- * Test writing SCA XML assemblies.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteNamespacesTestCase extends TestCase {
-    private StAXArtifactProcessor<Composite> compositeProcessor;
-    private XMLOutputFactory outputFactory;
-    private XMLInputFactory inputFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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(Composite.class);
-    }
-
-    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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
deleted file mode 100644
index 4546fddb2d..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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.CalculatorService"/>

-    </service>

-

-    <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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
deleted file mode 100644
index 072fe8fde1..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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">
-        <interface.java class="calculator.DivideService" />
-  </reference>  
-
-</constrainingType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
deleted file mode 100644
index d67ba3ec2b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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 class="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java class="calculator.DivideService" />
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
deleted file mode 100644
index a313dd1e6d..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
deleted file mode 100644
index 2719ee9162..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
deleted file mode 100644
index d29fe85586..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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 host="localhost" port="8099" serviceName="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 host="localhost" port="8099" serviceName="HelloWorldRemoteService"   />
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
deleted file mode 100644
index 5091ff700b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES 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">

-            <operation name="add" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />

-        </binding.ws>

-

-        <callback policySets="sns:SecureReliablePolicy" requires="cns:confidentiality">

-	        <ext:testExtension/>
-            <binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">

-                <operation name="addCallback" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />

-            </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" />

-        <operation name="multiply" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />

-

-        <binding.ws name="MultiplyWS" port="" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" uri="http://calc/ws">

-            <operation name="multiply" policySets="sns:SecureReliablePolicy" requires="cns:confidentiality" />

-        </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">

-                <operation name="multiplyCallback" 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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
deleted file mode 100644
index d59e69209d..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
deleted file mode 100644
index 7bc7ccdb83..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ /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.    

--->

-

-<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" />

-            <operation name="add" requires="cns:tuscanyIntent_6 cns:tuscanyIntent_7"/>

-            <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" />

-            <operation name="add" requires="cns:tuscanyIntent_8 cns:tuscanyIntent_9"/>

-            <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" />

-        <operation name="multiply" requires="cns:tuscanyIntent_6"/>

-

-        <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/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
deleted file mode 100644
index bcc8c54dc8..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ /dev/null
@@ -1,97 +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:intent>

- 

- <sca:intent name="tuscanyIntent_2" 

- 			 constrains="sca:binding">

- 			 <sca:description>

- 			 Sample Intent

- 			 </sca:description>

- </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>

-  <!-- qualified intents -->

- <sca:intent name="tuscanyIntent_1.qualified" />

- <sca:intent name="tuscanyIntent_2.qualified" />

-</sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
deleted file mode 100644
index b79cb6b7b7..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_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" 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/tags/java/sca/1.3/modules/assembly-xsd/LICENSE b/tags/java/sca/1.3/modules/assembly-xsd/LICENSE
deleted file mode 100644
index bfded7c6a9..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/LICENSE
+++ /dev/null
@@ -1,244 +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.
-
-===============================================================================
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/NOTICE b/tags/java/sca/1.3/modules/assembly-xsd/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/NOTICE
+++ /dev/null
@@ -1,12 +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 SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/pom.xml b/tags/java/sca/1.3/modules/assembly-xsd/pom.xml
deleted file mode 100644
index 36fd819dd0..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly-xsd</artifactId>
-    <name>Apache Tuscany SCA Assembly Model XML Schemas</name>
-
-
-    <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.assembly.xsd</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index 69b2701e30..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-all.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-all.xsd
deleted file mode 100644
index 89279510d5..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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-spring.xsd"/>
-    <include schemaLocation="sca-implementation-ejb.xsd"/>
-
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
deleted file mode 100644
index 26bedfcce5..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
deleted file mode 100644
index 850f32b56a..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
deleted file mode 100644
index 02703402ef..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
deleted file mode 100644
index 3e92de193b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-core.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-core.xsd
deleted file mode 100644
index 1c6291792b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
deleted file mode 100644
index 0249882a92..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
deleted file mode 100644
index 87b443fb36..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
deleted file mode 100644
index 99669bc672..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
deleted file mode 100644
index 6f1cf14a4b..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
deleted file mode 100644
index a7e781b18f..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
deleted file mode 100644
index f9d8171b8e..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
deleted file mode 100644
index 1cf9fb3ea9..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
deleted file mode 100644
index 44f14e5ed5..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
deleted file mode 100644
index 81f939bdb4..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
deleted file mode 100644
index c1fdfd8f3c..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca-policy.xsd
deleted file mode 100644
index 2c4875f36c..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/sca.xsd
deleted file mode 100644
index 10f54275d0..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
deleted file mode 100644
index c93a1d72de..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
deleted file mode 100644
index d0da5421ec..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
deleted file mode 100644
index ff48b97d7a..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
deleted file mode 100644
index 7c79738898..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
deleted file mode 100644
index 6d5468b2f9..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
deleted file mode 100644
index 2697a1ea98..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.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="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="host" type="anyURI" use="optional"/>
-			 <attribute name="port" type="int" use="optional"/>
-			 <attribute name="serviceName" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
deleted file mode 100644
index 821f323d73..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
deleted file mode 100644
index 4331da0439..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.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://data.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" 
-    xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <complexType name="ConnectionProperties">
-    	<attribute name="driverClass" type="string" />
-    	<attribute name="databaseURL" type="string" />
-    	<attribute name="userName" type="string" default="" />
-    	<attribute name="password" type="string" default="" />
-    	<attribute name="loginTimeout" type="int" default="0" />
-    </complexType>
-
-    <complexType name="ConnectionInfo">
-    	<sequence>
-    		<element maxOccurs="1" minOccurs="0"
-    			name="ConnectionProperties" type="data:ConnectionProperties" />
-    	</sequence>
-    	<attribute name="dataSource" type="string" />
-    	<attribute name="managedtx" type="boolean"
-    		default="true" />
-    </complexType>
-</schema>
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
deleted file mode 100644
index 1f6f9abb16..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.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://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"
-    xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-    <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/>
-
-    <element name="implementation.das" type="t:DASImplementation"/>
-    	
-    <complexType name="DASImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                    <element  maxOccurs="1" minOccurs="0" name="ConnectionInfo"
-                        type="data:ConnectionInfo"/>                    	
-                </sequence>
-                <attribute name="config" type="NCName" use="required"/>
-                <attribute name="dataAccessType" type="NCName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
deleted file mode 100644
index 4a06bdd36a..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.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" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:data="http://data.tuscany.apache.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-    <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.xsd"/>
-
-    <element name="implementation.data" type="t:DATAImplementation"/>
-    	
-    <complexType name="DATAImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                    <element  maxOccurs="1" minOccurs="0" name="ConnectionInfo"
-                        type="data:ConnectionInfo"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
deleted file mode 100644
index 1b5c8aece2..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
deleted file mode 100644
index f8d437310e..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
deleted file mode 100644
index f8ece54a07..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
deleted file mode 100644
index dd596821ea..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
deleted file mode 100644
index e1723d65f0..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
deleted file mode 100644
index 0c0998595f..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
deleted file mode 100644
index cdabb697aa..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/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/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
deleted file mode 100644
index 032143bd13..0000000000
--- a/tags/java/sca/1.3/modules/assembly-xsd/src/main/resources/tuscany-sca.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://tuscany.apache.org/xmlns/sca/1.0">
-    
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
-    <import namespace="http://data.tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-data-helper.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-xml.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/tags/java/sca/1.3/modules/assembly/LICENSE b/tags/java/sca/1.3/modules/assembly/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/assembly/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/tags/java/sca/1.3/modules/assembly/NOTICE b/tags/java/sca/1.3/modules/assembly/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/assembly/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/tags/java/sca/1.3/modules/assembly/pom.xml b/tags/java/sca/1.3/modules/assembly/pom.xml
deleted file mode 100644
index 9b07014a27..0000000000
--- a/tags/java/sca/1.3/modules/assembly/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-assembly</artifactId>
-    <name>Apache Tuscany SCA Assembly Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-	    <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.3</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.assembly</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.assembly*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
deleted file mode 100644
index b8487d95c5..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.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.assembly;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-
-/**
- * Interface contracts define one or more business functions. These business
- * functions are provided by services and are used by references.
- * 
- * @version $Rev$ $Date$
- */
-public interface AbstractContract extends Base, Extensible, IntentAttachPoint, OperationsConfigurator {
-
-    /**
-     * Returns the name of the contract.
-     * 
-     * @return the name of the contract
-     */
-    String getName();
-
-    /**
-     * Sets the name of the contract.
-     * 
-     * @param name the name of the contract
-     */
-    void setName(String name);
-
-    /**
-     * Returns the interface contract defining the interface and callback
-     * interface for the contract.
-     * 
-     * @return the interface contract
-     */
-    InterfaceContract getInterfaceContract();
-    
-    /**
-     * Sets the interface contract defining the interface and callback
-     * interface for the contract.
-     * 
-     * @param interfaceContract the interface contract
-     */
-    void setInterfaceContract(InterfaceContract interfaceContract);
-
-    /**
-     * Returns true if this contract is a reference or service created internally
-     * to handle a callback interface of another contract, false otherwise.
-     * 
-     * @return true for a callback contract, false otherwise
-     */
-    boolean isCallback();
-
-    /**
-     * Sets a flag indicating whether this is a callback contract.
-     * 
-     * @param isCallback true for a callback contract, false otherwise
-     */
-    void setIsCallback(boolean isCallback);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
deleted file mode 100644
index 05f0e60981..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.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.assembly;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-
-/**
- * A property allows for the configuration of an implementation with externally
- * set data values. An implementation can have zero or more properties. Each
- * property has a data type, which may be either simple or complex. An
- * implementation may also define a default value for a property.
- *
- * @version $Rev$ $Date$
- */
-public interface AbstractProperty extends Base, Extensible, IntentAttachPoint {
-
-    /**
-     * Returns the property name.
-     * 
-     * @return the property name
-     */
-    String getName();
-
-    /**
-     * Sets the property name.
-     * 
-     * @param name the property name
-     */
-    void setName(String name);
-
-    /**
-     * Returns the default value of the property.
-     * 
-     * @return the default value of this property
-     */
-    Object getValue();
-
-    /**
-     * Sets the default value of the property.
-     * 
-     * @param defaultValue the default value of this property
-     */
-    void setValue(Object defaultValue);
-
-    /**
-     * Returns true if the property allows multiple values.
-     * 
-     * @return true if the property allows multiple values
-     */
-    boolean isMany();
-
-    /**
-     * Sets whether or not the property allows multiple values.
-     * 
-     * @param many true if the property should allow multiple values
-     */
-    void setMany(boolean many);
-
-    /**
-     * Returns true if a value must be supplied for the property.
-     * 
-     * @return true is a value must be supplied for the property
-     */
-    boolean isMustSupply();
-
-    /**
-     * Sets whether a value must be supplied for the property.
-     * 
-     * @param mustSupply set to true to require that a value be supplied for
-     *            uses of this property
-     */
-    void setMustSupply(boolean mustSupply);
-
-    /**
-     * Returns the data type of this property. This is the qualified name of an
-     * XML schema type.
-     * 
-     * @return the type of this property
-     */
-    QName getXSDType();
-
-    /**
-     * Sets the data type of this property. This is the qualified name of an XML
-     * schema type.
-     * 
-     * @param type the type of this property
-     */
-    void setXSDType(QName type);
-
-    /**
-     * Returns the element defining the data type of this property. This is the
-     * qualified name of an XML schema element.
-     * 
-     * @return the element defining the type of this property
-     */
-    QName getXSDElement();
-
-    /**
-     * Sets the element defining the data type of this property. This is the
-     * qualified name of an XML schema element.
-     * 
-     * @param element the element defining the type of this property
-     */
-    void setXSDElement(QName element);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
deleted file mode 100644
index a9ef26bbb9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.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.assembly;
-
-/**
- * Represents a reference contract.
- * 
- * @version $Rev$ $Date$
- */
-public interface AbstractReference extends AbstractContract {
-
-    /**
-     * Returns the multiplicity allowed for wires connected to this reference.
-     * 
-     * @return the multiplicity allowed for wires connected to this reference
-     */
-    Multiplicity getMultiplicity();
-
-    /**
-     * Sets the multiplicity allowed for wires connected to this reference.
-     * 
-     * @param multiplicity the multiplicity allowed for wires connected to this
-     *            reference
-     */
-    void setMultiplicity(Multiplicity multiplicity);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
deleted file mode 100644
index 9ae511c07b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.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.assembly;
-
-/**
- * Represents a service contract.
- * 
- * @version $Rev$ $Date$
- */
-public interface AbstractService extends AbstractContract {
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
deleted file mode 100644
index 8a4fc6dfda..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.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.assembly;
-
-
-/**
- * A factory for the assembly model
- * 
- * @version $Rev$ $Date$
- */
-public interface AssemblyFactory {
-
-    /**
-     * Create a new abstract property.
-     * 
-     * @return a new abstract property
-     */
-    AbstractProperty createAbstractProperty();
-
-    /**
-     * Create a new abstract reference.
-     * 
-     * @return a new abstract reference
-     */
-    AbstractReference createAbstractReference();
-
-    /**
-     * Create a new abstract service.
-     * 
-     * @return a new abstract service
-     */
-    AbstractService createAbstractService();
-
-    /**
-     * Create a new callback.
-     * 
-     * @return
-     */
-    Callback createCallback();
-
-    /**
-     * Create a new component.
-     * 
-     * @return a new component
-     */
-    Component createComponent();
-
-    /**
-     * Create a new component property.
-     * 
-     * @return a new component property
-     */
-    ComponentProperty createComponentProperty();
-
-    /**
-     * Create a new component reference.
-     * 
-     * @return a new component reference
-     */
-    ComponentReference createComponentReference();
-
-    /**
-     * Create a new component service.
-     * 
-     * @return a new component service
-     */
-    ComponentService createComponentService();
-
-    /**
-     * Create a new component type
-     * 
-     * @return a new component type
-     */
-    ComponentType createComponentType();
-
-    /**
-     * Create a new composite.
-     * 
-     * @return a new composite
-     */
-    Composite createComposite();
-
-    /**
-     * Create a new composite reference.
-     * 
-     * @return a new composite reference
-     */
-    CompositeReference createCompositeReference();
-
-    /**
-     * Create a new composite service.
-     * 
-     * @return a new composite service
-     */
-    CompositeService createCompositeService();
-
-    /**
-     * Create a new constraining type.
-     * 
-     * @return a new constraining type
-     */
-    ConstrainingType createConstrainingType();
-
-    /**
-     * Create a new property.
-     * 
-     * @return a new property
-     */
-    Property createProperty();
-
-    /**
-     * Create a new reference.
-     * 
-     * @return a new reference
-     */
-    Reference createReference();
-
-    /**
-     * Create a new service.
-     * 
-     * @return a new service
-     */
-    Service createService();
-
-    /**
-     * Create a new wire.
-     * 
-     * @return a new wire
-     */
-    Wire createWire();
-
-    /** 
-     * Create a new configured operation.
-     * 
-     * @return a new ConfiguredOperation 
-     */
-    ConfiguredOperation createConfiguredOperation();
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
deleted file mode 100644
index 76511d351d..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.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.assembly;
-
-
-/**
- * Base interface for all assembly model objects.
- * 
- * @version $Rev$ $Date$
- */
-public interface Base {
-
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
deleted file mode 100644
index f8b7d4d236..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.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.assembly;
-
-
-/**
- * Represents a binding.
- * 
- * @version $Rev$ $Date$
- */
-public interface Binding extends Base, Cloneable {
-
-    /**
-     * Returns the binding URI.
-     * 
-     * @return the binding URI
-     */
-    String getURI();
-
-    /**
-     * Sets the binding URI.
-     * 
-     * @param uri the binding URI
-     */
-    void setURI(String uri);
-
-    /**
-     * Returns the binding name.
-     * 
-     * @return the binding name
-     */
-    String getName();
-
-    /**
-     * Sets the binding name.
-     * 
-     * @param name the binding name
-     */
-    void setName(String name);
-    
-    /**
-     * Clone the binding
-     * 
-     * @return
-     */
-    Object clone() throws CloneNotSupportedException;   
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
deleted file mode 100644
index f49a653aa9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.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;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents a callback object describing the bindings to use for callbacks.
- * 
- * @version $Rev$ $Date$
- */
-public interface Callback extends Base, Extensible, IntentAttachPoint, PolicySetAttachPoint, OperationsConfigurator {
-
-    /**
-     * Returns the bindings supported for callbacks.
-     * 
-     * @return the bindings supported for callbacks
-     */
-    List<Binding> getBindings();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
deleted file mode 100644
index 8e1943224c..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.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.assembly;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents a component. A component is a configured instance of an
- * implementation.
- * 
- * @version $Rev$ $Date$
- */
-public interface Component extends Base, Extensible, PolicySetAttachPoint, Cloneable {
-    
-    /**
-     * Returns the URI of the component.
-     *  
-     * @return the URI of the component
-     */
-    String getURI();
-    
-    /**
-     * Sets the URI of the component.
-     * 
-     * @param uri the URI of the component
-     */
-    void setURI(String uri);
-
-    /**
-     * Returns the name of the component.
-     * 
-     * @return the name of the component
-     */
-    String getName();
-
-    /**
-     * Sets the name of the component.
-     * 
-     * @param name the name of the component
-     */
-    void setName(String name);
-
-    /**
-     * Returns the component implementation.
-     * 
-     * @return the component implementation
-     */
-    Implementation getImplementation();
-
-    /**
-     * Sets the component implementation
-     * 
-     * @param implementation the component implementation
-     */
-    void setImplementation(Implementation implementation);
-
-    /**
-     * Returns a list of references used by the component.
-     * 
-     * @return a list of references used by the component
-     */
-    List<ComponentReference> getReferences();
-
-    /**
-     * Returns a list of services exposed by the component.
-     * 
-     * @return a list of services exposed by the component
-     */
-    List<ComponentService> getServices();
-
-    /**
-     * Returns a list of properties for the component.
-     * 
-     * @return a list of properties
-     */
-    List<ComponentProperty> getProperties();
-
-    /**
-     * Returns a constraining type defining the shape of the component.
-     * 
-     * @return a constraining type
-     */
-    ConstrainingType getConstrainingType();
-
-    /**
-     * Sets a constraining type defining the shape of the component.
-     * 
-     * @param constrainingType the constraining type
-     */
-    void setConstrainingType(ConstrainingType constrainingType);
-
-    /**
-     * Return the Boolean value of autowire
-     * @return null/TRUE/FALSE
-     */
-    Boolean getAutowire();
-
-    /**
-     * Sets whether component references should be autowired.
-     * 
-     * @param autowire whether component references should be autowired
-     */
-    void setAutowire(Boolean autowire);
-    
-
-    /**
-     * Returns a clone of the component.
-     * 
-     * @return a clone of the component
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
deleted file mode 100644
index 13d19b1757..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.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.assembly;
-
-import javax.xml.xpath.XPathExpression;
-
-/**
- * Represents a configured property of a component.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentProperty extends Property {
-
-    /**
-     * Returns the property defined by the component implementation.
-     * 
-     * @return the property defined by the component implementation
-     */
-    Property getProperty();
-
-    /**
-     * Sets the property defined by this component implementation.
-     * 
-     * @param property the property defined by this component implementation
-     */
-    void setProperty(Property property);
-
-    /**
-     * Returns an XPath expression referencing a property of the enclosing
-     * composite.
-     * 
-     * @return an XPath expression referencing a property of the enclosing
-     *         composite
-     */
-    String getSource();
-
-    /**
-     * Sets an XPath expression referencing a property of the enclosing
-     * composite.
-     * 
-     * @param source an XPath expression referencing a property of the enclosing
-     *            composite
-     */
-    void setSource(String source);
-    
-    /**
-     * Get the XPath expression for the source attribute
-     * @return the XPath expression for the source attribute
-     */
-    XPathExpression getSourceXPathExpression();
-    
-    /**
-     * Set the XPath expression for the source attribute
-     * @param sourceXPathExpression the XPath expression for the source attribute
-     */
-    void setSourceXPathExpression(XPathExpression sourceXPathExpression);
-
-    /**
-     * Returns a URI to a file containing the property value.
-     * 
-     * @return a URI to a file containing the property value
-     */
-    String getFile();
-
-    /**
-     * Sets a URI to a file containing the property value.
-     * 
-     * @param file a URI to a file containing the property value
-     */
-    void setFile(String file);
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
deleted file mode 100644
index ce40bc089b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.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.assembly;
-
-import java.util.List;
-
-
-
-/**
- * An instance of a reference associated with a particular component.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentReference extends Reference {
-
-    /**
-     * Returns the reference defined by the implementation for this reference.
-     * 
-     * @return the implementation reference
-     */
-    Reference getReference();
-
-    /**
-     * Sets the reference defined by the implementation for this reference.
-     * 
-     * @param reference the implementation reference
-     */
-    void setReference(Reference reference);
-    
-    /**
-     * Return the Boolean value of autowire
-     * @return null/TRUE/FALSE
-     */
-    Boolean getAutowire();
-
-    /**
-     * Sets whether component references should be autowired.
-     * 
-     * @param autowire whether component references should be autowired
-     */
-    void setAutowire(Boolean autowire);
-
-
-    /**
-     * Returns the callback service created internally as a target endpoint
-     * for callbacks to this reference.
-     * 
-     * @return the callback service
-     */
-    ComponentService getCallbackService();
-
-    /**
-     * Sets the callback service created internally as a target endpoint
-     * for callbacks to this reference.
-     * 
-     * @param callbackService the callback service
-     */
-    void setCallbackService(ComponentService callbackService);
-    
-    /**
-     * Returns the endpoints implied by this reference.
-     * 
-     * @return the endpoints implied by this reference
-     */
-    List<Endpoint> getEndpoints();    
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
deleted file mode 100644
index 65945692f1..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.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.assembly;
-
-
-/**
- * An addressable instance of a service associated with a particular component.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentService extends Service {
-
-    /**
-     * Returns the service defined by the implementation for this service.
-     * 
-     * @return
-     */
-    Service getService();
-
-    /**
-     * Sets the service defined by the implementation for this service.
-     * 
-     * @param service
-     */
-    void setService(Service service);
-
-    /**
-     * Returns the callback reference created internally as a source endpoint
-     * for callbacks from this service.
-     * 
-     * @return the callback reference
-     */
-    ComponentReference getCallbackReference();
-
-    /**
-     * Sets the callback reference created internally as a source endpoint
-     * for callbacks from this service.
-     * 
-     * @param callbackReference the callback reference
-     */
-    void setCallbackReference(ComponentReference callbackReference);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
deleted file mode 100644
index e1ea65ea39..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.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.assembly;
-
-import java.util.List;
-
-/**
- * Describes an implementation and represents its configurable aspects.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentType extends Base {
-    
-    /**
-     * Returns the URI of this component type.
-     * @return the URI of the component type
-     */
-    String getURI();
-    
-    /**
-     * Sets the URI of this component type.
-     * @param uri the URI of the component type
-     */
-    void setURI(String uri);
-
-    /**
-     * Returns a list of services that are offered.
-     * 
-     * @return a list of services that are offered
-     */
-    List<Service> getServices();
-
-    /**
-     * Returns the list of reference types that are used.
-     * 
-     * @return the list of reference types that are used
-     */
-    List<Reference> getReferences();
-
-    /**
-     * Returns the list of properties that can be set.
-     * 
-     * @return the list of properties that can be set
-     */
-    List<Property> getProperties();
-
-    /**
-     * Returns a constraining type defining the shape of the implementation.
-     * 
-     * @return a constraining type
-     */
-    ConstrainingType getConstrainingType();
-
-    /**
-     * Sets a constraining type defining the shape of the implementation.
-     * 
-     * @param constrainingType the constraining type to set
-     */
-    void setConstrainingType(ConstrainingType constrainingType);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
deleted file mode 100644
index 2c7b7c6b9e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.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.assembly;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-
-/**
- * Represents a composite.
- * 
- * @version $Rev$ $Date$
- */
-public interface Composite extends Implementation, Extensible, Cloneable, PolicySetAttachPoint {
-
-    /**
-     * Returns the name of the composite.
-     * 
-     * @return the name of the composite
-     */
-    QName getName();
-
-    /**
-     * Sets the name of the composite.
-     * 
-     * @param name the name of the composite
-     */
-    void setName(QName name);
-
-    /**
-     * Returns a list of composites included in this composite.
-     * 
-     * @return a list of composites included in this composite.
-     */
-    List<Composite> getIncludes();
-
-    /**
-     * Returns a list of components contained in this composite.
-     * 
-     * @return a list of components contained in this composite
-     */
-    List<Component> getComponents();
-
-    /**
-     * Returns a list of wires contained in this composite.
-     * 
-     * @return a list of wires contained in this composite
-     */
-    List<Wire> getWires();
-
-    /**
-     * Returns true if all the components within the composite must run in the
-     * same process.
-     * 
-     * @return true if all the components within the composite must run in the
-     *         same process
-     */
-    boolean isLocal();
-
-    /**
-     * Sets whether all the components within the composite must run in the same
-     * process.
-     * 
-     * @param local whether all the components within the composite must run in
-     *            the same process
-     */
-    void setLocal(boolean local);
-
-    /**
-     * Return the Boolean value of autowire
-     * @return null/TRUE/FALSE
-     */
-    Boolean getAutowire();
-
-    /**
-     * Sets whether component references should be autowired.
-     * 
-     * @param autowire whether component references should be autowired
-     */
-    void setAutowire(Boolean autowire);
-
-
-    /**
-     * Returns a clone of the component type.
-     * 
-     * @return a clone of the component type
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
deleted file mode 100644
index d3fa80ba74..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.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.assembly;
-
-import java.util.List;
-
-/**
- * Represents composite reference.
- * 
- * @version $Rev$ $Date$
- */
-public interface CompositeReference extends Reference {
-
-    /**
-     * Returns the promoted composite references.
-     * 
-     * @return the promoted composite references
-     */
-    List<ComponentReference> getPromotedReferences();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
deleted file mode 100644
index 7143f571f9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.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.assembly;
-
-/**
- * Represents a composite service.
- * 
- * @version $Rev$ $Date$
- */
-public interface CompositeService extends Service {
-
-    /**
-     * Returns the promoted component.
-     * 
-     * @return the promoted component.
-     */
-    Component getPromotedComponent();
-
-    /**
-     * Sets the promoted component
-     * 
-     * @param promotedComponent the promoted component.
-     */
-    void setPromotedComponent(Component promotedComponent);
-    
-    /**
-     * Returns the promoted component service .
-     * 
-     * @return the promoted component service.
-     */
-    ComponentService getPromotedService();
-
-    /**
-     * Sets the promoted component service
-     * 
-     * @param promotedService the promoted component service.
-     */
-    void setPromotedService(ComponentService promotedService);
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
deleted file mode 100644
index 8832597343..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.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;

-

-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;

-

-/**

- * Represents an Operation. Typically Operation elements are used when there is a

- * need to apply certain facets such as intents and policysets only to a specific

- * operation provided by a service or reference.

- *

- * @version $Rev$ $Date$

- */

-public interface ConfiguredOperation extends Base, PolicySetAttachPoint {

-    /**

-     * Returns the name of the operation.

-     * 

-     * @return the name of the operation

-     */

-    String getName();

-

-    /**

-     * Sets the name of the operation.

-     * 

-     * @param name the name of the operation

-     */

-    void setName(String name);

-    

-    /**

-     * Returns the name of the service or reference to which this operation belongs.

-     * This method is particularly useful when operation elements are specified under implementation

-     * elements and it is necessary to identify which of the various services provided by the 

-     * implementation is referred to by the operation element in question

-     * 

-     * @return the name of the contract to which this operation belongs

-     */

-    String getContractName();

-    

-    /**

-     * Sets the name of the service or reference to which this operation belongs.

-     * 

-     * @param contractName the name of the contract to which this operation belongs

-     */

-    void setContractName(String contractName);

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
deleted file mode 100644
index 9890bfed68..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.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.assembly;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-
-/**
- * A constrainingType provides the "shape" for a component and its
- * implementation. Any component configuration that points to a constrainingType
- * is constrained by this shape. The constrainingType specifies the services,
- * references and properties that must be implemented.
- * 
- * @version $Rev$ $Date$
- */
-public interface ConstrainingType extends Base, Extensible, IntentAttachPoint {
-
-    /**
-     * Returns the name of the constrainingType.
-     * 
-     * @return the name of the constrainingType
-     */
-    QName getName();
-
-    /**
-     * Sets the name of the constrainingType.
-     * 
-     * @param name the name of the constrainingType
-     */
-    void setName(QName name);
-
-    /**
-     * Returns a list of services that are offered.
-     * 
-     * @return a list of services that are offered
-     */
-    List<AbstractService> getServices();
-
-    /**
-     * Returns the list of references that are used.
-     * 
-     * @return the list of references that are used
-     */
-    List<AbstractReference> getReferences();
-
-    /**
-     * Returns the list of properties that can be set.
-     * 
-     * @return the list of properties that can be set
-     */
-    List<AbstractProperty> getProperties();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
deleted file mode 100644
index f9a62774e6..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.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;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents a contract. A contract can be either a service or a reference.
- * 
- * @version $Rev$ $Date$
- */
-public interface Contract extends AbstractContract, PolicySetAttachPoint, Cloneable {
-
-    /**
-     * Returns the bindings supported by this contract.
-     * 
-     * @return the bindings supported by this contract
-     */
-    List<Binding> getBindings();
-
-    /**
-     * Returns a binding of the specified type or null if there is no such
-     * binding configured on this contract.
-     * 
-     * @param <B> the binding type
-     * @param bindingClass the binding type class
-     * @return the binding or null if there is no binding of the specified type
-     */
-    <B> B getBinding(Class<B> bindingClass);
-
-    /**
-     * Returns a callback binding of the specified type or null if there is no such
-     * callback binding configured on this contract.
-     * 
-     * @param <B> the callback binding type
-     * @param bindingClass the callback binding type class
-     * @return the callback binding or null if there is no callback binding of the specified type
-     */
-    <B> B getCallbackBinding(Class<B> bindingClass);
-
-    /**
-     * Returns a callback definition of the bindings to use for callbacks.
-     * 
-     * @return a definition of the bindings to use for callbacks
-     */
-    Callback getCallback();
-
-    /**
-     * Sets a callback definition of the bindings to use for callbacks
-     * 
-     * @param callback a definition of the bindings to use for callbacks
-     */
-    void setCallback(Callback callback);
-
-    /**
-     * Returns a clone of the contract.
-     * 
-     * @return a clone of the reference
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-    
-    /**
-     * Returns the interface contract given a binding. Important in the case where
-     * a reference with multiplicity > 1 has been promoted and has it's list of 
-     * resolved bindings extended by a promoting reference. Here the binding
-     * from the promoting reference may need the interface contract from the 
-     * promoting reference and not the promoted reference.
-     * TODO - remove this wrinkle with better endpoint support.  
-     * 
-     * @param binding the binding for which the interface contract is required
-     * @return the interface contract
-     */
-    InterfaceContract getInterfaceContract(Binding binding);    
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
deleted file mode 100644
index 5dd256e3c4..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.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.assembly;
-
-import org.apache.tuscany.sca.assembly.impl.AssemblyFactoryImpl;
-
-/**
- * A factory for the assembly model.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultAssemblyFactory extends AssemblyFactoryImpl implements AssemblyFactory {
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
deleted file mode 100644
index 6b0c076ee5..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.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.assembly;
-
-
-import org.apache.tuscany.sca.assembly.impl.EndpointFactoryImpl;
-
-/**
- * A default factory for the Endpoint model.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultEndpointFactory extends EndpointFactoryImpl {
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
deleted file mode 100644
index ee63497fbe..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.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.assembly;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * Represents an endpoint (primarily a combination of a target service name and a set of
- * candidate bindings)
- * 
- * @version $Rev$ $Date$
- */
-public interface Endpoint extends Base, Cloneable {
-    
-    /**
-     * Get the name of the target service that this endpoint refers to
-     * 
-     * @return target service name
-     */
-    String getTargetName();
-    
-    /**
-     * Set the name of the target service that this endpoint refers to
-     * 
-     * @param targetName
-     */
-    void setTargetName(String targetName);    
-    
-    /**
-     * Get the source component model object
-     * 
-     * @return source component
-     */
-    Component getSourceComponent();
-    
-    /**
-     * Set the source component model object
-     * 
-     * @param component the source component for the endpoint
-     */
-    void setSourceComponent(Component component);
-    
-    /**
-     * Get the source component reference model object
-     * 
-     * @return reference the source component reference  for the endpoint
-     */
-    ComponentReference getSourceComponentReference();
-    
-    /**
-     * Set the source component reference model object
-     * 
-     * @param reference
-     */
-    void setSourceComponentReference(ComponentReference reference);   
-    
-    /**
-     * Get the resolved source binding 
-     * 
-     * @return binding the resolved source binding
-     */
-    Binding getSourceBinding();
-    
-    /**
-     * Set the resolved source binding 
-     * 
-     * @param binding the resolved source binding
-     */
-    void setSourceBinding(Binding binding);
-
-    /**
-     * Get the resolved source callback binding 
-     * 
-     * @return binding the resolved source callback binding
-     */
-    Binding getSourceCallbackBinding();
-    
-    /**
-     * Set the resolved source callback binding
-     * 
-     * @param binding the resolved source callback binding
-     */
-    void setSourceCallbackBinding(Binding binding);  
-    
-    /**
-     * Get the list of candidate bindings that could be used to 
-     * communication with the target service
-     * 
-     * @return list of candidate bindings
-     */
-    List<Binding> getCandidateBindings();
-    
-    
-    /**
-     * Get the target component model object
-     * 
-     * @return target component
-     */
-    Component getTargetComponent();
-    
-    /**
-     * Set the target component model object
-     * 
-     * @param component target component
-     */
-    void setTargetComponent(Component component);
-    
-    /**
-     * Get the target component service model object
-     * 
-     * @return target component service
-     */
-    ComponentService getTargetComponentService();
-    
-    /**
-     * Set the target component service model object
-     * 
-     * @param service
-     */
-    void setTargetComponentService(ComponentService service);
-    
-    /**
-     * Get the resolved target binding 
-     * 
-     * @return target binding
-     */
-    Binding getTargetBinding();
-    
-    /**
-     * Set the resolved target binding
-     * 
-     * @param binding target binding
-     */
-    void setTargetBinding(Binding binding); 
-    
-    /**
-     * Returns the interface contract defining the interface 
-     * 
-     * @return the interface contract
-     */
-    InterfaceContract getInterfaceContract();
-    
-    /**
-     * Sets the interface contract defining the interface 
-     * 
-     * @param interfaceContract the interface contract
-     */
-    void setInterfaceContract(InterfaceContract interfaceContract);    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
deleted file mode 100644
index 93e6c4d630..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.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.assembly;
-
-
-
-/**
- * A factory for the endpoint model
- * 
- * @version $Rev$ $Date$
- */
-public interface EndpointFactory {
-
-    /**
-     * Create a new endpoint model object 
-     * 
-     * @return a new endpoint
-     */
-    Endpoint createEndpoint();
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
deleted file mode 100644
index 3577a94d1e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.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.assembly;
-
-import java.util.List;
-
-/**
- * Base interface for extensible assembly model objects.
- * 
- * @version $Rev$ $Date$
- */
-public interface Extensible {
-
-    /**
-     * Returns a list of extension objects contained in this model object.
-     * 
-     * @return a list of extension objects container in this model object
-     */
-    List<Object> getExtensions();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
deleted file mode 100644
index 720a6801a2..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.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.assembly;
-
-/**
- * Represents a component implementation.
- * 
- * @version $Rev$ $Date$
- */
-public interface Implementation extends ComponentType {
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
deleted file mode 100644
index 5d15ce9938..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.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.assembly;
-
-/**
- * Enumeration for multiplicity. Defines the number of wires that can connect a
- * reference to target services.
- * 
- * @version $Rev$ $Date$
- */
-public enum Multiplicity {
-
-    /**
-     * Zero or one wire can have the reference as a source.
-     */
-    ZERO_ONE,
-
-    /**
-     * The default setting, one wire can have the reference as a source.
-     */
-    ONE_ONE,
-
-    /**
-     * Zero or more wires can have the reference as a source.
-     */
-    ZERO_N,
-
-    /**
-     * One or more wires can have the reference as a source.
-     */
-    ONE_N
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
deleted file mode 100644
index 947fcd4c7c..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.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.assembly;

-

-import java.util.List;

-

-/**

- * Interface to be implemented by SCA artifacts that support configuration of 'operation' child

- * elements for policies etc. 

- *

- * @version $Rev$ $Date$

- */

-

-public interface OperationsConfigurator {

-    List<ConfiguredOperation> getConfiguredOperations();

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
deleted file mode 100644
index 98ff92f15b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.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.assembly;
-
-/**
- * Represent a reference binding that supports optimized SCA local wiring between component 
- * references and services 
- * 
- * @version $Rev$ $Date$
- * 
- */
-public interface OptimizableBinding extends Binding, Cloneable {
-
-    /**
-     * @param component
-     */
-    void setTargetComponent(Component component);
-    
-    /**
-     * @param service
-     */
-    void setTargetComponentService(ComponentService service);
-    
-    /**
-     * @param binding
-     */
-    void setTargetBinding(Binding binding);
-    
-    /**
-     * @return
-     */
-    Binding getTargetBinding();
-    
-    /**
-     * @return
-     */
-    Component getTargetComponent();
-    
-    /**
-     * @return
-     */
-    ComponentService getTargetComponentService();
-
-    /**
-     * Clone the binding
-     * @return
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
deleted file mode 100644
index 683920da58..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.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.assembly;
-
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * A property allows for the configuration of an implementation with externally
- * set data values. An implementation can have zero or more properties. Each
- * property has a data type, which may be either simple or complex. An
- * implementation may also define a default value for a property.
- * 
- * @version $Rev$ $Date$
- */
-public interface Property extends AbstractProperty, PolicySetAttachPoint, Cloneable {
-    
-    /**
-     * Returns a clone of the property.
-     * 
-     * @return a clone of the property
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
deleted file mode 100644
index 2eb1bf21b0..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.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.assembly;
-
-import java.util.List;
-
-/**
- * Represents a reference. References within an implementation represent links
- * to services that the implementation uses that must be provided by other
- * components.
- * 
- * @version $Rev$ $Date$
- */
-public interface Reference extends AbstractReference, Contract {
-
-    /**
-     * Returns a boolean value, "false" by default, which indicates that the
-     * implementation wires this reference dynamically.
-     * 
-     * @return true if the implementation wires this reference dynamically
-     */
-    boolean isWiredByImpl();
-
-    /**
-     * Sets a boolean value, "false" by default, which indicates that the
-     * implementation wires this reference dynamically.
-     * 
-     * @param wiredByImpl whether the implementation wires this reference
-     *            dynamically
-     */
-    void setWiredByImpl(boolean wiredByImpl);
-
-    /**
-     * Returns a boolean value, "false" by default, which indicates whether
-     * the configuration of this reference is a promotion override for
-     * another more deeply nested reference.
-     * 
-     * @return true if the reference is a promotion override
-     */
-    boolean isPromotionOverride();
-
-    /**
-     * Sets a boolean value, "false" by default, which indicates whether
-     * the configuration of this reference is a promotion override for
-     * another more deeply nested reference.
-     * 
-     * @param promotionOverride whether the reference is a promotion override
-     */
-    void setPromotionOverride(boolean promotionOverride);
-
-    /**
-     * Returns the targets of this reference.
-     * 
-     * @return the targets of this reference.
-     */
-    List<ComponentService> getTargets();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
deleted file mode 100644
index 2cf04277cd..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.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.assembly;
-
-/**
- * Represents an SCA binding.
- * 
- * @version $Rev$ $Date$
- */
-public interface SCABinding extends Binding {
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
deleted file mode 100644
index 0abfd13d10..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.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.assembly;
-
-
-/**
- * A factory for the SCA binding model
- * 
- * @version $Rev$ $Date$
- */
-public interface SCABindingFactory {
-
-    /**
-     * Create a new SCA binding.
-     * 
-     * @return a new SCA binding
-     */
-    SCABinding createSCABinding();
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
deleted file mode 100644
index 020870cd34..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.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.assembly;
-
-/**
- * Represents a service. Services are used to publish services provided by
- * implementations, so that they are addressable by other components.
- * 
- * @version $Rev$ $Date$
- */
-public interface Service extends AbstractService, Contract {
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
deleted file mode 100644
index ee65e5746e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.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.assembly;
-
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents a wire.
- * 
- * @version $Rev$ $Date$
- */
-public interface Wire extends Base, Extensible, IntentAttachPoint, PolicySetAttachPoint, Cloneable {
-
-    /**
-     * Returns the source of the wire.
-     * 
-     * @return the source of the wire
-     */
-    ComponentReference getSource();
-
-    /**
-     * Sets the source of the wire.
-     * 
-     * @param source the source of the wire
-     */
-    void setSource(ComponentReference source);
-
-    /**
-     * Returns the target of the wire.
-     * 
-     * @return the target of the wire
-     */
-    ComponentService getTarget();
-
-    /**
-     * Sets the target of the wire.
-     * 
-     * @param target the target of the wire
-     */
-    void setTarget(ComponentService target);
-
-    /**
-     * Returns a clone of the wire.
-     * 
-     * @return a clone of the wire
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
deleted file mode 100644
index 97708f9ef5..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.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.assembly.builder;
-
-/**
- * Represent a binding that has been added automatically to the model rather 
- * than being specified by the user through the composite file
- * 
- * @version $Rev$ $Date$
- * 
- */
-public interface AutomaticBinding extends Cloneable  {
-
-    /**
-     * @param isAutomatic
-     */
-    void setIsAutomatic(boolean isAutomatic);
-    
-    /**
-     * @return isAutomatic
-     */
-    boolean getIsAutomatic();
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
deleted file mode 100644
index 7bac630d5b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.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.assembly.builder;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A builder that handles any build-time configuration needed by bindings.
- *
- * @version $Rev$ $Date$
- */
-public interface BindingBuilder {
-    
-    /**
-     * Configure a binding.
-     * 
-     * @param component The component for the binding's service or reference
-     * @param contract The binding's service or reference
-     */
-    void build(Component component, AbstractContract contract, Binding binding, Monitor monitor);
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
deleted file mode 100644
index 37ad8af0b3..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.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.assembly.builder;
-
-/**
- * An extension that can be implemented by bindings to provide a binding builder.
- *
- * @version $Rev$ $Date$
- */
-public interface BindingBuilderExtension {
-
-    /**
-     * Returns the binding builder.
-     * 
-     * @return the binding builder
-     */
-    BindingBuilder getBuilder();
-
-    /**
-     * Sets the binding builder.
-     * 
-     * @param builder the binding builder
-     */
-    void setBuilder(BindingBuilder builder);
-
-}
-
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
deleted file mode 100644
index d2fae4d24a..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.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.assembly.builder;
-
-import org.apache.tuscany.sca.assembly.Component;
-
-/**
- * Interface for Component Pre Processors.
- *
- * @version $Rev$ $Date$
- */
-public interface ComponentPreProcessor {
-
-    void preProcess(Component component);
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
deleted file mode 100644
index cf38894702..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.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.builder;
-
-import org.apache.tuscany.sca.assembly.Composite;
-
-/**
- * A builder that handles the configuration of the components inside a
- * composite and the wiring of component references to component services.
- *
- * @version $Rev$ $Date$
- */
-public interface CompositeBuilder {
-    
-    /**
-     * Build a composite.
-     * 
-     * @param composite
-     * @throws CompositeBuilderException
-     */
-    void build(Composite composite) throws CompositeBuilderException;
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
deleted file mode 100644
index 5a2015f55e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.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.assembly.builder;
-
-/**
- * Reports a composite builder exception.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeBuilderException extends Exception {
-    private static final long serialVersionUID = -8916323176803443856L;
-
-    public CompositeBuilderException() {
-    }
-
-    public CompositeBuilderException(String message) {
-        super(message);
-    }
-
-    public CompositeBuilderException(Throwable cause) {
-        super(cause);
-    }
-
-    public CompositeBuilderException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
deleted file mode 100644
index 9743117174..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.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.assembly.builder;
-
-import org.apache.tuscany.sca.assembly.builder.impl.EndpointBuilderImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A default builder.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultEndpointBuilder extends EndpointBuilderImpl {
-    public DefaultEndpointBuilder (Monitor monitor){
-        super(monitor);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
deleted file mode 100644
index 20a17e1bd0..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.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.assembly.builder;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.Service;

-

-/**

- * A builder that handles the configuration of the components inside a

- * composite and the wiring of component references to component services.

- *

- * @version $Rev: 563358 $ $Date: 2007-08-07 01:26:27 +0100 (Tue, 07 Aug 2007) $

- */

-public interface DomainBuilder {

-    

-    /**

-     * Wire up the references and service in a domain returning a list

-     * of the composites that have changed

-     * 

-     * @param domainLevelCompsite

-     * @return a list of change composites

-     * @throws CompositeBuilderException

-     */

-    List<Composite> wireDomain(Composite domainLevelComposite);

-    

-    /**

-     * Locates the referenced service and updates the URI on the identified binding

-     * 

-     * @param domainLevelComposite

-     * @param referenceName

-     * @param bindingClassName

-     * @param URI

-     */

-    void updateDomainLevelServiceURI(Composite domainLevelComposite, String referenceName, String bindingClassName, String URI);

-    

-    /**

-     * Get the component name out of the reference name that might look like Component/Service

-     * 

-     * @param referenceName

-     * @return

-     */

-    String getComponentNameFromReference(String referenceName);

-    

-    /**

-     * Get the service name out of the reference name that might look like Component/Service

-     * 

-     * @param referenceName

-     * @return

-     */

-    String getServiceNameFromReference(String referenceName);

-    

-    /**

-     * Find the service object given a reference name

-     * 

-     * @param composite

-     * @param referenceName

-     * @return

-     */

-    Service findServiceForReference(Composite composite, String referenceName);

-    

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
deleted file mode 100644
index eb2977d87a..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.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.builder;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-
-/**
- * A builder that handles the configuration of reference endpoints
- * It collects together the logic so that it can be used at build time
- * or later on during late binding scenarios
- *
- * @version $Rev$ $Date$
- */
-public interface EndpointBuilder {
-    
-    /**
-     * Build an endpoint.
-     * 
-     * @param endpoint
-     */
-    void build(Endpoint endpoint);
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
deleted file mode 100644
index 648977792a..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
+++ /dev/null
@@ -1,1334 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.builder.impl;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-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 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.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.CompositeService;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
-import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-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.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-
-/**
- * Base class for Builder implementations that handles configuration.
- *
- * @version $Rev$ $Date$
- */
-public abstract class BaseConfigurationBuilderImpl {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final String BINDING_SCA = "binding.sca";
-    private static final QName BINDING_SCA_QNAME = new QName(SCA10_NS, BINDING_SCA);
-
-    private AssemblyFactory assemblyFactory;
-    private SCABindingFactory scaBindingFactory;
-    private Monitor monitor;
-    private InterfaceContractMapper interfaceContractMapper;
-    private SCADefinitions policyDefinitions;
-
-    protected BaseConfigurationBuilderImpl(AssemblyFactory assemblyFactory,
-                                             SCABindingFactory scaBindingFactory,
-                                             InterfaceContractMapper interfaceContractMapper,
-                                             SCADefinitions policyDefinitions,
-                                             Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.scaBindingFactory = scaBindingFactory;
-        this.interfaceContractMapper = interfaceContractMapper;
-        this.policyDefinitions = policyDefinitions;
-        this.monitor = monitor;
-    }
-
-    /**
-     * Configure components in the composite.
-     * 
-     * @param composite
-     * @param problems
-     */
-    protected void configureComponents(Composite composite) throws CompositeBuilderException {
-        configureComponents(composite, null);
-        configureSourcedProperties(composite, null);
-        //configureBindingURIs(composite, null, null);
-    }
-
-    /**
-     * Configure components in the composite.
-     * 
-     * @param composite
-     * @param uri
-     * @param problems
-     */
-    private void configureComponents(Composite composite, String uri) {
-        String parentURI = uri;
-
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-
-            // Initialize component URI
-            String componentURI;
-            if (parentURI == null) {
-                componentURI = component.getName();
-            } else {
-                componentURI = URI.create(parentURI + '/').resolve(component.getName()).toString();
-            }
-            component.setURI(componentURI);
-
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // Process nested composite
-                configureComponents((Composite)implementation, componentURI);
-            }
-        }
-
-        // Initialize service bindings
-        List<Service> compositeServices = composite.getServices();
-        for (Service service : compositeServices) {
-            // Set default binding names 
-            
-            // Create default SCA binding
-            if (service.getBindings().isEmpty()) {
-                SCABinding scaBinding = createSCABinding();
-                service.getBindings().add(scaBinding);
-            }
-/*
-            // Initialize binding names and URIs
-            for (Binding binding : service.getBindings()) {
-                
-                // Binding name defaults to the service name
-                if (binding.getName() == null) {
-                    binding.setName(service.getName());
-                }
-            }
-            
-            if (service.getCallback() != null) {
-                for (Binding binding : service.getCallback().getBindings()) {
-                    if (binding.getName() == null) {
-                        binding.setName(service.getName());
-                    }
-                }
-            }
-*/
-        }
-
-        // Initialize reference bindings
-        for (Reference reference : composite.getReferences()) {
-            // Create default SCA binding
-            if (reference.getBindings().isEmpty()) {
-                SCABinding scaBinding = createSCABinding();
-                reference.getBindings().add(scaBinding);
-            }
-/*
-            // Set binding names
-            for (Binding binding : reference.getBindings()) {
-                if (binding.getName() == null) {
-                    binding.setName(reference.getName());
-                }
-            }
-
-            if (reference.getCallback() != null) {
-                for (Binding binding : reference.getCallback().getBindings()) {
-                    if (binding.getName() == null) {
-                        binding.setName(reference.getName());
-                    }
-                }
-            }
-*/
-        }
-
-        // Initialize all component services and references
-        Map<String, Component> components = new HashMap<String, Component>();
-        for (Component component : composite.getComponents()) {
-
-            // Index all components and check for duplicates
-            if (components.containsKey(component.getName())) {
-                warning("DuplicateComponentName", component, composite.getName().toString(), component.getName());
-            } else {
-                components.put(component.getName(), component);
-            }
-
-            // Propagate the autowire flag from the composite to components
-            if (component.getAutowire() == null) {
-                component.setAutowire(composite.getAutowire());
-            }
-
-            if (component.getImplementation() instanceof ComponentPreProcessor) {
-                ((ComponentPreProcessor)component.getImplementation()).preProcess(component);
-            }
-
-            // Index properties, services and references
-            Map<String, Service> services = new HashMap<String, Service>();
-            Map<String, Reference> references = new HashMap<String, Reference>();
-            Map<String, Property> properties = new HashMap<String, Property>();
-            indexImplementationPropertiesServicesAndReferences(component,
-                                                               services,
-                                                               references,
-                                                               properties);
-
-            // Index component services, references and properties
-            // Also check for duplicates
-            Map<String, ComponentService> componentServices =
-                new HashMap<String, ComponentService>();
-            Map<String, ComponentReference> componentReferences =
-                new HashMap<String, ComponentReference>();
-            Map<String, ComponentProperty> componentProperties =
-                new HashMap<String, ComponentProperty>();
-            indexComponentPropertiesServicesAndReferences(component,
-                                                          componentServices,
-                                                          componentReferences,
-                                                          componentProperties);
-
-            // Reconcile component services/references/properties and
-            // implementation services/references and create component
-            // services/references/properties for the services/references
-            // declared by the implementation
-            reconcileServices(component, services, componentServices);
-            reconcileReferences(component, references, componentReferences);
-            reconcileProperties(component, properties, componentProperties);
-
-            // Configure or create callback services for component's references
-            // with callbacks
-            configureCallbackServices(component, componentServices);
-
-            // Configure or create callback references for component's services
-            // with callbacks
-            configureCallbackReferences(component, componentReferences);
-
-            // Create self references to the component's services
-//            if (!(component.getImplementation() instanceof Composite)) {
-//                createSelfReferences(component);
-//            }
-
-            // Initialize service bindings
-            for (ComponentService componentService : component.getServices()) {
-
-                // Create default SCA binding
-                if (componentService.getBindings().isEmpty()) {
-                    SCABinding scaBinding = createSCABinding();
-                    componentService.getBindings().add(scaBinding);
-                }
-/*
-                // Set binding names
-                for (Binding binding : componentService.getBindings()) {
-                    
-                    // Binding name defaults to the service name
-                    if (binding.getName() == null) {
-                        binding.setName(componentService.getName());
-                    }
-                }
-                if (componentService.getCallback() != null) {
-                    for (Binding binding : componentService.getCallback().getBindings()) {
-                        if (binding.getName() == null) {
-                            binding.setName(componentService.getName());
-                        }
-                    }
-                }
-*/
-            }
-
-            // Initialize reference bindings
-            for (ComponentReference componentReference : component.getReferences()) {
-
-                // Create default SCA binding
-                if (componentReference.getBindings().isEmpty()) {
-                    SCABinding scaBinding = createSCABinding();
-                    componentReference.getBindings().add(scaBinding);
-                }
-/*
-                // Set binding names
-                for (Binding binding : componentReference.getBindings()) {
-                    if (binding.getName() == null) {
-                        binding.setName(componentReference.getName());
-                    }
-                }
-                if (componentReference.getCallback() != null) {
-                    for (Binding binding : componentReference.getCallback().getBindings()) {
-                        if (binding.getName() == null) {
-                            binding.setName(componentReference.getName());
-                        }
-                    }
-                }
-*/
-            }
-        }
-    }
-
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-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, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Reconcile component properties and the properties defined by the
-     * component type.
-     * 
-     * @param component
-     * @param properties
-     * @param componentProperties
-     * @param problems
-     */
-    private void reconcileProperties(Component component,
-                                     Map<String, Property> properties,
-                                     Map<String, ComponentProperty> componentProperties) {
-
-        // Connect component properties to their properties
-        for (ComponentProperty componentProperty : component.getProperties()) {
-            Property property = properties.get(componentProperty.getName());
-            if (property != null) {
-                componentProperty.setProperty(property);
-            } else {
-                warning("PropertyNotFound", component, component.getName(), componentProperty.getName());
-            }
-        }
-
-        // Create component properties for all properties
-        if (component.getImplementation() != null) {
-            for (Property property : component.getImplementation().getProperties()) {
-                if (!componentProperties.containsKey(property.getName())) {
-                    ComponentProperty componentProperty = assemblyFactory.createComponentProperty();
-                    componentProperty.setName(property.getName());
-                    componentProperty.setMany(property.isMany());
-                    componentProperty.setXSDElement(property.getXSDElement());
-                    componentProperty.setXSDType(property.getXSDType());
-                    componentProperty.setProperty(property);
-                    component.getProperties().add(componentProperty);
-                }
-            }
-        }
-
-        // Reconcile component properties and their properties
-        for (ComponentProperty componentProperty : component.getProperties()) {
-            Property property = componentProperty.getProperty();
-            if (property != null) {
-
-                // Check that a component property does not override the
-                // mustSupply attribute
-                if (!property.isMustSupply() && componentProperty.isMustSupply()) {
-                    warning("PropertyMustSupplyIncompatible", component, component.getName(), componentProperty.getName());
-                }
-
-                // Default to the mustSupply attribute specified on the property
-                if (!componentProperty.isMustSupply())
-                    componentProperty.setMustSupply(property.isMustSupply());
-
-                // Default to the value specified on the property
-                if (componentProperty.getValue() == null) {
-                    componentProperty.setValue(property.getValue());
-                }
-                
-                // Override the property value for the composite
-                if(component.getImplementation() instanceof Composite) {
-                    property.setValue(componentProperty.getValue());
-                }
-
-                // Check that a value is supplied
-                if (componentProperty.getValue() == null && property.isMustSupply()) {
-                    warning("PropertyMustSupplyNull", component, component.getName(), componentProperty.getName());
-                }
-
-                // Check that a a component property does not override the
-                // many attribute
-                if (!property.isMany() && componentProperty.isMany()) {
-
-                    warning("PropertyOverrideManyAttribute", component, component.getName(), componentProperty.getName());
-                }
-
-                // Default to the many attribute defined on the property
-                componentProperty.setMany(property.isMany());
-
-                // Default to the type and element defined on the property
-                if (componentProperty.getXSDType() == null) {
-                    componentProperty.setXSDType(property.getXSDType());
-                }
-                if (componentProperty.getXSDElement() == null) {
-                    componentProperty.setXSDElement(property.getXSDElement());
-                }
-
-                // Check that a type or element are specified
-                if (componentProperty.getXSDElement() == null && componentProperty.getXSDType() == null) {
-                    warning("NoTypeForComponentProperty", component, component.getName(), componentProperty.getName());
-                }
-            }
-        }
-    }
-
-    /**
-     * Reconcile component references with the references defined on the
-     * component type.
-     * 
-     * @param component
-     * @param references
-     * @param componentReferences
-     * @param problems
-     */
-    private void reconcileReferences(Component component,
-                                     Map<String, Reference> references,
-                                     Map<String, ComponentReference> componentReferences) {
-
-        // Connect each component reference to the corresponding reference
-        for (ComponentReference componentReference : component.getReferences()) {
-            if (componentReference.getReference() != null || componentReference.isCallback()) {
-                continue;
-            }
-            Reference reference = references.get(componentReference.getName());
-            if (reference != null) {
-                componentReference.setReference(reference);
-            } else {
-                if (!componentReference.getName().startsWith("$self$.")) {
-                    warning("ReferenceNotFound", component, component.getName(), componentReference.getName());
-                }
-            }
-        }
-
-        // Create a component reference for each reference
-        if (component.getImplementation() != null) {
-            for (Reference reference : component.getImplementation().getReferences()) {
-                if (!componentReferences.containsKey(reference.getName())) {
-                    ComponentReference componentReference =
-                        assemblyFactory.createComponentReference();
-                    componentReference.setIsCallback(reference.isCallback());
-                    componentReference.setName(reference.getName());
-                    componentReference.setReference(reference);
-                    component.getReferences().add(componentReference);
-                }
-            }
-        }
-
-        // Reconcile each component reference with its reference
-        for (ComponentReference componentReference : component.getReferences()) {
-            Reference reference = componentReference.getReference();
-            if (reference != null) {
-                // Reconcile multiplicity
-                if (componentReference.getMultiplicity() != null) {
-                    if (!ReferenceConfigurationUtil.isValidMultiplicityOverride(reference.getMultiplicity(),
-                                                                   componentReference
-                                                                       .getMultiplicity())) {
-                        warning("ReferenceIncompatibleMultiplicity", component, component.getName(), componentReference.getName());
-                    }
-                } else {
-                    componentReference.setMultiplicity(reference.getMultiplicity());
-                }
-
-                // Reconcile interface
-                InterfaceContract interfaceContract = reference.getInterfaceContract();
-                if (componentReference.getInterfaceContract() != null) {
-                    if (interfaceContract != null && !componentReference.getInterfaceContract().equals(reference
-                        .getInterfaceContract())) {
-                        if (!interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(),
-                                                                  interfaceContract)) {
-                            warning("ReferenceIncompatibleComponentInterface", component, component.getName(), componentReference.getName());
-                        }
-                    }
-                } else {
-                    componentReference.setInterfaceContract(interfaceContract);
-                }
-
-                // Reconcile bindings 
-                if (componentReference.getBindings().isEmpty()) {
-                    componentReference.getBindings().addAll(reference.getBindings());
-                }
-                
-                // Reconcile callback bindings
-                if (componentReference.getCallback() == null) {
-                    componentReference.setCallback(reference.getCallback());
-                    if (componentReference.getCallback() == null) {
-                        // Create an empty callback to avoid null check
-                        componentReference.setCallback(assemblyFactory.createCallback());
-                    }
-
-                } else if (componentReference.getCallback().getBindings().isEmpty() && reference
-                    .getCallback() != null) {
-                    componentReference.getCallback().getBindings().addAll(reference.getCallback()
-                        .getBindings());
-                }
-                
-                // Propagate autowire setting from the component
-                if (componentReference.getAutowire() == null) {
-                    componentReference.setAutowire(component.getAutowire());
-                }
-
-                // Reconcile targets
-                if (componentReference.getTargets().isEmpty()) {
-                    componentReference.getTargets().addAll(reference.getTargets());
-                }
-            }
-        }
-    }
-
-    /**
-     * Reconcile component services and services defined on the component type.
-     * 
-     * @param component
-     * @param services
-     * @param componentServices
-     * @param problems
-     */
-    private void reconcileServices(Component component,
-                                   Map<String, Service> services,
-                                   Map<String, ComponentService> componentServices) {
-
-        // Connect each component service to the corresponding service
-        for (ComponentService componentService : component.getServices()) {
-            if (componentService.getService() != null || componentService.isCallback()) {
-                continue;
-            }
-            Service service = services.get(componentService.getName());
-            if (service != null) {
-                componentService.setService(service);
-            } else {
-                warning("ServiceNotFoundForComponentService", component, component.getName(), componentService.getName());
-            }
-        }
-
-        // Create a component service for each service
-        if (component.getImplementation() != null) {
-            for (Service service : component.getImplementation().getServices()) {
-                if (!componentServices.containsKey(service.getName())) {
-                    ComponentService componentService = assemblyFactory.createComponentService();
-                    componentService.setIsCallback(service.isCallback());
-                    String name = service.getName();
-                    componentService.setName(name);
-                    componentService.setService(service);
-                    component.getServices().add(componentService);
-                    componentServices.put(name, componentService);
-                }
-            }
-        }
-
-        //Reconcile each component service with its service
-        for (ComponentService componentService : component.getServices()) {
-            Service service = componentService.getService();
-            if (service != null) {
-                // Reconcile interface
-                InterfaceContract interfaceContract = service.getInterfaceContract();
-                if (componentService.getInterfaceContract() != null) {
-                    if (interfaceContract != null && !componentService.getInterfaceContract().equals(interfaceContract)) {
-                        if (!interfaceContractMapper.isCompatible(componentService.getInterfaceContract(),
-                                                                  interfaceContract)) {
-                            warning("ServiceIncompatibleComponentInterface", component, component.getName(), componentService.getName());
-                        }
-                    }
-                } else {
-                    componentService.setInterfaceContract(interfaceContract);
-                }
-
-                // Reconcile bindings
-                if (componentService.getBindings().isEmpty()) {
-                    componentService.getBindings().addAll(service.getBindings());
-                }
-                
-                // Reconcile callback bindings
-                if (componentService.getCallback() == null) {
-                    componentService.setCallback(service.getCallback());
-                    if (componentService.getCallback() == null) {
-                        // Create an empty callback to avoid null check
-                        componentService.setCallback(assemblyFactory.createCallback());
-                    }
-                } else if (componentService.getCallback().getBindings().isEmpty() && service
-                    .getCallback() != null) {
-                    componentService.getCallback().getBindings().addAll(service.getCallback()
-                        .getBindings());
-                }
-            }
-        }
-    }
-
-    private void indexComponentPropertiesServicesAndReferences(Component component,
-                                                               Map<String, ComponentService> componentServices,
-                                                               Map<String, ComponentReference> componentReferences,
-                                                               Map<String, ComponentProperty> componentProperties) {
-        for (ComponentService componentService : component.getServices()) {
-            if (componentServices.containsKey(componentService.getName())) {
-                warning("DuplicateComponentServiceName", component, component.getName(), componentService.getName());
-            } else {
-                componentServices.put(componentService.getName(), componentService);
-            }
-        }
-        for (ComponentReference componentReference : component.getReferences()) {
-            if (componentReferences.containsKey(componentReference.getName())) {
-                warning("DuplicateComponentReferenceName", component, component.getName(), componentReference.getName());
-            } else {
-                componentReferences.put(componentReference.getName(), componentReference);
-            }
-        }
-        for (ComponentProperty componentProperty : component.getProperties()) {
-            if (componentProperties.containsKey(componentProperty.getName())) {
-                warning("DuplicateComponentPropertyName", component, component.getName(), componentProperty.getName());
-            } else {
-                componentProperties.put(componentProperty.getName(), componentProperty);
-            }
-        }
-
-    }
-
-    private void indexImplementationPropertiesServicesAndReferences(Component component,
-                                                                    Map<String, Service> services,
-                                                                    Map<String, Reference> references,
-                                                                    Map<String, Property> properties) {
-        // First check that the component has a resolved implementation
-        Implementation implementation = component.getImplementation();
-        if (implementation == null) {
-            // A component must have an implementation
-            warning("NoComponentImplementation", component, component.getName());
-
-        } else if (implementation.isUnresolved()) {
-
-            // The implementation must be fully resolved
-            warning("UnresolvedComponentImplementation", component, component.getName(), implementation.getURI());
-
-        } else {
-
-            // Index properties, services and references, also check for
-            // duplicates
-            for (Property property : implementation.getProperties()) {
-                if (properties.containsKey(property.getName())) {
-                    warning("DuplicateImplementationPropertyName", component, component.getName(), property.getName());
-                } else {
-                    properties.put(property.getName(), property);
-                }
-            }
-            for (Service service : implementation.getServices()) {
-                if (services.containsKey(service.getName())) {
-                    warning("DuplicateImplementationServiceName", component, component.getName(), service.getName());
-                } else {
-                    services.put(service.getName(), service);
-                }
-            }
-            for (Reference reference : implementation.getReferences()) {
-                if (references.containsKey(reference.getName())) {
-                    warning("DuplicateImplementationReferenceName", component, component.getName(), reference.getName());
-                } else {
-                    references.put(reference.getName(), reference);
-                }
-            }
-        }
-
-    }
-
-    /**
-     * For all the references with callbacks, create a corresponding callback
-     * service.
-     * 
-     * @param component
-     */
-    private void configureCallbackServices(Component component,
-                                           Map<String, ComponentService> componentServices) {
-        for (ComponentReference reference : component.getReferences()) {
-            if (reference.getInterfaceContract() != null && // can be null in
-                                                            // unit tests
-            reference.getInterfaceContract().getCallbackInterface() != null) {
-                ComponentService service =
-                    componentServices.get(reference.getName());
-                if (service == null) {
-                    service = createCallbackService(component, reference);
-                }
-                if (reference.getCallback() != null) {
-                    if (service.getBindings().isEmpty()) {
-                        service.getBindings().addAll(reference.getCallback().getBindings());
-                    }
-                }
-                reference.setCallbackService(service);
-            }
-        }
-    }
-
-    /**
-     * Create a callback service for a component reference
-     * 
-     * @param component
-     * @param reference
-     */
-    private ComponentService createCallbackService(Component component, ComponentReference reference) {
-        ComponentService componentService = assemblyFactory.createComponentService();
-        componentService.setIsCallback(true);
-        componentService.setName(reference.getName());
-        try {
-            InterfaceContract contract =
-                (InterfaceContract)reference.getInterfaceContract().clone();
-            contract.setInterface(contract.getCallbackInterface());
-            contract.setCallbackInterface(null);
-            componentService.setInterfaceContract(contract);
-        } catch (CloneNotSupportedException e) {
-            // will not happen
-        }
-        Reference implReference = reference.getReference();
-        if (implReference != null) {
-            Service implService = assemblyFactory.createService();
-            implService.setName(implReference.getName());
-            try {
-                InterfaceContract implContract =
-                    (InterfaceContract)implReference.getInterfaceContract().clone();
-                implContract.setInterface(implContract.getCallbackInterface());
-                implContract.setCallbackInterface(null);
-                implService.setInterfaceContract(implContract);
-            } catch (CloneNotSupportedException e) {
-                // will not happen
-            }
-            componentService.setService(implService);
-        }
-        component.getServices().add(componentService);
-        return componentService;
-    }
-
-    /**
-     * For all the services with callbacks, create a corresponding callback
-     * reference.
-     * 
-     * @param component
-     */
-    private void configureCallbackReferences(Component component,
-                                             Map<String, ComponentReference> componentReferences) {
-        for (ComponentService service : component.getServices()) {
-            if (service.getInterfaceContract() != null && // can be null in
-                                                            // unit tests
-            service.getInterfaceContract().getCallbackInterface() != null) {
-                ComponentReference reference =
-                    componentReferences.get(service.getName());
-                if (reference == null) {
-                    reference = createCallbackReference(component, service);
-                }
-                if (service.getCallback() != null) {
-                    if (reference.getBindings().isEmpty()) {
-                        reference.getBindings().addAll(service.getCallback().getBindings());
-                    }
-                }
-                service.setCallbackReference(reference);
-            }
-        }
-    }
-
-    /**
-     * Create a callback reference for a component service
-     * 
-     * @param component
-     * @param service
-     */
-    private ComponentReference createCallbackReference(Component component, ComponentService service) {
-        ComponentReference componentReference = assemblyFactory.createComponentReference();
-        componentReference.setIsCallback(true);
-        componentReference.setName(service.getName());
-        try {
-            InterfaceContract contract = (InterfaceContract)service.getInterfaceContract().clone();
-            contract.setInterface(contract.getCallbackInterface());
-            contract.setCallbackInterface(null);
-            componentReference.setInterfaceContract(contract);
-        } catch (CloneNotSupportedException e) {
-            // will not happen
-        }
-        Service implService = service.getService();
-        if (implService != null) {
-            Reference implReference = assemblyFactory.createReference();
-            implReference.setName(implService.getName());
-            try {
-                InterfaceContract implContract =
-                    (InterfaceContract)implService.getInterfaceContract().clone();
-                implContract.setInterface(implContract.getCallbackInterface());
-                implContract.setCallbackInterface(null);
-                implReference.setInterfaceContract(implContract);
-            } catch (CloneNotSupportedException e) {
-                // will not happen
-            }
-            componentReference.setReference(implReference);
-        }
-        component.getReferences().add(componentReference);
-        return componentReference;
-    }
-
-    /**
-     * @param composite
-     */
-    private void configureSourcedProperties(Composite composite, List<ComponentProperty> propertySettings) {
-        // Resolve properties
-        Map<String, Property> compositeProperties = new HashMap<String, Property>();
-        ComponentProperty componentProperty = null;
-        for (Property p : composite.getProperties()) {
-            componentProperty = getComponentPropertyByName(p.getName(), propertySettings);
-            if (componentProperty != null) {
-                compositeProperties.put(p.getName(), componentProperty);
-            } else {
-                compositeProperties.put(p.getName(), p);
-            }
-        }
-    
-        for (Component component : composite.getComponents()) {
-            try {
-                PropertyConfigurationUtil.sourceComponentProperties(compositeProperties, component);
-            } catch (Exception e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            Implementation impl = component.getImplementation();
-            if (impl instanceof Composite) {
-                configureSourcedProperties((Composite)impl, component.getProperties());
-            }
-        }
-    }
-
-    private ComponentProperty getComponentPropertyByName(String propertyName, List<ComponentProperty> properties) {
-        if (properties != null) {
-            for (ComponentProperty aProperty : properties) {
-                if (aProperty.getName().equals(propertyName)) {
-                    return aProperty;
-                }
-            }
-        }
-        return null;
-    }
-    
-    private SCABinding createSCABinding() {
-        SCABinding scaBinding = scaBindingFactory.createSCABinding();
-        
-        // mark the bindings that are added automatically so that they can 
-        // be disregarded for overriding purposes
-        if (scaBinding instanceof AutomaticBinding){
-            ((AutomaticBinding)scaBinding).setIsAutomatic(true);
-        }
-        
-        if ( policyDefinitions != null ) {
-            for ( IntentAttachPointType attachPointType : policyDefinitions.getBindingTypes() ) {
-                if ( attachPointType.getName().equals(BINDING_SCA_QNAME)) {
-                    ((IntentAttachPoint)scaBinding).setType(attachPointType);
-                }
-            }
-        }
-        
-        return scaBinding;
-    }
-
-    /**
-     * Called by CompositeBindingURIBuilderImpl
-     *  
-     * @param composite the composite to be configured
-     */
-    protected void configureBindingURIsAndNames(Composite composite) throws CompositeBuilderException {
-        configureBindingURIs(composite, null, null);
-        configureBindingNames(composite);
-    }
-
-    /**
-     * Fully resolve the binding URIs based on available information. This includes information
-     * from the ".composite" files, from resources associated with the binding, e.g. WSDL files, 
-     * from any associated policies and from the default information for each binding type.
-     *  
-     * @param composite the composite to be configured
-     * @param defaultBindings list of default binding configurations
-     */
-    protected void configureBindingURIs(Composite composite, List<Binding> defaultBindings) throws CompositeBuilderException {
-        configureBindingURIs(composite, null, defaultBindings);
-    }
-       
-     /**
-      * Fully resolve the binding URIs based on available information. This includes information
-      * from the ".composite" files, from resources associated with the binding, e.g. WSDL files, 
-      * from any associated policies and from the default information for each binding type.
-      * 
-      * NOTE: This method repeats some of the processing performed by the configureComponents()
-      *       method above.  The duplication is needed because NodeConfigurationServiceImpl
-      *       calls this method without previously calling configureComponents().  In the
-      *       normal builder sequence used by CompositeBuilderImpl, both of these methods
-      *       are called.
-      *
-      * TODO: Share the URL calculation algorithm with the configureComponents() method above
-      *       although keeping the configureComponents() methods signature as is because when
-      *       a composite is actually build in a node the node default information is currently
-      *       available
-      *  
-      * @param composite the composite to be configured
-      * @param uri the path to the composite provided through any nested composite component implementations
-      * @param defaultBindings list of default binding configurations
-      */
-    private void configureBindingURIs(Composite composite, String uri, List<Binding> defaultBindings) throws CompositeBuilderException {
-        
-        String parentComponentURI = uri;
-        
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-
-            // Initialize component URI
-            String componentURI;
-            if (parentComponentURI == null) {
-                componentURI = component.getName();
-            } else {
-                componentURI = URI.create(parentComponentURI + '/').resolve(component.getName()).toString();
-            }
-            component.setURI(componentURI);
-
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // Process nested composite
-                configureBindingURIs((Composite)implementation, componentURI, defaultBindings);
-            }
-        }  
-        
-        // Initialize composite service binding URIs
-        List<Service> compositeServices = composite.getServices();
-        for (Service service : compositeServices) {
-            // Set default binding names 
-            
-            // Create default SCA binding
-            if (service.getBindings().isEmpty()) {
-                SCABinding scaBinding = createSCABinding();
-                service.getBindings().add(scaBinding);
-            }
-    
-            // Initialize binding names and URIs
-            for (Binding binding : service.getBindings()) {  
-                constructBindingName(service, binding);
-                constructBindingURI(parentComponentURI, composite, service, binding, defaultBindings);
-            }
-        }
-        
-        // Initialize component service binding URIs
-        for (Component component : composite.getComponents()) {
-            
-            // Index properties, services and references
-            Map<String, Service> services = new HashMap<String, Service>();
-            Map<String, Reference> references = new HashMap<String, Reference>();
-            Map<String, Property> properties = new HashMap<String, Property>();
-            indexImplementationPropertiesServicesAndReferences(component,
-                                                               services,
-                                                               references,
-                                                               properties);
-
-            // Index component services, references and properties
-            // Also check for duplicates
-            Map<String, ComponentService> componentServices =
-                new HashMap<String, ComponentService>();
-            Map<String, ComponentReference> componentReferences =
-                new HashMap<String, ComponentReference>();
-            Map<String, ComponentProperty> componentProperties =
-                new HashMap<String, ComponentProperty>();
-            indexComponentPropertiesServicesAndReferences(component,
-                                                          componentServices,
-                                                          componentReferences,
-                                                          componentProperties);
-
-            // Reconcile component services/references/properties and
-            // implementation services/references and create component
-            // services/references/properties for the services/references
-            // declared by the implementation
-            reconcileServices(component, services, componentServices);
-            reconcileReferences(component, references, componentReferences);
-            reconcileProperties(component, properties, componentProperties);
-            
-            for (ComponentService service : component.getServices()) {
-    
-                // Create default SCA binding
-                if (service.getBindings().isEmpty()) {
-                    SCABinding scaBinding = createSCABinding();
-                    service.getBindings().add(scaBinding);
-                }
-    
-                // Initialize binding names and URIs
-                for (Binding binding : service.getBindings()) {
-                    
-                    constructBindingName(service, binding);
-                    constructBindingURI(component, service, binding, defaultBindings);
-                }
-            } 
-        }
-    }
-
-    /**
-     * Add default names for callback bindings and reference bindings.  Needs to be
-     * separate from configureBindingURIs() because configureBindingURIs() is called
-     * by NodeConfigurationServiceImpl as well as by CompositeBuilderImpl.
-     */
-    private void configureBindingNames(Composite composite) {
-        
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // Process nested composite
-                configureBindingNames((Composite)implementation);
-            }
-        }  
-        
-        // Initialize composite service callback binding names
-        for (Service service : composite.getServices()) {
-
-            if (service.getCallback() != null) {
-                for (Binding binding : service.getCallback().getBindings()) {
-                    constructBindingName(service, binding);
-                }
-            }
-        }
-        
-        // Initialize composite reference binding names
-        for (Reference reference : composite.getReferences()) {
-
-            for (Binding binding : reference.getBindings()) {  
-                constructBindingName(reference, binding);
-            }
-
-            if (reference.getCallback() != null) {
-                for (Binding binding : reference.getCallback().getBindings()) {
-                    constructBindingName(reference, binding);
-                }
-            }
-        }
-        
-        // Initialize component service and reference binding names
-        for (Component component : composite.getComponents()) {
-
-            // Initialize component service callback binding names
-            for (ComponentService service : component.getServices()) {
-
-                if (service.getCallback() != null) {
-                    for (Binding binding : service.getCallback().getBindings()) {
-                        constructBindingName(service, binding);
-                    }
-                }
-            } 
-        
-            // Initialize component reference binding names
-            for (ComponentReference reference : component.getReferences()) {
-
-                // Initialize binding names
-                for (Binding binding : reference.getBindings()) {  
-                    constructBindingName(reference, binding);
-                }
-
-                if (reference.getCallback() != null) {
-                    for (Binding binding : reference.getCallback().getBindings()) {
-                        constructBindingName(reference, binding);
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * If a binding name is not provided by the user, construct it based on the service
-     * or reference name
-     * 
-     * @param contract the service or reference
-     * @param binding
-     */
-    private void constructBindingName(Contract contract, Binding binding) {
-        
-        // set the default binding name if one is required        
-        // if there is no name on the binding then set it to the service or reference name 
-        if (binding.getName() == null){
-            binding.setName(contract.getName());
-        }
-            
-        // Check that multiple bindings do not have the same name
-        for (Binding otherBinding : contract.getBindings()) {
-            if (otherBinding == binding) {
-                // Skip the current binding
-                continue;
-            }
-            if (binding.getClass() != otherBinding.getClass()) {
-                // Look for a binding of the same type
-                continue;
-            }
-            if (binding.getName().equals(otherBinding.getName())) {
-                warning(contract instanceof Service ? "MultipleBindingsForService" : "MultipleBindingsForReference",
-                        binding, contract.getName(), binding.getName());
-            }
-        }
-    }
-
-    /**
-     * URI construction for composite bindings based on Assembly Specification section 1.7.2, This method
-     * assumes that the component URI part of the binding URI is formed from the part to the 
-     * composite in question and just calls the generic constructBindingURI method with this 
-     * information
-     * 
-     * @param parentComponentURI
-     * @param composite
-     * @param service
-     * @param binding
-     * @param defaultBindings
-     */
-    private void constructBindingURI(String parentComponentURI, Composite composite, Service service, Binding binding, List<Binding> defaultBindings) 
-    throws CompositeBuilderException{
-        // This is a composite service so there is no component to provide a component URI
-        // The path to this composite (through nested composites) is used.
-        boolean includeBindingName = composite.getServices().size() != 1;
-        constructBindingURI(parentComponentURI, service, binding, includeBindingName, defaultBindings);
-    }
-
-     /**
-      * URI construction for component bindings based on Assembly Specification section 1.7.2. This method
-      * calculates the component URI part based on component information before calling the generic
-      * constructBindingURI method
-      *
-      * @param component the component that holds the service
-      * @param service the service that holds the binding
-      * @param binding the binding for which the URI is being constructed
-      * @param defaultBindings the list of default binding configurations
-      */
-    private void constructBindingURI(Component component, Service service, Binding binding, List<Binding> defaultBindings)
-        throws CompositeBuilderException{
-        boolean includeBindingName = component.getServices().size() != 1;
-        constructBindingURI(component.getURI(), service, binding, includeBindingName, defaultBindings);
-    }
-            
-    /**
-     * Generic URI construction for bindings based on Assembly Specification section 1.7.2
-     * 
-     * @param componentURIString the string version of the URI part that comes from the component name
-     * @param service the service in question
-     * @param binding the binding for which the URI is being constructed
-     * @param includeBindingName when set true the serviceBindingURI part should be used
-     * @param defaultBindings the list of default binding configurations
-     * @throws CompositeBuilderException
-     */
-    private void constructBindingURI(String componentURIString, Service service, Binding binding, boolean includeBindingName, List<Binding> defaultBindings) 
-        throws CompositeBuilderException{
-        
-        try {
-            // calculate the service binding URI
-            URI bindingURI;
-            if (binding.getURI() != null){
-                bindingURI = new URI(binding.getURI());
-
-                // if the user has provided an absolute binding URI then use it
-                if (bindingURI.isAbsolute()){
-                    binding.setURI(bindingURI.toString());
-                    return;
-                }
-            } else {
-                bindingURI = null;
-            }
-            
-            // Get the service binding name
-            URI bindingName;
-            if (binding.getName() != null) {
-                bindingName = new URI(binding.getName());
-            } else {
-                bindingName = new URI("");
-            }
-            
-            // calculate the component URI  
-            URI componentURI;
-            if (componentURIString != null) {
-                componentURI = new URI(addSlashToPath(componentURIString));
-            } else {
-                componentURI = null;
-            }
-            
-            // if the user has provided an absolute component URI then use it
-            if (componentURI != null && componentURI.isAbsolute()){
-                binding.setURI(constructBindingURI(null, componentURI, bindingURI, includeBindingName, bindingName));
-                return;
-            }         
-            
-            // calculate the base URI
-            
-            // get the protocol for this binding/URI
-/* some code that allows binding specific code to run. Being discussed on ML            
-            BindingURICalculator uriCalculator = bindingURICalcualtorExtensionPoint.getBindingURICalculator(binding);
-            
-            if  (uriCalculator != null){
-                String protocol = uriCalculator.getProtocol(binding);
-                
-                // find the default binding with the right protocol
-                Binding defaultBinding = nodeInfo.getBindingDefault(binding, protocol);
-                
-                if (defaultBinding != null){
-                    baseURI = new URI(defaultBinding.getURI());
-                } else {
-                    baseURI = null;
-                }
-                
-            } else {
-                baseURI = null;
-            }
-*/
-            // as a simpler alternative to the above commented out code. 
-            URI baseURI = null;
-            if (defaultBindings != null) {
-                for (Binding defaultBinding : defaultBindings){
-                    if (binding.getClass() == defaultBinding.getClass()){
-                        baseURI = new URI(addSlashToPath(defaultBinding.getURI()));
-                        break;
-                    }
-                }
-            }
-            
-            binding.setURI(constructBindingURI(baseURI, componentURI, bindingURI, includeBindingName, bindingName));
-        } catch (URISyntaxException ex) {
-            error("URLSyntaxException", binding, componentURIString, service.getName(), binding.getName());
-        }      
-    }
-    
-    /**
-     * Use to ensure that URI paths end in "/" as here we want to maintain the
-     * last path element of an base URI when other URI are resolved against it. This is
-     * not the default behaviour of URI resolution as defined in RFC 2369
-     * 
-     * @param path the path string to which the "/" is to be added
-     * @return the resulting path with a "/" added if it not already there
-     */
-    private static String addSlashToPath(String path){
-        if (path.endsWith("/") || path.endsWith("#")){
-            return path;
-        } else {
-            return path + "/";
-        }
-    }
-    
-    /**
-     * Concatenate binding URI parts together based on Assembly Specification section 1.7.2
-     * 
-     * @param baseURI the base of the binding URI
-     * @param componentURI the middle part of the binding URI derived from the component name
-     * @param bindingURI the end part of the binding URI
-     * @param includeBindingName when set true the binding name part should be used
-     * @param bindingName the binding name
-     * @return the resulting URI as a string
-     */
-    private static String constructBindingURI(URI baseURI, URI componentURI, URI bindingURI, boolean includeBindingName, URI bindingName){        
-        String uriString;
-        
-        if (baseURI == null) {
-            if (componentURI == null){
-                if (bindingURI != null ) {
-                    uriString = bindingURI.toString();
-                } else {
-                    uriString = bindingName.toString();
-                }
-            } else {
-                if (bindingURI != null ) {
-                    uriString = componentURI.resolve(bindingURI).toString();
-                } else {
-                    if (includeBindingName) {
-                        uriString = componentURI.resolve(bindingName).toString();
-                    } else {
-                        uriString = componentURI.toString();
-                    }
-                }
-            }
-        } else {
-            if (componentURI == null) {
-                if (bindingURI != null ) {
-                    uriString = basedURI(baseURI, bindingURI).toString();
-                } else {
-                    if (includeBindingName) {
-                        uriString = basedURI(baseURI, bindingName).toString();
-                    } else {
-                        uriString = baseURI.toString();
-                    }
-                }
-            } else {
-                if (bindingURI != null ) {
-                    uriString = basedURI(baseURI, componentURI.resolve(bindingURI)).toString();
-                } else {
-                    if (includeBindingName) {
-                        uriString = basedURI(baseURI, componentURI.resolve(bindingName)).toString();
-                    } else {
-                        uriString = basedURI(baseURI, componentURI).toString();
-                    }
-                }
-            }
-        }
-        
-        // tidy up by removing any trailing "/"
-        if (uriString.endsWith("/")){
-            uriString = uriString.substring(0, uriString.length()-1);   
-        }
-        
-        URI uri = URI.create(uriString);
-        if (!uri.isAbsolute()) {
-            uri = URI.create("/").resolve(uri);
-        }
-        return uri.toString();
-    }
-
-    /**
-     * Combine a URI with a base URI.
-     * 
-     * @param baseURI
-     * @param uri
-     * @return
-     */
-    private static URI basedURI(URI baseURI, URI uri) {
-        if (uri.getScheme() != null) {
-            return uri;
-        }
-        String str = uri.toString();
-        if (str.startsWith("/")) {
-            str = str.substring(1);
-        }
-        return URI.create(baseURI.toString() + str).normalize();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
deleted file mode 100644
index 0c2d02ab48..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
+++ /dev/null
@@ -1,1149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.builder.impl;
-
-import java.net.URI;
-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.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.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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-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.assembly.Wire;
-import org.apache.tuscany.sca.assembly.builder.DefaultEndpointBuilder;
-import org.apache.tuscany.sca.assembly.builder.EndpointBuilder;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-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.util.PolicyComputationUtils;
-
-/**
- * A composite builder that handles wiring inside a composite.
- *
- * @version $Rev$ $Date$
- */
-class BaseWireBuilderImpl {
-
-    private Monitor monitor;
-    private AssemblyFactory assemblyFactory;
-    private EndpointFactory endpointFactory;
-    private InterfaceContractMapper interfaceContractMapper;
-    private EndpointBuilder endpointBuilder;
-    
-    
-    protected BaseWireBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, InterfaceContractMapper interfaceContractMapper, Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.endpointFactory = endpointFactory;
-        this.interfaceContractMapper = interfaceContractMapper;
-        this.monitor = monitor;
-        this.endpointBuilder = new DefaultEndpointBuilder(monitor);
-        
-    }
-    
-    /**
-     * Wire component references to component services and connect promoted
-     * services/references to component services/references inside a composite.
-     * 
-     * @param composite
-     */
-    protected void wireComponentReferences(Composite composite) {
-
-        // Wire nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                wireComponentReferences((Composite)implementation);
-            }
-        }
-
-        // Index components, services and references
-        Map<String, Component> components = new HashMap<String, Component>();
-        Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
-        Map<String, ComponentReference> componentReferences = new HashMap<String, ComponentReference>();
-        indexComponentsServicesAndReferences(composite, components, componentServices, componentReferences);
-
-        // Connect composite services and references to the component
-        // services and references that they promote
-        //connectCompositeServices(composite, components, componentServices);
-        //connectCompositeReferences(composite, componentReferences);
-
-        // Compute the policies before connecting component references
-        //computePolicies(composite);
-
-        // Connect component references as described in wires
-        connectWires(composite, componentServices, componentReferences);
-
-        // Connect component references to their targets
-        connectComponentReferences(composite, components, componentServices, componentReferences);
-
-        // Validate that references are wired or promoted, according
-        // to their multiplicity
-        for (ComponentReference componentReference : componentReferences.values()) {
-            if (!ReferenceConfigurationUtil.validateMultiplicityAndTargets(componentReference.getMultiplicity(), componentReference
-                .getTargets(), componentReference.getBindings())) {
-                if (componentReference.getTargets().isEmpty()) {
-
-                    // No warning if the reference is promoted out of the current composite
-                    boolean promoted = false;
-                    for (Reference reference : composite.getReferences()) {
-                        CompositeReference compositeReference = (CompositeReference)reference;
-                        if (compositeReference.getPromotedReferences().contains(componentReference)) {
-                            promoted = true;
-                            break;
-                        }
-                    }
-                    if (!promoted && !componentReference.isCallback()) {
-                        warning("ReferenceWithoutTargets", composite, composite.getName().toString(), componentReference.getName());
-                    }
-                } else {
-                    warning("TooManyReferenceTargets", composite, componentReference.getName());
-                }
-            }
-        }
-        
-        // Finally clear the original reference target lists as we now have
-        // bindings to represent the targets
-        for (ComponentReference componentReference : componentReferences.values()) {
-            componentReference.getTargets().clear();
-        }
-    }
-    
-    /**
-     * Index components, services and references inside a composite.
-     * @param composite
-     * @param components
-     * @param componentServices
-     * @param componentReferences
-     */
-    private void indexComponentsServicesAndReferences(Composite composite,
-                                              Map<String, Component> components,
-                                              Map<String, ComponentService> componentServices,
-                                              Map<String, ComponentReference> componentReferences) {
-
-        for (Component component : composite.getComponents()) {
-            
-            // Index components by name
-            components.put(component.getName(), component);
-            
-            ComponentService nonCallbackService = null;
-            int nonCallbackServices = 0;
-            for (ComponentService componentService : component.getServices()) {
-                                  
-                // Index component services by component name / service name
-                String uri = component.getName() + '/' + componentService.getName();
-                componentServices.put(uri, componentService);
-                
-                boolean promotedService = false;
-                if (componentService.getName() != null && componentService.getName().indexOf("$promoted$") > -1) {
-                    promotedService = true;
-                }
-                
-                // count how many non-callback, non-promoted services there are
-                // if there is only one the component name also acts as the service name
-                if ((!componentService.isCallback()) && (!promotedService)) {                            
-                    
-                    // Check how many non callback non-promoted services we have
-                    if (nonCallbackServices == 0) {
-                        nonCallbackService = componentService;
-                    }
-                    nonCallbackServices++;
-                }
-
-            }
-            
-            if (nonCallbackServices == 1) {
-                // If we have a single non callback service, index it by
-                // component name as well
-                componentServices.put(component.getName(), nonCallbackService);
-            }
-            
-            // Index references by component name / reference name
-            for (ComponentReference componentReference : component.getReferences()) {
-                String uri = component.getName() + '/' + componentReference.getName();
-                componentReferences.put(uri, componentReference);
-            }
-        }
-    }
-
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, 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 = null;
-            problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Connect composite references and services to the reference and services that they promote.
-     * 
-     * @param composite
-     * @param componentServices
-     * @param problems
-     */
-    protected void connectCompositeReferencesAndServices(Composite composite){
-        // Wire nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                connectCompositeReferencesAndServices((Composite)implementation);
-            }
-        }
-
-        // Index components, services and references
-        Map<String, Component> components = new HashMap<String, Component>();
-        Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
-        Map<String, ComponentReference> componentReferences = new HashMap<String, ComponentReference>();
-        indexComponentsServicesAndReferences(composite, components, componentServices, componentReferences);
-
-        // Connect composite services and references to the component
-        // services and references that they promote
-        connectCompositeServices(composite, components, componentServices);
-        connectCompositeReferences(composite, componentReferences);
-    }
-            
-    /**
-     * Connect composite services to the component services that they promote.
-     * 
-     * @param composite
-     * @param componentServices
-     * @param problems
-     */
-    private void connectCompositeServices(Composite composite,
-                                          Map<String, Component> components,
-                                          Map<String, ComponentService> componentServices) {
-    
-        // Propagate interfaces from inner composite components' services to
-        // their component services
-        for (Component component : composite.getComponents()) {
-            if (component.getImplementation() instanceof Composite) {
-                for (ComponentService componentService : component.getServices()) {
-                    Service service = componentService.getService();
-                    if (service != null) {
-                        if (componentService.getInterfaceContract() == null) {
-                            componentService.setInterfaceContract(service.getInterfaceContract());
-                        }
-                    }
-                }
-            }
-        }
-    
-        // Connect composite services to the component services that they
-        // promote
-        for (Service service : composite.getServices()) {
-            CompositeService compositeService = (CompositeService)service;
-            ComponentService componentService = compositeService.getPromotedService();
-            if (componentService != null && componentService.isUnresolved()) {
-                
-                String promotedComponentName = compositeService.getPromotedComponent().getName(); 
-                String promotedServiceName;
-                if (componentService.getName() != null) {
-                    promotedServiceName = promotedComponentName + '/' + componentService.getName();
-                } else {
-                    promotedServiceName = promotedComponentName;
-                }
-                ComponentService promotedService = componentServices.get(promotedServiceName);
-                if (promotedService != null) {
-    
-                    // Point to the resolved component
-                    Component promotedComponent = components.get(promotedComponentName);
-                    compositeService.setPromotedComponent(promotedComponent);
-                    
-                    // Point to the resolved component service
-                    compositeService.setPromotedService(promotedService);
-    
-                    // Use the interface contract from the component service if
-                    // none is specified on the composite service
-                    InterfaceContract compositeServiceInterfaceContract = compositeService.getInterfaceContract();
-                    InterfaceContract promotedServiceInterfaceContract = promotedService.getInterfaceContract();
-                    if (compositeServiceInterfaceContract == null) {
-                        compositeService.setInterfaceContract(promotedServiceInterfaceContract);
-                    } else if (promotedServiceInterfaceContract != null) {
-                    	// Check the compositeServiceInterfaceContract and promotedServiceInterfaceContract
-                    	boolean isCompatible = interfaceContractMapper.isCompatible(compositeServiceInterfaceContract, promotedServiceInterfaceContract);
-                    	if(!isCompatible){
-                    	    warning("ServiceInterfaceNotSubSet", compositeService, promotedServiceName);
-                    	}
-                    }
-    
-                } else {
-                    warning("PromotedServiceNotFound", composite, composite.getName().toString(), promotedServiceName);
-                }
-            }
-        }
-    
-    }
-
-    /**
-     * Resolves promoted references.
-     * 
-     * @param composite
-     * @param componentReferences
-     * @param problems
-     */
-    private void connectCompositeReferences(Composite composite, Map<String, ComponentReference> componentReferences) {
-    
-        // Propagate interfaces from inner composite components' references to
-        // their component references
-        for (Component component : composite.getComponents()) {
-            if (component.getImplementation() instanceof Composite) {
-                for (ComponentReference componentReference : component.getReferences()) {
-                    Reference reference = componentReference.getReference();
-                    if (reference != null) {
-                        if (componentReference.getInterfaceContract() == null) {
-                            componentReference.setInterfaceContract(reference.getInterfaceContract());
-                        }
-                    }
-                }
-            }
-        }
-    
-        // Connect composite references to the component references
-        // that they promote
-        for (Reference reference : composite.getReferences()) {
-            CompositeReference compositeReference = (CompositeReference)reference;
-            List<ComponentReference> promotedReferences = compositeReference.getPromotedReferences();
-            for (int i = 0, n = promotedReferences.size(); i < n; i++) {
-                ComponentReference componentReference = promotedReferences.get(i);
-                if (componentReference.isUnresolved()) {
-                    String componentReferenceName = componentReference.getName();
-                    componentReference = componentReferences.get(componentReferenceName);
-                    if (componentReference != null) {
-    
-                        // Point to the resolved component reference
-                        promotedReferences.set(i, componentReference);
-    
-                        // Use the interface contract from the component
-                        // reference if none
-                        // is specified on the composite reference
-                        
-                        InterfaceContract compositeReferenceInterfaceContract = compositeReference.getInterfaceContract();
-                        InterfaceContract componentReferenceInterfaceContract = componentReference.getInterfaceContract();
-                        if (compositeReferenceInterfaceContract == null) {
-                            compositeReference.setInterfaceContract(componentReferenceInterfaceContract);
-                        } else if (componentReferenceInterfaceContract != null) {
-                        	// Check the compositeInterfaceContract and componentInterfaceContract
-                        	boolean isCompatible = interfaceContractMapper.isCompatible(compositeReferenceInterfaceContract, componentReferenceInterfaceContract);
-                        	if (!isCompatible) {
-                        	    warning("ReferenceInterfaceNotSubSet", compositeReference, componentReferenceName);
-                        	}
-                        }
-                    } else {
-                        warning("PromotedReferenceNotFound", composite, composite.getName().toString(), componentReferenceName);
-                    }
-                }
-            }
-        }
-    }
-    
-    private List<Endpoint> createComponentReferenceTargets(Composite composite,
-                                                           Map<String, Component> components,
-                                                           Map<String, ComponentService> componentServices,
-                                                          ComponentReference componentReference) {
-
-        List<Endpoint> endpoints = new ArrayList<Endpoint>();
-        
-        if (componentReference.getAutowire() == Boolean.TRUE) {
-
-            // Find suitable targets in the current composite for an
-            // autowired reference
-            Multiplicity multiplicity = componentReference.getMultiplicity();
-            for (Component targetComponent : composite.getComponents()) {
-                // prevent autowire connecting to self
-                boolean skipSelf = false;
-                for (ComponentReference targetComponentReference : targetComponent.getReferences()) {
-                    if (componentReference == targetComponentReference){
-                        skipSelf = true;
-                    }
-                }
-                
-                if (!skipSelf){
-                    for (ComponentService targetComponentService : targetComponent.getServices()) {
-                        if (componentReference.getInterfaceContract() == null ||
-                            interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(), targetComponentService.getInterfaceContract())) {
-                            
-                            Endpoint endpoint = endpointFactory.createEndpoint();
-                            endpoint.setTargetName(targetComponent.getName());
-                            endpoint.setSourceComponent(null); // TODO - fixed up at start
-                            endpoint.setSourceComponentReference(componentReference);
-                            endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                            endpoint.setTargetComponent(targetComponent);
-                            endpoint.setTargetComponentService(targetComponentService);
-                            endpoint.getCandidateBindings().addAll(componentReference.getBindings());
-                            endpoints.add(endpoint);
-                            
-                            if (multiplicity == Multiplicity.ZERO_ONE || multiplicity == Multiplicity.ONE_ONE) {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            
-            if (multiplicity == Multiplicity.ONE_N || multiplicity == Multiplicity.ONE_ONE) {
-                if (endpoints.size() == 0) {
-                    warning("NoComponentReferenceTarget", componentReference, componentReference.getName());
-                }
-            }
-
-        } else if (!componentReference.getTargets().isEmpty()) {
-        	
-               // Check if the component reference does not mix the use of endpoints specified via 
-               // binding elements with target endpoints specified via the target attribute
-               for (Binding binding : componentReference.getBindings()) {
-        	    if (binding.getURI() != null) {
-        	        warning("ReferenceEndPointMixWithTarget", composite, componentReference.getName());
-        	    }
-        	}
-
-            // Resolve targets specified on the component reference
-            for (ComponentService componentService : componentReference.getTargets()) {
-                
-                // Resolve the target component and service
-                String name = componentService.getName();
-                ComponentService targetComponentService = componentServices.get(name);
-                Component targetComponent;
-                int s = name.indexOf('/');
-                if (s == -1) {
-                    targetComponent = components.get(name);
-                } else {
-                    targetComponent = components.get(name.substring(0, s));
-                }
-                
-                if (targetComponentService != null) {
-
-                    // Check that the target component service provides
-                    // a superset of the component reference interface
-                    if (componentReference.getInterfaceContract() == null ||
-                        interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(), targetComponentService.getInterfaceContract())) {
-
-                        Endpoint endpoint = endpointFactory.createEndpoint();
-                        endpoint.setTargetName(targetComponent.getName());
-                        endpoint.setSourceComponent(null); // TODO - fixed up at start
-                        endpoint.setSourceComponentReference(componentReference);     
-                        endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                        endpoint.setTargetComponent(targetComponent);
-                        endpoint.setTargetComponentService(targetComponentService);
-                        endpoint.getCandidateBindings().addAll(componentReference.getBindings());
-                        endpoints.add(endpoint);
-
-                        // mark the reference target as resolved. Used later when we are looking to 
-                        // see if an sca binding is associated with a resolved target or not
-                        componentService.setUnresolved(false);
-                    } else {
-                        warning("ReferenceIncompatibleInterface", composite, composite.getName().toString(), 
-                        		                    componentReference.getName(), componentService.getName());
-                    }
-                } else {
-                    // add all the reference bindings into the target so that they
-                    // can be used for comparison when the target is resolved at runtime
-                    componentService.getBindings().addAll(componentReference.getBindings());
-                    
-                    Endpoint endpoint = endpointFactory.createEndpoint();
-                    endpoint.setTargetName(name);
-                    endpoint.setSourceComponent(null); // TODO - fixed up at start
-                    endpoint.setSourceComponentReference(componentReference);  
-                    endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                    endpoint.getCandidateBindings().addAll(componentReference.getBindings());
-                    endpoints.add(endpoint);
-                    
-                    // The bindings will be cloned back into the reference when the 
-                    // target is finally resolved. 
-                    warning("ComponentReferenceTargetNotFound", composite, 
-                    		composite.getName().toString(), componentService.getName());
-                }
-            }
-        } else if (componentReference.getReference() != null) {
-
-            // Resolve targets from the corresponding reference in the
-            // componentType
-            for (ComponentService componentService : componentReference.getReference().getTargets()) {
-
-                // Resolve the target component and service
-                String name = componentService.getName();
-                ComponentService targetComponentService = componentServices.get(name);
-                Component targetComponent;
-                int s = name.indexOf('/');
-                if (s == -1) {
-                    targetComponent = components.get(name);
-                } else {
-                    targetComponent = components.get(name.substring(0, s));
-                }
-                
-                if (targetComponentService != null) {
-
-                    // Check that the target component service provides
-                    // a superset of
-                    // the component reference interface
-                    if (componentReference.getInterfaceContract() == null ||
-                        interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(), targetComponentService.getInterfaceContract())) {
-
-                        Endpoint endpoint = endpointFactory.createEndpoint();
-                        endpoint.setTargetName(targetComponent.getName());
-                        endpoint.setSourceComponent(null); // TODO - fixed up at start
-                        endpoint.setSourceComponentReference(componentReference);  
-                        endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                        endpoint.setTargetComponent(targetComponent);
-                        endpoint.setTargetComponentService(targetComponentService);
-                        endpoint.getCandidateBindings().addAll(componentReference.getBindings());
-                        endpoints.add(endpoint);
-                        
-                        // mark the reference target as resolved. Used later when we are looking to 
-                        // see if an sca binding is associated with a resolved target or not
-                        componentService.setUnresolved(false);
-                    } else {
-                        warning("ComponentIncompatibleInterface", composite, 
-                        		componentReference.getName(), componentService.getName());
-                    }
-                } else {
-                    // add all the reference bindings into the target so that they
-                    // can be used for comparison when the target is resolved at runtime
-                    componentService.getBindings().addAll(componentReference.getBindings());
-                    
-                    // The bindings will be cloned back into the reference when the 
-                    // target is finally resolved. 
-                    
-                    Endpoint endpoint = endpointFactory.createEndpoint();
-                    endpoint.setTargetName(name);
-                    endpoint.setSourceComponent(null); // TODO - fixed up at start
-                    endpoint.setSourceComponentReference(componentReference);  
-                    endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                    endpoint.getCandidateBindings().addAll(componentReference.getBindings());
-                    endpoints.add(endpoint);                    
-                    
-                    warning("ComponentReferenceTargetNotFound", composite, 
-                    		         composite.getName().toString(), componentService.getName());
-                }
-            }
-        } 
-            
-                
-        // if no endpoints have found so far retrieve any target names that are in binding URIs
-        if (endpoints.isEmpty()){
-            for (Binding binding : componentReference.getBindings()) {
-
-                String uri = binding.getURI();
-                
-                // user hasn't put a uri on the binding so it's not a target name
-                if (uri == null) {
-                    continue;
-                }
-                
-                // user might have put a local target name in the uri so get
-                // the path part and see if it refers to a target we know about
-                // - if it does the reference binding will be matched with a service binding
-                // - if it doesn't it is assumed to be an external reference
-                Component targetComponent = null;
-                ComponentService targetComponentService = null;
-                String path = null;
-                
-                try {
-                    path = URI.create(uri).getPath();
-                } catch(Exception ex){
-                    // just assume that no target is identified if
-                    // a URI related exception is thrown
-                }
-                
-                if (path != null) {
-                    if (path.startsWith("/")) {
-                        path = path.substring(1);
-                    }
-                                                   
-                    // Resolve the target component and service
-                    targetComponentService = componentServices.get(path);
-                    int s = path.indexOf('/');
-                    if (s == -1) {
-                        targetComponent = components.get(path);
-                    } else {
-                        targetComponent = components.get(path.substring(0, s));
-                    }
-                }
-
-                // if the path of the binding URI matches a component in the 
-                // composite then configure an endpoint with this component as the target
-                // if not then the binding URI will be assumed to reference an external service
-                if (targetComponentService != null) {
-
-                    // Check that the target component service provides
-                    // a superset of the component reference interface
-                    if (componentReference.getInterfaceContract() == null ||
-                        interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(), targetComponentService.getInterfaceContract())) {
-
-                        Endpoint endpoint = endpointFactory.createEndpoint();
-                        endpoint.setTargetName(targetComponent.getName());
-                        endpoint.setSourceComponent(null); // TODO - fixed up at start
-                        endpoint.setSourceComponentReference(componentReference); 
-                        endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                        endpoint.setTargetComponent(targetComponent);
-                        endpoint.setTargetComponentService(targetComponentService);
-                        endpoint.getCandidateBindings().add(binding);
-                        endpoints.add(endpoint);                        
-                    } else {
-                        warning("ReferenceIncompatibleInterface",
-                                composite,
-                                composite.getName().toString(),
-                                componentReference.getName(),
-                                uri);
-                    }
-                } else {
-                    
-                    // create endpoints for manually configured bindings
-                    Endpoint endpoint = endpointFactory.createEndpoint();
-                    endpoint.setTargetName(uri);
-                    endpoint.setSourceComponent(null); // TODO - fixed up at start
-                    endpoint.setSourceComponentReference(componentReference);   
-                    endpoint.setInterfaceContract(componentReference.getInterfaceContract());
-                    endpoint.setSourceBinding(binding);
-                    endpoints.add(endpoint); 
-                }
-            }
-        }
-
-        return endpoints;
-    }
-
-
-    /**
-     * Connect references to their targets.
-     * 
-     * @param composite
-     * @param componentServices
-     * @param componentReferences
-     * @param problems
-     */
-    private void connectComponentReferences(Composite composite,
-                                            Map<String, Component> components,
-                                            Map<String, ComponentService> componentServices,
-                                            Map<String, ComponentReference> componentReferences){
-               
-        for (ComponentReference componentReference : componentReferences.values()) {
-            
-            List<Endpoint> endpoints = createComponentReferenceTargets(composite, 
-                                                                       components, 
-                                                                       componentServices, 
-                                                                       componentReference);
-
-            componentReference.getEndpoints().addAll(endpoints);
-            
-            // the result of calculating the endpoints is either that bindings have been 
-            // configured manually using a URI or that targets have been provided and the 
-            // endpoint remains unresolved. So all endpoints should be either resved or uresolved.
-            boolean endpointsRequireAutomaticResolution = false;
-            for(Endpoint endpoint : endpoints){
-                endpointsRequireAutomaticResolution = endpoint.isUnresolved();
-            }
-            
-            // build each endpoint 
-            if (endpointsRequireAutomaticResolution) { 
-
-                for(Endpoint endpoint : endpoints){
-                    endpointBuilder.build(endpoint);
-                }
-                
-                // TODO - The following step ensures that the reference binding list remains 
-                //        as the record of resolved targets for now. This needs fixing so 
-                //        that the endpoint takes on this responsibility. 
-                componentReference.getBindings().clear();
-                
-                if (componentReference.getCallback() != null){
-                    componentReference.getCallback().getBindings().clear();
-                }
-                
-                for(Endpoint endpoint : endpoints){
-                    if (endpoint.isUnresolved() == false){
-                        componentReference.getBindings().add(endpoint.getSourceBinding());
-                        
-                        if (componentReference.getCallback() != null){
-                            componentReference.getCallback().getBindings().add(endpoint.getSourceCallbackBinding());
-                        }
-                    } 
-                }                
-                
-            } else {
-                // do nothing as no targets have been specified so the bindings
-                // in the reference binding list are assumed to be manually configured
-            }
-                
-            
-/*            
-            // Select the reference bindings matching the target service bindings 
-            List<Binding> selectedBindings = new ArrayList<Binding>();
-            List<Binding> selectedCallbackBindings = null;
-    
-            // Handle callback
-            boolean bidirectional = false;
-            
-            if (componentReference.getInterfaceContract() != null && componentReference.getInterfaceContract().getCallbackInterface() != null) {
-                bidirectional = true;
-                selectedCallbackBindings = new ArrayList<Binding>();
-            }
-    
-            for (Target target : targets) {
-                
-                Component targetComponent = target.getComponent();
-                ComponentService targetComponentService = target.getService();
-                if (targetComponentService.getService() instanceof CompositeService) {
-                    CompositeService compositeService = (CompositeService) targetComponentService.getService();
-                    // Find the promoted component service
-                    targetComponentService = ServiceConfigurationUtil.getPromotedComponentService(compositeService);
-                }
-                
-                try  {
-                    PolicyConfigurationUtil.determineApplicableBindingPolicySets(componentReference, targetComponentService);
-                } catch ( Exception e ) {
-                    warning("Policy related exception: " + e, e);
-                    //throw new RuntimeException(e);
-                }
-
-                // Match the binding against the bindings of the target service
-                Binding selected = BindingConfigurationUtil.resolveBindings(componentReference, targetComponent, targetComponentService);
-                if (selected == null) {
-                    warning("NoMatchingBinding", componentReference, componentReference.getName(), targetComponentService.getName());
-                } else {
-                    selectedBindings.add(selected);
-                }
-                if (bidirectional) {
-                    Binding selectedCallback = BindingConfigurationUtil.resolveCallbackBindings(componentReference, targetComponent, targetComponentService);
-                    if (selectedCallback != null) {
-                        selectedCallbackBindings.add(selectedCallback);
-                    }
-                }
-            }
-*/                       
-            
-            // Need to tidy up the reference binding list and add in the bindings that 
-            // have been selected above. The situation so far...
-            //    Wired reference (1 or more targets are specified)
-            //       Binding.uri = null  - remove as it's left over from target resolution
-            //                             the binding will have been moved to the target from where 
-            //                             it will be resolved later
-            //       Binding.uri != null - the selected and resolved reference binding
-            //    Unwired reference (0 targets)
-            //       Binding.uri = null  - Either a callback reference or the reference is yet to be wired
-            //                             by the implementation so leave the binding where it is
-            //       Binding.uri != null - from the composite file so leave it  
-/*            
-            if ((componentReference.getTargets().size() > 0) ||
-                (!targets.isEmpty())) {
-
-                // Add all the effective bindings
-                componentReference.getBindings().clear();
-                componentReference.getBindings().addAll(selectedBindings);
-                if (bidirectional) {
-                    componentReference.getCallback().getBindings().clear();
-                    componentReference.getCallback().getBindings().addAll(selectedCallbackBindings);
-                }
-               
-                // add in sca bindings to represent all unresolved targets. The sca binding
-                // will try to resolve the target at a later date. 
-                for (ComponentService service : componentReference.getTargets()) {
-                    if (service.isUnresolved()) {
-                        SCABinding scaBinding = null;    
-                    
-                        // find the sca binding amongst the candidate binding list. We want to 
-                        // find this one and clone it as it may have been configured with
-                        // policies
-                        for (Binding binding : service.getBindings()) {
-
-                            if (binding instanceof SCABinding) {
-                                try {
-                                    scaBinding = (SCABinding)((OptimizableBinding)binding).clone();
-                                } catch (CloneNotSupportedException ex){
-                                    // we know it is supported on the SCA binding
-                                }
-                                break;
-                            }
-                        }
-                        
-                        if (scaBinding != null) {
-                            // configure the cloned SCA binding for this reference target
-                            scaBinding.setName(service.getName());
-                            
-                            // this service object holds the list of candidate bindings which 
-                            // can be used for later matching
-                            ((OptimizableBinding)scaBinding).setTargetComponentService(service);
-                            componentReference.getBindings().add(scaBinding);
-                        } else {
-                           // not sure we need to raise a warning here as a warning will already been 
-                           // thrown previously to indicate the reason why there is no sca binding
-                           // warning("NoSCABindingAvailableForUnresolvedService", componentReference, componentReference.getName(), service.getName());
-                        }
-                    }
-                }
-            }
-
-*/            
-            // Connect the optimizable bindings to their target component and
-            // service
-/*            
-            for (Binding binding : componentReference.getBindings()) {
-                if (!(binding instanceof OptimizableBinding)) {
-                    continue;
-                }
-                OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
-                if (optimizableBinding.getTargetComponentService() != null) {
-                    continue;
-                }
-                String uri = optimizableBinding.getURI();
-                if (uri == null) {
-                    continue;
-                }
-                uri = URI.create(uri).getPath();
-                if (uri.startsWith("/")) {
-                    uri = uri.substring(1);
-                }
-                
-                // Resolve the target component and service
-                ComponentService targetComponentService = componentServices.get(uri);
-                Component targetComponent;
-                int s = uri.indexOf('/');
-                if (s == -1) {
-                    targetComponent = components.get(uri);
-                } else {
-                    targetComponent = components.get(uri.substring(0, s));
-                }
-
-                if (targetComponentService != null) {
-
-                    // Check that the target component service provides
-                    // a superset of the component reference interface
-                    if (componentReference.getInterfaceContract() == null ||
-                        interfaceContractMapper.isCompatible(componentReference.getInterfaceContract(), targetComponentService.getInterfaceContract())) {
-
-                    } else {
-                        warning("ReferenceIncompatibleInterface",
-                                composite,
-                                composite.getName().toString(),
-                                componentReference.getName(),
-                                uri);
-                    }
-                    optimizableBinding.setTargetComponent(targetComponent);
-                    optimizableBinding.setTargetComponentService(targetComponentService);
-                    optimizableBinding.setTargetBinding(targetComponentService.getBinding(optimizableBinding.getClass()));
-                }
-            }
-*/             
-        }
-    }
-
-    /**
-     * Resolve wires and connect the sources to their targets
-     * 
-     * @param composite
-     * @param componentServices
-     * @param componentReferences
-     * @param problems
-     */
-    private void connectWires(Composite composite,
-                              Map<String, ComponentService> componentServices,
-                              Map<String, ComponentReference> componentReferences) {
-    
-        // For each wire, resolve the source reference, the target service, and
-        // add it to the list of targets of the reference
-        List<Wire> wires = composite.getWires();
-        for (int i = 0, n = wires.size(); i < n; i++) {
-            Wire wire = wires.get(i);
-    
-            ComponentReference resolvedReference;
-            ComponentService resolvedService;
-    
-            // Resolve the source reference
-            ComponentReference source = wire.getSource();
-            if (source != null && source.isUnresolved()) {
-                resolvedReference = componentReferences.get(source.getName());
-                if (resolvedReference != null) {
-                    wire.setSource(resolvedReference);
-                } else {
-                    warning("WireSourceNotFound", composite, source.getName());
-                }
-            } else {
-                resolvedReference = wire.getSource();
-            }
-    
-            // Resolve the target service
-            ComponentService target = wire.getTarget();
-            if (target != null && target.isUnresolved()) {
-                resolvedService = componentServices.get(target.getName());
-                if (resolvedService != null) {
-                    wire.setTarget(target);
-                } else {
-                    warning("WireTargetNotFound", composite, source.getName());
-                }
-            } else {
-                resolvedService = wire.getTarget();
-            }
-    
-            // Add the target service to the list of targets of the
-            // reference
-            if (resolvedReference != null && resolvedService != null) {
-                // Check that the target component service provides
-                // a superset of
-                // the component reference interface
-                if (resolvedReference.getInterfaceContract() == null || interfaceContractMapper
-                    .isCompatible(resolvedReference.getInterfaceContract(), resolvedService.getInterfaceContract())) {
-    
-                    //resolvedReference.getTargets().add(resolvedService);
-                    resolvedReference.getTargets().add(wire.getTarget());
-                } else {
-                    warning("WireIncompatibleInterface", composite, source.getName(), target.getName());
-                }
-            }
-        }
-    
-        // Clear the list of wires
-        composite.getWires().clear();
-    }
-    
-    private void addPoliciesFromPromotedService(CompositeService compositeService) {
-        //inherit intents and policies from promoted service
-        PolicyComputationUtils.addInheritedIntents(compositeService.getPromotedService().getRequiredIntents(), 
-                            compositeService.getRequiredIntents());
-        PolicyComputationUtils.addInheritedPolicySets(compositeService.getPromotedService().getPolicySets(), 
-                               compositeService.getPolicySets(), true);
-        addInheritedOperationConfigurations(compositeService.getPromotedService(), compositeService);
-    }
-    
-    private void addPoliciesFromPromotedReference(CompositeReference compositeReference) {
-        for ( Reference promotedReference : compositeReference.getPromotedReferences() ) {
-           PolicyComputationUtils.addInheritedIntents(promotedReference.getRequiredIntents(), 
-                               compositeReference.getRequiredIntents());
-       
-           PolicyComputationUtils.addInheritedPolicySets(promotedReference.getPolicySets(), 
-                                  compositeReference.getPolicySets(), true);
-           addInheritedOperationConfigurations(promotedReference, compositeReference);
-        }
-    }
-
-    
-    protected void computePolicies(Composite composite) {
-        
-        // compute policies recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                computePolicies((Composite)implementation);
-            }
-        }
-    
-        for (Component component : composite.getComponents()) {
-
-            // Inherit default policies from the component to component-level contracts.
-            // This must be done BEFORE computing implementation policies because the
-            // implementation policy computer removes from the component any
-            // intents and policy sets that don't apply to implementations.
-            PolicyConfigurationUtil.inheritDefaultPolicies(component, component.getServices());
-            PolicyConfigurationUtil.inheritDefaultPolicies(component, component.getReferences());
-
-            Implementation implemenation = component.getImplementation(); 
-            try {
-                PolicyConfigurationUtil.computeImplementationIntentsAndPolicySets(implemenation, component);
-            } catch ( Exception e ) {
-                error("PolicyRelatedException", implemenation, e);
-                //throw new RuntimeException(e);
-            }
-
-            for (ComponentService componentService : component.getServices()) {
-                Service service = componentService.getService();
-                if (service != null) {
-                    // reconcile intents and policysets from componentType
-                     PolicyComputationUtils.addInheritedIntents(service.getRequiredIntents(), componentService.getRequiredIntents());
-                     PolicyComputationUtils.addInheritedPolicySets(service.getPolicySets(), componentService.getPolicySets(), true);
-                     
-                     //reconcile intents and policysets for operations 
-                     boolean notFound;
-                     List<ConfiguredOperation> opsFromComponentType = new ArrayList<ConfiguredOperation>();
-                     for ( ConfiguredOperation ctsConfOp : service.getConfiguredOperations() ) {
-                         notFound = true;
-                         for ( ConfiguredOperation csConfOp : componentService.getConfiguredOperations() ) {
-                             if ( csConfOp.getName().equals(ctsConfOp.getName()) ) {
-                                 PolicyComputationUtils.addInheritedIntents(ctsConfOp.getRequiredIntents(), csConfOp.getRequiredIntents());
-                                 PolicyComputationUtils.addInheritedPolicySets(ctsConfOp.getPolicySets(), csConfOp.getPolicySets(), true);
-                                 notFound = false;
-                             } 
-                         }
-                         
-                         if ( notFound ) {
-                             opsFromComponentType.add(ctsConfOp);
-                         }
-                     }
-                     componentService.getConfiguredOperations().addAll(opsFromComponentType);
-                }
-                
-                try {
-                    //compute the intents for operations under service element
-                    PolicyConfigurationUtil.computeIntentsForOperations(componentService);
-                    //compute intents and policyset for each binding
-                    //addInheritedOpConfOnBindings(componentService);
-                    PolicyConfigurationUtil.computeBindingIntentsAndPolicySets(componentService);
-                    PolicyConfigurationUtil.determineApplicableBindingPolicySets(componentService, null);
-    
-                } catch ( Exception e ) {
-                    error("PolicyRelatedException", componentService, e);
-                    //throw new RuntimeException(e);
-                }
-            }
-        
-            for (ComponentReference componentReference : component.getReferences()) {
-                Reference reference = componentReference.getReference();
-                if (reference != null) {
-                    // reconcile intents and policysets
-                    PolicyComputationUtils.addInheritedIntents(reference.getRequiredIntents(), componentReference.getRequiredIntents());
-                    PolicyComputationUtils.addInheritedPolicySets(reference.getPolicySets(), componentReference.getPolicySets(), true);
-                }
-                
-               
-                try {
-                    //compute the intents for operations under reference element
-                    PolicyConfigurationUtil.computeIntentsForOperations(componentReference);
-                    //compute intents and policyset for each binding
-                    //addInheritedOpConfOnBindings(componentReference);
-                    PolicyConfigurationUtil.computeBindingIntentsAndPolicySets(componentReference);
-                    PolicyConfigurationUtil.determineApplicableBindingPolicySets(componentReference, null);
-    
-                
-                    if ( componentReference.getCallback() != null ) {
-                        PolicyComputationUtils.addInheritedIntents(componentReference.getRequiredIntents(), 
-                                            componentReference.getCallback().getRequiredIntents());
-                        PolicyComputationUtils.addInheritedPolicySets(componentReference.getPolicySets(), 
-                                               componentReference.getCallback().getPolicySets(), 
-                                               false);
-                    }
-                } catch ( Exception e ) {
-                    error("PolicyRelatedException", componentReference, e);
-                    //throw new RuntimeException(e);
-                }
-            }
-        }
-
-        PolicyConfigurationUtil.inheritDefaultPolicies(composite, composite.getServices());
-        PolicyConfigurationUtil.inheritDefaultPolicies(composite, composite.getReferences());
-
-        //compute policies for composite service bindings
-        for (Service service : composite.getServices()) {
-            addPoliciesFromPromotedService((CompositeService)service);
-            try {
-                //compute the intents for operations under service element
-                PolicyConfigurationUtil.computeIntentsForOperations(service);
-                //add or merge service operations to the binding
-                //addInheritedOpConfOnBindings(service);
-                PolicyConfigurationUtil.computeBindingIntentsAndPolicySets(service);
-                PolicyConfigurationUtil.determineApplicableBindingPolicySets(service, null);
-            } catch ( Exception e ) {
-                error("PolicyRelatedException", service, e);
-                //throw new RuntimeException(e);
-            }
-                
-        }
-    
-        for (Reference reference : composite.getReferences()) {
-            CompositeReference compReference = (CompositeReference)reference;
-            addPoliciesFromPromotedReference(compReference);
-            try {
-                //compute the intents for operations under service element
-                PolicyConfigurationUtil.computeIntentsForOperations(reference);
-                //addInheritedOpConfOnBindings(reference);
-                
-                if (compReference.getCallback() != null) {
-                    PolicyComputationUtils.addInheritedIntents(compReference.getRequiredIntents(), 
-                                        compReference.getCallback().getRequiredIntents());
-                    PolicyComputationUtils.addInheritedPolicySets(compReference.getPolicySets(), 
-                                           compReference.getCallback().getPolicySets(), 
-                                           false);
-                }
-                
-                PolicyConfigurationUtil.computeBindingIntentsAndPolicySets(reference);
-                PolicyConfigurationUtil.determineApplicableBindingPolicySets(reference, null);
-            } catch ( Exception e ) {
-                error("PolicyRelatedException", reference, e);
-                //throw new RuntimeException(e);
-            }
-        }
-
-    }
-    
-    private void addInheritedOperationConfigurations(OperationsConfigurator source, 
-                                                     OperationsConfigurator target) {
-        boolean found = false;
-        
-        List<ConfiguredOperation> additionalOperations = new ArrayList<ConfiguredOperation>();
-        for ( ConfiguredOperation sourceConfOp : source.getConfiguredOperations() ) {
-            for ( ConfiguredOperation targetConfOp : target.getConfiguredOperations() ) {
-                if ( sourceConfOp.getName().equals(targetConfOp.getName())) {
-                    PolicyComputationUtils.addInheritedIntents(sourceConfOp.getRequiredIntents(), 
-                                                               targetConfOp.getRequiredIntents());
-                    PolicyComputationUtils.addInheritedPolicySets(sourceConfOp.getPolicySets(), 
-                                                                  targetConfOp.getPolicySets(), true);
-                    found = true;
-                    break;
-                }
-            }
-            
-            if ( !found ) {
-                additionalOperations.add(sourceConfOp);
-            }
-        }
-        
-        if ( !additionalOperations.isEmpty() ) {
-            target.getConfiguredOperations().addAll(additionalOperations);
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
deleted file mode 100644
index 4016d02a36..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.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.assembly.builder.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.ComponentReference;
-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.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * This class encapsulates utility methods to deal with binding definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class BindingConfigurationUtil {
-    private static boolean hasCompatiblePolicySets(Binding refBinding, Binding svcBinding) {
-        boolean isCompatible = true;
-        if ( refBinding instanceof PolicySetAttachPoint && svcBinding instanceof PolicySetAttachPoint ) {
-            //TODO : need to add more compatibility checks at the policy attachment levels
-            for ( PolicySet svcPolicySet : ((PolicySetAttachPoint)svcBinding).getPolicySets() ) {
-                isCompatible = false;
-                for ( PolicySet refPolicySet : ((PolicySetAttachPoint)refBinding).getPolicySets() ) {
-                    if ( svcPolicySet.equals(refPolicySet) ) {
-                        isCompatible = true;
-                        break;
-                    }
-                }
-                //if there exists no matching policy set in the reference binding
-                if ( !isCompatible ) {
-                    return isCompatible;
-                }
-            }
-        }
-        return isCompatible;
-    }
-    
-    
-    static Binding matchBinding(Component targetComponent, ComponentService targetComponentService, List<Binding> source, List<Binding> target) {
-        List<Binding> matched = new ArrayList<Binding>();
-        // Find the corresponding bindings from the service side
-        for (Binding binding : source) {
-            for (Binding serviceBinding : target) {
-                if (binding.getClass() == serviceBinding.getClass() && 
-                    hasCompatiblePolicySets(binding, serviceBinding)) {
-
-                    try {
-                        Binding cloned = (Binding)binding.clone();
-                        
-                        //Customise the binding name to make it unique 
-                        // regardless of how many bindings or targets there are
-                        if ( targetComponent != null){
-                            cloned.setName(binding.getName() + "#" + targetComponent.getName() + "/" + serviceBinding.getName());
-                        } else {
-                            cloned.setName(binding.getName() + "#" + serviceBinding.getName());
-                        }
-                        
-                        // Set the binding URI to the URI of the target service
-                        // that has been matched
-                        if (binding.getURI() == null) {
-                            cloned.setURI(serviceBinding.getURI());
-                        }
-                        
-                        if (binding instanceof OptimizableBinding) {
-                            OptimizableBinding endpoint = ((OptimizableBinding)cloned);
-                            endpoint.setTargetComponent(targetComponent);
-                            endpoint.setTargetComponentService(targetComponentService);
-                            endpoint.setTargetBinding(serviceBinding);
-                        } 
-                           
-                        matched.add(cloned);
-                        break;
-                    } catch (Exception ex) {
-                        // do nothing 
-                    }                   
-                }
-            }
-        }
-        if (matched.isEmpty()) {
-            // No matching binding
-            return null;
-        } else {
-            for (Binding binding : matched) {
-                // If binding.sca is present, use it
-                if (SCABinding.class.isInstance(binding)) {
-                    return binding;
-                }
-            }
-            // Use the first one
-            return matched.get(0);
-        }
-    }
-
-    /**
-     * Choose a binding for the reference based on the bindings available on the
-     * service
-     * 
-     * @param reference The component reference
-     * @param service The component service
-     * @return Resolved binding
-     */
-    static Binding resolveBindings(ComponentReference reference, Component component, ComponentService service) {
-        List<Binding> source = reference.getBindings();
-        List<Binding> target = service.getBindings();
-    
-        return matchBinding(component, service, source, target);
-    
-    }
-    
-
-    /**
-     * @param reference
-     * @param service
-     * @return
-     */
-    static Binding resolveCallbackBindings(ComponentReference reference, Component component, ComponentService service) {
-        List<Binding> source = reference.getCallback().getBindings();
-        List<Binding> target = service.getCallback().getBindings();
-    
-        return matchBinding(component, service, source, target);
-    }
-    
-  
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
deleted file mode 100644
index 8dd585f92b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.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.assembly.builder.impl;
-
-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.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that handles the configuration of components.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentConfigurationBuilderImpl extends BaseConfigurationBuilderImpl implements CompositeBuilder {
-
-    public ComponentConfigurationBuilderImpl(AssemblyFactory assemblyFactory,
-                                             SCABindingFactory scaBindingFactory,
-                                             InterfaceContractMapper interfaceContractMapper,
-                                             SCADefinitions policyDefinitions,
-                                             Monitor monitor) {
-        super(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        configureComponents(composite);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
deleted file mode 100644
index 1769e7eee9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.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.assembly.builder.impl;
-
-
-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.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that performs any additional building steps that
- * component reference bindings may need.  Used for WSDL generation.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentReferenceBindingBuilderImpl implements CompositeBuilder {
-    private Monitor monitor;
-
-    public ComponentReferenceBindingBuilderImpl(Monitor monitor) {
-        this.monitor = monitor;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        buildReferenceBindings(composite);
-    }
-    
-    private void buildReferenceBindings(Composite composite) {
-    
-        // find all the component reference bindings (starting at top level)     
-        for (Component component : composite.getComponents()) {
-            for (ComponentReference componentReference : component.getReferences()) {
-                for (Binding binding : componentReference.getBindings()) {
-                    if (binding instanceof BindingBuilderExtension) {
-                        ((BindingBuilderExtension)binding).getBuilder().build(component, componentReference, binding, monitor);
-                    }
-                }
-            }
-        }
-        
-        // build bindings recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                buildReferenceBindings((Composite)implementation);
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
deleted file mode 100644
index c0702c87b3..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.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.assembly.builder.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.EndpointFactory;
-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.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that handles the creation of promoted composite services.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentReferencePromotionWireBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-    private EndpointFactory endpointFactory;
-    private Monitor monitor;
-
-    public ComponentReferencePromotionWireBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.endpointFactory = endpointFactory;
-        this.monitor = monitor;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        wireCompositeReferences(composite);
-    }
-
-    /**
-     * Wire composite references in nested composites.
-     * 
-     * @param composite
-     * @param problems
-     */
-    private void wireCompositeReferences(Composite composite) {
-    
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                wireCompositeReferences((Composite)implementation);
-            }
-        }
-    
-        // Process component references declared on components in this composite
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                for (ComponentReference componentReference : component.getReferences()) {
-                    Reference implReference = componentReference.getReference();
-                    if (implReference != null && implReference instanceof CompositeReference) {
-
-                        // If the component reference is wired, it is a promotion override
-                        if (!componentReference.getEndpoints().isEmpty()) {
-                            componentReference.setPromotionOverride(true);
-                        }
-     
-                        // If the component reference is a promotion override, override the
-                        // configuration of the promoted reference  
-                        if (componentReference.isPromotionOverride()) {
-                            CompositeReference compositeReference = (CompositeReference)implReference;
-                            List<ComponentReference> promotedReferences =
-                                ReferenceConfigurationUtil.getPromotedComponentReferences(compositeReference);
-                            for (ComponentReference promotedReference : promotedReferences) {
-                                ReferenceConfigurationUtil.reconcileReferenceBindings(
-                                        componentReference, promotedReference, assemblyFactory, endpointFactory, monitor);
-                                if (componentReference.getInterfaceContract() != null && // can be null in unit tests
-                                    componentReference.getInterfaceContract().getCallbackInterface() != null) {
-                                    SCABinding scaCallbackBinding = promotedReference.getCallbackBinding(SCABinding.class);
-                                    if (promotedReference.getCallback() != null) {
-                                        promotedReference.getCallback().getBindings().clear();
-                                    } else {
-                                        promotedReference.setCallback(assemblyFactory.createCallback());
-                                    }
-                                    if (scaCallbackBinding != null) {
-                                        promotedReference.getCallback().getBindings().add(scaCallbackBinding);
-                                    }
-                                    if (componentReference.getCallback() != null) {
-                                        promotedReference.getCallback().getBindings().addAll(componentReference
-                                            .getCallback().getBindings());
-                                    }
-                                }
-    
-                                // Wire the promoted reference to the actual non-composite component services
-                                if (promotedReference.getMultiplicity() == Multiplicity.ONE_ONE) {
-                                    // promotedReference.getTargets().clear();
-                                }
-                                for (ComponentService target : componentReference.getTargets()) {
-                                    if (target.getService() instanceof CompositeService) {
-        
-                                        // Wire to the actual component service
-                                        // promoted by a composite service
-                                        CompositeService compositeService = (CompositeService)target.getService();
-                                        // Find the promoted component service
-                                        ComponentService componentService =
-                                            ServiceConfigurationUtil.getPromotedComponentService(compositeService);
-                                        if (componentService != null) {
-                                            promotedReference.getTargets().add(componentService);
-                                        }
-                                    } else {
-        
-                                        // Wire to a non-composite target service
-                                        promotedReference.getTargets().add(target);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            } else {
-                for (ComponentReference componentReference : component.getReferences()) {
-    
-                    // Wire the component reference to the actual
-                    // non-composite component services
-                    List<ComponentService> targets = componentReference.getTargets();
-                    for (int i = 0, n = targets.size(); i < n; i++) {
-                        ComponentService target = targets.get(i);
-                        if (target.getService() instanceof CompositeService) {
-    
-                            // Wire to the actual component service
-                            // promoted by a composite service
-                            CompositeService compositeService = (CompositeService)target.getService();
-                            ComponentService componentService = compositeService.getPromotedService();
-                            if (componentService != null) {
-                                targets.set(i, componentService);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
deleted file mode 100644
index 927330b139..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.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.assembly.builder.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that wires component references.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentReferenceWireBuilderImpl extends BaseWireBuilderImpl implements CompositeBuilder {
-
-    public ComponentReferenceWireBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, InterfaceContractMapper interfaceContractMapper, Monitor monitor) {
-        super(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        wireComponentReferences(composite);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
deleted file mode 100644
index c4c6462c60..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.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.assembly.builder.impl;
-
-
-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.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that performs any additional building steps that
- * component service bindings may need.  Used for WSDL generation.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentServiceBindingBuilderImpl implements CompositeBuilder {
-    private Monitor monitor;
-
-    public ComponentServiceBindingBuilderImpl(Monitor monitor) {
-        this.monitor = monitor;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        buildServiceBindings(composite);
-    }
-    
-    private void buildServiceBindings(Composite composite) {
-        
-        // build bindings recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                buildServiceBindings((Composite)implementation);
-            }
-        }
-
-        // find all the component service bindings     
-        for (Component component : composite.getComponents()) {
-            for (ComponentService componentService : component.getServices()) {
-                for (Binding binding : componentService.getBindings()) {
-                    if (binding instanceof BindingBuilderExtension) {
-                        ((BindingBuilderExtension)binding).getBuilder().build(component, componentService, binding, monitor);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
deleted file mode 100644
index 53e6eda1eb..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.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.builder.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.Service;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-
-/**
- * A composite builder that handles the creation of promoted services.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentServicePromotionBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-
-    public ComponentServicePromotionBuilderImpl(AssemblyFactory assemblyFactory) {
-        this.assemblyFactory = assemblyFactory;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-
-        // Process nested composites recursively
-        configureNestedCompositeServices(composite);
-    }
-
-    private void configureNestedCompositeServices(Composite composite) {
-
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // First process nested composites
-                configureNestedCompositeServices((Composite)implementation);
-
-                // Process the component services declared on components in this composite
-                for (ComponentService componentService : component.getServices()) {
-                    Service implService = componentService.getService();
-                    if (implService != null && implService instanceof CompositeService) {
-                        CompositeService compositeService = (CompositeService)implService;
-
-                        // Get the innermost promoted service
-                        ComponentService promotedService =
-                            ServiceConfigurationUtil.getPromotedComponentService(compositeService);
-                        if (promotedService != null) {
-                            Component promotedComponent = ServiceConfigurationUtil.getPromotedComponent(compositeService);
-
-                            // Create a new component service to represent this
-                            // component service on the promoted component
-                            ComponentService newComponentService = assemblyFactory.createComponentService();
-                            newComponentService.setName("$promoted$." + component.getName() + "." + componentService.getName());
-                            promotedComponent.getServices().add(newComponentService);
-                            newComponentService.setService(promotedService.getService());
-                            newComponentService.getBindings().addAll(componentService.getBindings());
-                            newComponentService.setInterfaceContract(componentService.getInterfaceContract());
-                            
-                            if (componentService.getInterfaceContract() != null && 
-                                componentService.getInterfaceContract().getCallbackInterface() != null) {
-                                newComponentService.setCallback(assemblyFactory.createCallback());
-                                newComponentService.getCallback().getBindings()
-                                        .addAll(componentService.getCallback().getBindings());
-                            }
-
-                            // Change the composite service to now promote the
-                            // newly created component service directly
-                            compositeService.setPromotedComponent(promotedComponent);
-                            compositeService.setPromotedService(newComponentService);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
deleted file mode 100644
index 4c2c369f3e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.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.assembly.builder.impl;
-
-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.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that handles the configuration of binding URIs.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeBindingURIBuilderImpl extends BaseConfigurationBuilderImpl implements CompositeBuilder {
-
-    public CompositeBindingURIBuilderImpl(AssemblyFactory assemblyFactory,
-                                          SCABindingFactory scaBindingFactory,
-                                          InterfaceContractMapper interfaceContractMapper,
-                                          SCADefinitions policyDefinitions,
-                                          Monitor monitor) {
-        super(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        configureBindingURIsAndNames(composite);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
deleted file mode 100644
index fd1c3d2a8f..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.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.assembly.builder.impl;
-
-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.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * A builder that handles the configuration of the components inside a composite
- * and the wiring of component references to component services.
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeBuilderImpl implements CompositeBuilder {
-    private static final Logger logger = Logger.getLogger(CompositeBuilderImpl.class.getName());
-    private CompositeBuilder compositeIncludeBuilder;
-    private CompositeBuilder componentReferenceWireBuilder;
-    private CompositeBuilder componentReferencePromotionWireBuilder;
-    private CompositeBuilder compositeReferenceWireBuilder;
-    private CompositeBuilder compositeCloneBuilder;
-    private CompositeBuilder componentConfigurationBuilder;
-    private CompositeBuilder compositeServiceConfigurationBuilder;
-    private CompositeBuilder compositeReferenceConfigurationBuilder;
-    private CompositeBuilder compositeBindingURIBuilder;
-    private CompositeBuilder componentServicePromotionBuilder;
-    private CompositeBuilder compositeServicePromotionBuilder;
-    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 CompositeBuilderImpl(AssemblyFactory assemblyFactory,
-                                SCABindingFactory scaBindingFactory,
-                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
-                                InterfaceContractMapper interfaceContractMapper,
-                                Monitor monitor) {
-        this(assemblyFactory, null, scaBindingFactory,  intentAttachPointTypeFactory, interfaceContractMapper, null, monitor);
-    }
-    
-    /**
-     * Constructs a new composite builder.
-     * 
-     * @param assemblyFactory
-     * @param scaBindingFactory
-     * @param endpointFactory
-     * @param intentAttachPointTypeFactory
-     * @param interfaceContractMapper
-     * @param policyDefinitions
-     * @param monitor
-     */
-    public CompositeBuilderImpl(AssemblyFactory assemblyFactory,
-                                EndpointFactory endpointFactory,
-                                SCABindingFactory scaBindingFactory,
-                                IntentAttachPointTypeFactory  intentAttachPointTypeFactory,
-                                InterfaceContractMapper interfaceContractMapper,
-                                SCADefinitions policyDefinitions,
-                                Monitor monitor) {
-        
-        if (endpointFactory == null){
-            endpointFactory = new DefaultEndpointFactory();
-        }       
-        
-        compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor); 
-        componentReferenceWireBuilder = new ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-        componentReferencePromotionWireBuilder = new ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
-        compositeReferenceWireBuilder = new CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
-        compositeCloneBuilder = new CompositeCloneBuilderImpl(monitor);
-        componentConfigurationBuilder = new ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
-        compositeServiceConfigurationBuilder = new CompositeServiceConfigurationBuilderImpl(assemblyFactory);
-        compositeReferenceConfigurationBuilder = new CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
-        compositeBindingURIBuilder = new CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
-        componentServicePromotionBuilder = new ComponentServicePromotionBuilderImpl(assemblyFactory);
-        compositeServicePromotionBuilder = new CompositeServicePromotionBuilderImpl(assemblyFactory);
-        compositePromotionBuilder = new CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-        compositePolicyBuilder = new CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-        componentServiceBindingBuilder = new ComponentServiceBindingBuilderImpl(monitor);
-        componentReferenceBindingBuilder = new ComponentReferenceBindingBuilderImpl(monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-
-        // Collect and fuse includes
-        compositeIncludeBuilder.build(composite);
-
-        // Expand nested composites
-        compositeCloneBuilder.build(composite);
-
-        // Configure all components
-        componentConfigurationBuilder.build(composite);
-
-        // Connect composite services/references to promoted services/references
-        compositePromotionBuilder.build(composite);
-        
-        // Compute the policies across the model hierarchy
-        compositePolicyBuilder.build(composite);
-
-        // Configure composite services
-        compositeServiceConfigurationBuilder.build(composite);
-        
-        // Configure composite references
-        compositeReferenceConfigurationBuilder.build(composite);
-
-        // Configure binding URIs
-        compositeBindingURIBuilder.build(composite);
-
-        // Create promoted component services
-        componentServicePromotionBuilder.build(composite);
-
-        // Create promoted composite services
-        compositeServicePromotionBuilder.build(composite);
-
-        // Build component service binding-related information
-        componentServiceBindingBuilder.build(composite);
-
-        // Wire the components
-        componentReferenceWireBuilder.build(composite);
-
-        // Wire the promoted component references
-        componentReferencePromotionWireBuilder.build(composite);
-
-        // Wire the composite references
-        compositeReferenceWireBuilder.build(composite);
-
-        // Build component reference binding-related information
-        componentReferenceBindingBuilder.build(composite);
-        
-        // Fuse nested composites
-        //FIXME do this later
-        //cloneBuilder.fuseCompositeImplementations(composite);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
deleted file mode 100644
index 5779ddbc78..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.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.assembly.builder.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that clones nested composites.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeCloneBuilderImpl implements CompositeBuilder {
-    
-    public CompositeCloneBuilderImpl(Monitor monitor) {
-    }
-    
-    public void build(Composite composite) throws CompositeBuilderException {
-        expandCompositeImplementations(composite);
-    }
-
-    /**
-     * Expand composite component implementations.
-     * 
-     * @param composite
-     * @param problems
-     */
-    private void expandCompositeImplementations(Composite composite) {
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-    
-                Composite compositeImplementation = (Composite)implementation;
-                Composite clone;
-                try {
-                    clone = (Composite)compositeImplementation.clone();
-                } catch (CloneNotSupportedException e) {
-                    throw new RuntimeException(e);
-                }
-                component.setImplementation(clone);
-                expandCompositeImplementations(clone);
-            }
-        }
-    }
-
-    /**
-     * Collect all nested composite implementations in a graph of composites.
-     * 
-     * @param composite
-     * @param nested
-     */
-    private void collectNestedComposites(Composite composite, List<Composite> nested) {
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                Composite nestedComposite = (Composite)implementation;
-                nested.add(nestedComposite);
-                collectNestedComposites(nestedComposite, nested);
-            }
-        }
-    }
-
-    /**
-     * Fuse nested composites into a top level composite.
-     * 
-     * @param composite
-     */
-    private void fuseCompositeImplementations(Composite composite) {
-    
-        // First collect all nested composites
-        List<Composite> nested = new ArrayList<Composite>();
-        collectNestedComposites(composite, nested);
-    
-        // Then add all the non-composite components they contain 
-        for (Composite nestedComposite : nested) {
-            for (Component component: nestedComposite.getComponents()) {
-                Implementation implementation = component.getImplementation();
-                if (!(implementation instanceof Composite)) {
-                    composite.getComponents().add(component);
-                }
-            }
-        }
-    
-        // Clear the initial list of composite components
-        for (Iterator<Component> i = composite.getComponents().iterator(); i.hasNext();) {
-            Component component = i.next();
-            if (component.getImplementation() instanceof Composite) {
-                i.remove();
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
deleted file mode 100644
index 539ad8d137..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.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.assembly.builder.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.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Implementation of a CompositeBuilder.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeIncludeBuilderImpl implements CompositeBuilder {   
-
-    private Monitor monitor;
-        
-    public CompositeIncludeBuilderImpl(Monitor monitor) {
-        this.monitor = monitor;
-    }
-      
-    public void build(Composite composite) throws CompositeBuilderException {
-        fuseIncludes(composite);
-    }
-
-    private void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null){
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Collect all includes in a graph of includes.
-     * 
-     * @param composite
-     * @param includes
-     */
-    private void collectIncludes(Composite composite, List<Composite> includes, Set<Composite> visited) {
-        for (Composite include : composite.getIncludes()) {
-            if (visited.contains(include)) {
-                warning("CompositeAlreadyIncluded", composite, include.getName().toString());
-                continue;
-            }
-                        
-            includes.add(include);
-            visited.add(include);
-            collectIncludes(include, includes, visited);
-        }
-    }
-
-    /**
-     * Copy a list of includes into a composite.
-     * 
-     * @param composite
-     */
-    private void fuseIncludes(Composite composite) {
-    
-        // First collect all includes
-        List<Composite> includes = new ArrayList<Composite>();
-        Set<Composite> visited = new HashSet<Composite>();
-        visited.add(composite);
-        collectIncludes(composite, includes, visited);
-        // Then clone them
-        for (Composite include : includes) {
-            Composite clone;
-            try {
-                clone = (Composite)include.clone();
-            } catch (CloneNotSupportedException e) {
-                throw new RuntimeException(e);
-            }
-            composite.getComponents().addAll(clone.getComponents());
-            composite.getServices().addAll(clone.getServices());
-            composite.getReferences().addAll(clone.getReferences());
-            composite.getProperties().addAll(clone.getProperties());
-            composite.getWires().addAll(clone.getWires());
-            composite.getPolicySets().addAll(clone.getPolicySets());
-            composite.getRequiredIntents().addAll(clone.getRequiredIntents());
-        }
-    
-        // Clear the list of includes
-        composite.getIncludes().clear();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
deleted file mode 100644
index 76ed861167..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.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.assembly.builder.impl;
-
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that computes policy sets based on attached intents and policy sets.
- * Useful if you want to build the model without making any runtime decisions such as
- * reference/services matching
- *
- * @version $Rev$ $Date$
- */
-public class CompositePolicyBuilderImpl extends BaseWireBuilderImpl implements CompositeBuilder {
-
-    public CompositePolicyBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, InterfaceContractMapper interfaceContractMapper, Monitor monitor) {
-        super(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        computePolicies(composite);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
deleted file mode 100644
index 5a6437b3a3..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.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.assembly.builder.impl;
-
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that makes the connections between composite services and references
- * and the services and references that they promote
- *
- * @version $Rev$ $Date$
- */
-public class CompositePromotionBuilderImpl extends BaseWireBuilderImpl implements CompositeBuilder {
-
-    public CompositePromotionBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, InterfaceContractMapper interfaceContractMapper, Monitor monitor) {
-        super(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        connectCompositeReferencesAndServices(composite);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
deleted file mode 100644
index 41462b151d..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.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.sca.assembly.builder.impl;
-
-import java.util.List;
-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.ComponentReference;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-
-/**
- * A composite builder that handles the configuration of composite references.
- *
- * @version $Rev: 651179 $ $Date: 2008-04-24 08:21:13 +0100 (Thu, 24 Apr 2008) $
- */
-public class CompositeReferenceConfigurationBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-
-    public CompositeReferenceConfigurationBuilderImpl(AssemblyFactory assemblyFactory) {
-        this.assemblyFactory = assemblyFactory;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-
-        // Process nested composites recursively
-        configureNestedCompositeReferences(composite);
-
-        // Process top level composite references
-        for (Reference reference : composite.getReferences()) {
-            CompositeReference compositeReference = (CompositeReference)reference;
-
-            // Get the next lower level promoted reference
-            List<ComponentReference> promotedRefs = compositeReference.getPromotedReferences();
-            if (!promotedRefs.isEmpty()) {
-                if (promotedRefs.size() == 1) {
-                    ComponentReference promotedReference = promotedRefs.get(0);
-
-                    // Set the bindings using the top level bindings to override the lower level bindings
-                    if (bindingsSpecifiedManually(compositeReference.getBindings())) {
-                        compositeReference.setPromotionOverride(true);
-                    } else if (bindingsSpecifiedManually(promotedReference.getBindings()) ) {
-                        compositeReference.getBindings().clear();
-                        for (Binding binding : promotedReference.getBindings()) {
-                            try {
-                                compositeReference.getBindings().add((Binding)binding.clone());
-                            } catch (CloneNotSupportedException ex) {
-                                // this binding can't be used in the promoted reference
-                            }
-                        }
-                    }
-                    if (compositeReference.getInterfaceContract() != null &&
-                        compositeReference.getInterfaceContract().getCallbackInterface() != null) {
-                        if (compositeReference.getCallback() != null &&
-                            bindingsSpecifiedManually(compositeReference.getCallback().getBindings())) {
-                            compositeReference.setPromotionOverride(true);
-                        } else if (promotedReference.getCallback() != null &&
-                                   bindingsSpecifiedManually(promotedReference.getCallback().getBindings())) {
-                            if (compositeReference.getCallback() != null) {
-                                compositeReference.getCallback().getBindings().clear();
-                            } else {
-                                compositeReference.setCallback(assemblyFactory.createCallback());
-                            }
-                            for (Binding binding : promotedReference.getCallback().getBindings()) {
-                                try {
-                                    compositeReference.getCallback().getBindings().add((Binding)binding.clone());
-                                } catch (CloneNotSupportedException ex) {
-                                    // this binding can't be used in the promoted reference
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    // This composite reference promotes multiple component references.
-                    // Because the component reference bindings can all be different, we don't
-                    // copy any of them up to this composite reference, which will therefore always
-                    // have its own binding, even if it's only the default SCA binding.
-                    if (bindingsSpecifiedManually(compositeReference.getBindings()) ||
-                        (compositeReference.getCallback() != null &&
-                         bindingsSpecifiedManually(compositeReference.getCallback().getBindings()))) {
-                        compositeReference.setPromotionOverride(true);
-                    }
-                }
-            }
-        }
-    }
-
-    private void configureNestedCompositeReferences(Composite composite) {
-
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // First process nested composites
-                configureNestedCompositeReferences((Composite)implementation);
-
-                // Process the component references declared on components in this composite
-                for (ComponentReference componentReference : component.getReferences()) {
-                    Reference implReference = componentReference.getReference();
-                    if (implReference != null && implReference instanceof CompositeReference) {
-                        CompositeReference compositeReference = (CompositeReference)implReference;
-
-                        // Get the next lower level promoted reference
-                        List<ComponentReference> promotedRefs = compositeReference.getPromotedReferences();
-                        if (!promotedRefs.isEmpty()) {
-                            if (promotedRefs.size() == 1) {
-                                ComponentReference promotedReference = promotedRefs.get(0);
-
-                                // Set the bindings using the top level bindings to override the lower level bindings
-                                if (!bindingsSpecifiedManually(compositeReference.getBindings()) &&
-                                    bindingsSpecifiedManually(promotedReference.getBindings()) ) {
-                                    compositeReference.getBindings().clear();
-                                    for (Binding binding : promotedReference.getBindings()) {
-                                        try {
-                                            compositeReference.getBindings().add((Binding)binding.clone());
-                                        } catch (CloneNotSupportedException ex) {
-                                            // this binding can't be used in the promoted reference
-                                        }
-                                    }
-                                }
-                                if (bindingsSpecifiedManually(componentReference.getBindings())) {
-                                    componentReference.setPromotionOverride(true);
-                                } else if (bindingsSpecifiedManually(compositeReference.getBindings()) ) {
-                                    componentReference.getBindings().clear();
-                                    componentReference.getBindings().addAll(compositeReference.getBindings());
-                                }
-                                if (componentReference.getInterfaceContract() != null &&
-                                    componentReference.getInterfaceContract().getCallbackInterface() != null) {
-                                    if (!(compositeReference.getCallback() != null &&
-                                          bindingsSpecifiedManually(compositeReference.getCallback().getBindings())) &&
-                                        promotedReference.getCallback() != null &&
-                                        bindingsSpecifiedManually(promotedReference.getCallback().getBindings())) {
-                                        if (compositeReference.getCallback() != null) {
-                                            compositeReference.getCallback().getBindings().clear();
-                                        } else {
-                                            compositeReference.setCallback(assemblyFactory.createCallback());
-                                        }
-                                        compositeReference.getCallback().getBindings().addAll(
-                                                promotedReference.getCallback().getBindings());
-                                    }
-                                    if (componentReference.getCallback() != null &&
-                                        bindingsSpecifiedManually(componentReference.getCallback().getBindings())) {
-                                        componentReference.setPromotionOverride(true);
-                                    } else if (compositeReference.getCallback() != null &&
-                                               bindingsSpecifiedManually(compositeReference.getCallback().getBindings())) {
-                                        if (componentReference.getCallback() != null) {
-                                            componentReference.getCallback().getBindings().clear();
-                                        } else {
-                                            componentReference.setCallback(assemblyFactory.createCallback());
-                                        }
-                                        for (Binding binding : compositeReference.getCallback().getBindings()) {
-                                            try {
-                                                componentReference.getCallback().getBindings().add((Binding)binding.clone());
-                                            } catch (CloneNotSupportedException ex) {
-                                                // this binding can't be used in the promoted reference
-                                            }
-                                        }
-                                    }
-                                }
-                            } else {
-                                // This component reference promotes multiple lower-level component references.
-                                // Because the lower-level component reference bindings can all be different,
-                                // we don't copy any of them up to this component reference, which will therefore
-                                // always have its own binding, even if it's only the default SCA binding.
-                                if (bindingsSpecifiedManually(componentReference.getBindings()) ||
-                                    (componentReference.getCallback() != null &&
-                                     bindingsSpecifiedManually(componentReference.getCallback().getBindings()))) {
-                                    componentReference.setPromotionOverride(true);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * If the bindings are specified in the composite file return true as they should 
-     * otherwise return false
-     *  
-     * @param bindings
-     * @return true if the bindings were specified manually
-     */
-    private boolean bindingsSpecifiedManually(List<Binding> bindings) {
-
-        if (bindings.size() > 1) {
-            return true;
-        } else if (bindings.size() == 1 &&
-                   bindings.get(0) instanceof AutomaticBinding &&
-                   ((AutomaticBinding)bindings.get(0)).getIsAutomatic()) {
-            return false;
-        } else if (bindings.size() == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
deleted file mode 100644
index 8aa1897311..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.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.assembly.builder.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that wires composite references.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeReferenceWireBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-    private EndpointFactory endpointFactory;
-    private Monitor monitor;
-
-    public CompositeReferenceWireBuilderImpl(AssemblyFactory assemblyFactory, EndpointFactory endpointFactory, Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.endpointFactory = endpointFactory;
-        this.monitor = monitor;
-    }
-
-    /**
-     * Wire composite references in a deployment composite.
-     * 
-     * @param composite
-     */
-    public void build(Composite composite) throws CompositeBuilderException {
-    
-        // Process composite references declared in this composite
-        for (Reference reference : composite.getReferences()) {
-            CompositeReference compositeReference = (CompositeReference)reference;
-
-            // If the composite reference is a promotion override, override the
-            // configuration of the promoted reference.  
-            //FIXME: Policy configuration or wiring of domain-level composite references
-            // doesn't cause a promotion override, unless the composite reference has
-            // additional bindings.  Do we need to detect this and force an override?
-            if (compositeReference.isPromotionOverride()) {
-                List<ComponentReference> promotedReferences =
-                    ReferenceConfigurationUtil.getPromotedComponentReferences(compositeReference);
-                for (ComponentReference promotedReference : promotedReferences) {
-                    ReferenceConfigurationUtil.reconcileReferenceBindings(
-                            compositeReference, promotedReference, assemblyFactory, endpointFactory, monitor);
-                    if (compositeReference.getInterfaceContract() != null && // can be null in unit tests
-                        compositeReference.getInterfaceContract().getCallbackInterface() != null) {
-                        SCABinding scaCallbackBinding = promotedReference.getCallbackBinding(SCABinding.class);
-                        if (promotedReference.getCallback() != null) {
-                            promotedReference.getCallback().getBindings().clear();
-                        } else {
-                            promotedReference.setCallback(assemblyFactory.createCallback());
-                        }
-                        if (scaCallbackBinding != null) {
-                            promotedReference.getCallback().getBindings().add(scaCallbackBinding);
-                        }
-                        if (compositeReference.getCallback() != null) {
-                            promotedReference.getCallback().getBindings().addAll(compositeReference.getCallback()
-                                .getBindings());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
deleted file mode 100644
index 51e2da2d64..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.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.assembly.builder.impl;
-
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A composite builder that performs any additional building steps that
- * composite service bindings may need.  Used for WSDL generation.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeServiceBindingBuilderImpl implements CompositeBuilder {
-    private Monitor monitor;
-
-    public CompositeServiceBindingBuilderImpl(Monitor monitor) {
-        this.monitor = monitor;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        buildServiceBindings(composite);
-    }
-    
-    private void buildServiceBindings(Composite composite) {
-        
-        // build bindings recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                buildServiceBindings((Composite)implementation);
-            }
-        }
-
-        // find all the composite service bindings     
-        for (Service service : composite.getServices()) {
-            for (Binding binding : service.getBindings()) {
-                if (binding instanceof BindingBuilderExtension) {
-                    Component component = ServiceConfigurationUtil.getPromotedComponent((CompositeService)service);
-                    ((BindingBuilderExtension)binding).getBuilder().build(component, service, binding, monitor);
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
deleted file mode 100644
index a3f31ea2fa..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.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.assembly.builder.impl;
-
-import java.util.List;
-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.Service;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-
-/**
- * A composite builder that handles the configuration of composite services.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeServiceConfigurationBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-
-    public CompositeServiceConfigurationBuilderImpl(AssemblyFactory assemblyFactory) {
-        this.assemblyFactory = assemblyFactory;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-
-        // Process nested composites recursively
-        configureNestedCompositeServices(composite);
-
-        // Process top level composite services
-        for (Service service : composite.getServices()) {
-            CompositeService compositeService = (CompositeService)service;
-
-            // Get the next lower level promoted service
-            ComponentService promotedService = compositeService.getPromotedService();
-            if (promotedService != null) {
-
-                // Set the bindings using the top level bindings to override the lower level bindings
-                if (!bindingsSpecifiedManually(compositeService.getBindings()) &&
-                    bindingsSpecifiedManually(promotedService.getBindings())) {
-                    compositeService.getBindings().clear();
-                    for (Binding binding : promotedService.getBindings()) {
-                        try {
-                            compositeService.getBindings().add((Binding)binding.clone());
-                        } catch (CloneNotSupportedException ex) {
-                            // this binding can't be used in the promoted service
-                        }
-                    }                    
-                }
-                if (compositeService.getInterfaceContract() != null &&
-                    compositeService.getInterfaceContract().getCallbackInterface() != null) {
-                    if (!(compositeService.getCallback() != null &&
-                          bindingsSpecifiedManually(compositeService.getCallback().getBindings())) &&
-                        promotedService.getCallback() != null &&
-                        bindingsSpecifiedManually(promotedService.getCallback().getBindings())) {
-                        if (compositeService.getCallback() != null) {
-                            compositeService.getCallback().getBindings().clear();
-                        } else {
-                            compositeService.setCallback(assemblyFactory.createCallback());
-                        }
-                        for (Binding binding : promotedService.getCallback().getBindings()) {
-                            try {
-                                compositeService.getCallback().getBindings().add((Binding)binding.clone());
-                            } catch (CloneNotSupportedException ex) {
-                                // this binding can't be used in the promoted service
-                            }
-                        }                          
-                    }
-                }
-            }
-        }
-    }
-
-    private void configureNestedCompositeServices(Composite composite) {
-
-        // Process nested composites recursively
-        for (Component component : composite.getComponents()) {
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-
-                // First process nested composites
-                configureNestedCompositeServices((Composite)implementation);
-
-                // Process the component services declared on components in this composite
-                for (ComponentService componentService : component.getServices()) {
-                    Service implService = componentService.getService();
-                    if (implService != null && implService instanceof CompositeService) {
-                        CompositeService compositeService = (CompositeService)implService;
-
-                        // Get the next lower level promoted service
-                        ComponentService promotedService = compositeService.getPromotedService();
-                        if (promotedService != null) {
-
-                            // Set the bindings using the top level bindings to override the lower level bindings
-                            if (!bindingsSpecifiedManually(compositeService.getBindings()) &&
-                                bindingsSpecifiedManually(promotedService.getBindings()) ) {
-                                compositeService.getBindings().clear();
-                                for (Binding binding : promotedService.getBindings()) {
-                                    try {
-                                        compositeService.getBindings().add((Binding)binding.clone());
-                                    } catch (CloneNotSupportedException ex) {
-                                        // this binding can't be used in the promoted service
-                                    }
-                                }                    
-                            }
-                            if (!bindingsSpecifiedManually(componentService.getBindings()) &&
-                                bindingsSpecifiedManually(compositeService.getBindings()) ) {
-                                componentService.getBindings().clear();
-                                componentService.getBindings().addAll(compositeService.getBindings());
-                            }
-                            if (componentService.getInterfaceContract() != null &&
-                                componentService.getInterfaceContract().getCallbackInterface() != null) {
-                                if (!(compositeService.getCallback() != null &&
-                                      bindingsSpecifiedManually(compositeService.getCallback().getBindings())) &&
-                                    promotedService.getCallback() != null &&
-                                    bindingsSpecifiedManually(promotedService.getCallback().getBindings())) {
-                                    if (compositeService.getCallback() != null) {
-                                        compositeService.getCallback().getBindings().clear();
-                                    } else {
-                                        compositeService.setCallback(assemblyFactory.createCallback());
-                                    }
-                                    for (Binding binding : promotedService.getCallback().getBindings()) {
-                                        try {
-                                            compositeService.getCallback().getBindings().add((Binding)binding.clone());
-                                        } catch (CloneNotSupportedException ex) {
-                                            // this binding can't be used in the promoted service
-                                        }
-                                    }                          
-                                }
-                                if (!(componentService.getCallback() != null &&
-                                      bindingsSpecifiedManually(componentService.getCallback().getBindings())) &&
-                                    compositeService.getCallback() != null &&
-                                    bindingsSpecifiedManually(compositeService.getCallback().getBindings())) {
-                                    if (componentService.getCallback() != null) {
-                                        componentService.getCallback().getBindings().clear();
-                                    } else {
-                                        componentService.setCallback(assemblyFactory.createCallback());
-                                    }
-                                    componentService.getCallback().getBindings().addAll(
-                                            compositeService.getCallback().getBindings());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * If the bindings are specified in the composite file return true as they should 
-     * otherwise return false
-     *  
-     * @param bindings
-     * @return true if the bindings were specified manually
-     */
-    private boolean bindingsSpecifiedManually(List<Binding> bindings) {
-
-        if (bindings.size() > 1) {
-            return true;
-        } else if (bindings.size() == 1 &&
-                   bindings.get(0) instanceof AutomaticBinding &&
-                   ((AutomaticBinding)bindings.get(0)).getIsAutomatic()) {
-            return false;
-        } else if (bindings.size() == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
deleted file mode 100644
index 39d2cec396..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.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.assembly.builder.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.Service;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-
-/**
- * A composite builder that handles the creation of promoted composite services.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeServicePromotionBuilderImpl implements CompositeBuilder {
-    private AssemblyFactory assemblyFactory;
-
-    public CompositeServicePromotionBuilderImpl(AssemblyFactory assemblyFactory) {
-        this.assemblyFactory = assemblyFactory;
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-
-        // Process top level composite services
-        for (Service service : composite.getServices()) {
-            CompositeService compositeService = (CompositeService)service;
-
-            // Get the innermost promoted service
-            ComponentService promotedService = ServiceConfigurationUtil.getPromotedComponentService(compositeService);
-            if (promotedService != null) {
-                Component promotedComponent = ServiceConfigurationUtil.getPromotedComponent(compositeService);
-
-                // Create a new component service to represent this composite
-                // service on the promoted component
-                ComponentService newComponentService = assemblyFactory.createComponentService();
-                newComponentService.setName("$promoted$." + compositeService.getName());
-                promotedComponent.getServices().add(newComponentService);
-                newComponentService.setService(promotedService.getService());
-                newComponentService.getBindings().addAll(compositeService.getBindings());
-                newComponentService.setInterfaceContract(compositeService.getInterfaceContract());
-                if (compositeService.getInterfaceContract() != null &&
-                    compositeService.getInterfaceContract().getCallbackInterface() != null) {
-                    newComponentService.setCallback(assemblyFactory.createCallback());
-                    newComponentService.getCallback().getBindings()
-                            .addAll(compositeService.getCallback().getBindings());
-                }
-
-                // Change the composite service to now promote the newly
-                // created component service directly
-                compositeService.setPromotedComponent(promotedComponent);
-                compositeService.setPromotedService(newComponentService);
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
deleted file mode 100644
index 1698b1a9c7..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.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.assembly.builder.impl;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.builder.EndpointBuilder;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * A factory for the Endpoint model.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class EndpointBuilderImpl implements EndpointBuilder {
-    
-    private Monitor monitor;
-    
-    public EndpointBuilderImpl (Monitor monitor){
-        this.monitor = monitor;
-    }
-    
-    private void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null){
-            Problem problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-    
-    private void error(String message, Object model, Exception ex) {
-        if (monitor != null){
-            Problem problem = null;
-            problem = new ProblemImpl(this.getClass().getName(), "assembly-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }
-    }
-
-    /**
-     * Resolve an endpoint against the provided target information and the 
-     * set of candidate bindings. 
-     */
-    public void build(Endpoint endpoint) {
-
-        // If this endpoint is not fully configured then don't try and resolve it
-        if (endpoint.getTargetComponentService() == null){
-            return;
-        }
-        
-        // Does the reference expect callbacks
-        boolean bidirectional = false;
-        
-        if (endpoint.getSourceComponentReference().getInterfaceContract() != null && 
-            endpoint.getSourceComponentReference().getInterfaceContract().getCallbackInterface() != null) {
-            bidirectional = true;
-        }
-        
-        // if the target service is a promoted service then find the
-        // service it promotes
-        if (endpoint.getTargetComponentService().getService() instanceof CompositeService) {
-            CompositeService compositeService = (CompositeService) endpoint.getTargetComponentService().getService();
-            // Find the promoted component service
-            ComponentService promotedComponentService = ServiceConfigurationUtil.getPromotedComponentService(compositeService);
-            if (promotedComponentService != null && !promotedComponentService.isUnresolved()) {
-                endpoint.setTargetComponentService(promotedComponentService);
-            }
-        }
-        
-        try  {
-            PolicyConfigurationUtil.determineApplicableBindingPolicySets(endpoint.getSourceComponentReference(), 
-                                                                         endpoint.getTargetComponentService());
-        } catch ( Exception e ) {
-            error("PolicyRelatedException", endpoint, e);
-        }    
-        
-
-        // Match the binding against the bindings of the target service
-        Binding resolvedBinding = BindingConfigurationUtil.matchBinding(endpoint.getTargetComponent(),
-                                                                        endpoint.getTargetComponentService(),
-                                                                        endpoint.getCandidateBindings(),
-                                                                        endpoint.getTargetComponentService().getBindings());
-        if (resolvedBinding == null) {
-            warning("NoMatchingBinding", 
-                    endpoint.getSourceComponentReference(),
-                    endpoint.getSourceComponentReference().getName(), 
-                    endpoint.getTargetComponentService().getName());
-        } else {
-            endpoint.setSourceBinding(resolvedBinding);
-        }
-        
-        if (bidirectional) {
-            Binding resolvedCallbackBinding = BindingConfigurationUtil.matchBinding(endpoint.getTargetComponent(),
-                                                                                    endpoint.getTargetComponentService(),
-                                                                                    endpoint.getSourceComponentReference().getCallback().getBindings(),
-                                                                                    endpoint.getTargetComponentService().getCallback().getBindings());
-            if (resolvedBinding == null) {
-                warning("NoMatchingCallbackBinding", 
-                        endpoint.getSourceComponentReference(),
-                        endpoint.getSourceComponentReference().getName(), 
-                        endpoint.getTargetComponentService().getName());
-            } else {
-                endpoint.setSourceCallbackBinding(resolvedCallbackBinding);
-            }
-        }       
-    }  
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
deleted file mode 100644
index 944cf2cf36..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.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.assembly.builder.impl;

-

-/**

- * Exception to be throw for invalid policy intents / policysets

- *

- * @version $Rev$ $Date$

- */

-public class PolicyConfigurationException extends Exception {

-    private static final long serialVersionUID = 506979037642587755L;

-    

-    public PolicyConfigurationException(String message) {

-        super(message);

-    }

-    

-    public PolicyConfigurationException(Throwable e) {

-        super(e);

-    }

-    

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
deleted file mode 100644
index c0bc18dfaf..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ /dev/null
@@ -1,752 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.builder.impl;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Hashtable;

-import java.util.List;

-import java.util.Map;

-

-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.Component;

-import org.apache.tuscany.sca.assembly.ConfiguredOperation;

-import org.apache.tuscany.sca.assembly.Contract;

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.apache.tuscany.sca.assembly.OperationsConfigurator;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPoint;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;

-import org.apache.tuscany.sca.policy.QualifiedIntent;

-import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;

-import org.apache.tuscany.sca.policy.util.PolicyValidationException;

-import org.apache.tuscany.sca.policy.util.PolicyValidationUtils;

-

-/**

- * This class contains policy computation methods common to computing implementation and binding policies

- *

- * @version $Rev$ $Date$

- */

-abstract class PolicyConfigurationUtil {

-    

-    private static List<Intent> computeInheritableIntents(IntentAttachPointType attachPointType, 

-                                                   List<Intent> inheritableIntents) throws PolicyValidationException {

-        List<Intent> validInheritableIntents = new ArrayList<Intent>();

-        

-        //expand profile intents in inherited intents

-        PolicyComputationUtils.expandProfileIntents(inheritableIntents);

-

-        //validate if inherited intent applies to the attachpoint (binding / implementation) and 

-        //only add such intents to the attachpoint (binding / implementation)

-        for (Intent intent : inheritableIntents) {

-            if ( !intent.isUnresolved() ) { 

-                for (QName constrained : intent.getConstrains()) {

-                    if ( PolicyValidationUtils.isConstrained(constrained, attachPointType)) {

-                        validInheritableIntents.add(intent);

-                        break;

-                    }

-                }

-            } else {

-                throw new PolicyValidationException("Policy Intent '" + intent.getName() + "' is not defined in this domain");

-            }

-        }

-        

-        return validInheritableIntents;

-    }

-    

-    private static void normalizeIntents(IntentAttachPoint intentAttachPoint) {

-        //expand profile intents specified in the attachpoint (binding / implementation)

-        PolicyComputationUtils.expandProfileIntents(intentAttachPoint.getRequiredIntents());

-

-        //remove duplicates and ...

-        //where qualified form of intent exists retain it and remove the qualifiable intent

-        filterDuplicatesAndQualifiableIntents(intentAttachPoint);

-    }

-    

-    private static void trimInherentlyProvidedIntents(IntentAttachPointType attachPointType, List<Intent>intents) {

-        //exclude intents that are inherently supported by the 

-        //attachpoint-type (binding-type  / implementation-type)

-        List<Intent> requiredIntents = new ArrayList<Intent>(intents);

-        for ( Intent intent : requiredIntents ) {

-            if ( isProvidedInherently(attachPointType, intent) ) {

-                intents.remove(intent);

-            }

-        }

-    }

-    

-    

-    static void computeIntentsForOperations(IntentAttachPoint intentAttachPoint) throws PolicyValidationException {

-        if ( intentAttachPoint instanceof OperationsConfigurator ) {

-            computeIntentsForOperations((OperationsConfigurator)intentAttachPoint, 

-                                        intentAttachPoint, 

-                                        intentAttachPoint.getRequiredIntents());

-        }

-    }

-    

-    private static void computeIntentsForOperations(OperationsConfigurator opConfigurator, 

-                                               IntentAttachPoint intentAttachPoint, 

-                                               List<Intent> parentIntents) throws PolicyValidationException {

-        IntentAttachPointType attachPointType = intentAttachPoint.getType();

-        

-        boolean found = false;

-        for ( ConfiguredOperation confOp : opConfigurator.getConfiguredOperations() ) {

-            //expand profile intents specified on operations

-            PolicyComputationUtils.expandProfileIntents(confOp.getRequiredIntents());

-            

-            //validateIntents(confOp, attachPointType);

-            

-            //add intents specified for parent intent attach point (binding / implementation)

-            //wherever its not overridden in the operation

-            Intent tempIntent = null;

-            List<Intent> attachPointOpIntents = new ArrayList<Intent>();

-            for (Intent anIntent : parentIntents) {

-                found = false;

-            

-                tempIntent = anIntent;

-                while ( tempIntent instanceof QualifiedIntent ) {

-                    tempIntent = ((QualifiedIntent)tempIntent).getQualifiableIntent();

-                }

-                

-                for ( Intent opIntent : confOp.getRequiredIntents() ) {

-                    if ( opIntent.getName().getLocalPart().startsWith(tempIntent.getName().getLocalPart())) {

-                        found = true;

-                        break;

-                    }

-                }

-                

-                if ( !found ) {

-                    boolean conflict = false;

-                    for (Intent excluded : anIntent.getExcludedIntents()) {

-                        if (confOp.getRequiredIntents().contains(excluded)) {

-                            conflict = true;

-                            break;

-                        }

-                    }

-                    if (!conflict) {

-                        attachPointOpIntents.add(anIntent);

-                    }

-                }

-            }

-            

-            confOp.getRequiredIntents().addAll(attachPointOpIntents);

-            

-            //remove duplicates and ...

-            //where qualified form of intent exists retain it and remove the qualifiable intent

-            filterDuplicatesAndQualifiableIntents(confOp);

-            

-            //exclude intents that are inherently supported by the parent

-            //attachpoint-type (binding-type  / implementation-type)

-            if ( attachPointType != null ) {

-                List<Intent> requiredIntents = new ArrayList<Intent>(confOp.getRequiredIntents());

-                for ( Intent intent : requiredIntents ) {

-                    if ( isProvidedInherently(attachPointType, intent) ) {

-                        confOp.getRequiredIntents().remove(intent);

-                    }

-                }

-            }

-        }

-    }

-    

-    private static List<PolicySet> computeInheritablePolicySets(List<PolicySet> inheritablePolicySets,

-                                                           List<PolicySet> applicablePolicySets) 

-                                                               throws PolicyValidationException {

-        List<PolicySet> validInheritablePolicySets = new ArrayList<PolicySet>();

-        for (PolicySet policySet : inheritablePolicySets) {

-            if ( !policySet.isUnresolved() ) { 

-                if ( applicablePolicySets.contains(policySet) ) {

-                    validInheritablePolicySets.add(policySet);

-                }

-            } else {

-                throw new PolicyValidationException("Policy Set '" + policySet.getName()

-                        + "' is not defined in this domain  ");

-            }

-        }

-        

-        return validInheritablePolicySets;

-    }

-    

-    private static void normalizePolicySets(PolicySetAttachPoint policySetAttachPoint ) {

-        //get rid of duplicate entries

-        HashMap<QName, PolicySet> policySetTable = new HashMap<QName, PolicySet>();

-        for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {

-            policySetTable.put(policySet.getName(), policySet);

-        }

-        

-        policySetAttachPoint.getPolicySets().clear();

-        policySetAttachPoint.getPolicySets().addAll(policySetTable.values());

-            

-        //expand profile intents

-        for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {

-            PolicyComputationUtils.expandProfileIntents(policySet.getProvidedIntents());

-        }

-    }

-    

-    private static void computePolicySetsForOperations(List<PolicySet> applicablePolicySets,

-                                                  PolicySetAttachPoint policySetAttachPoint) 

-                                                                        throws PolicyValidationException {

-        if ( policySetAttachPoint instanceof OperationsConfigurator ) {

-            computePolicySetsForOperations(applicablePolicySets, 

-                                           (OperationsConfigurator)policySetAttachPoint, 

-                                           policySetAttachPoint);

-        }

-        

-    }

-    

-    private static void computePolicySetsForOperations(List<PolicySet> applicablePolicySets, 

-                                                  OperationsConfigurator opConfigurator,

-                                                  PolicySetAttachPoint policySetAttachPoint) 

-                                                                        throws PolicyValidationException {

-        //String appliesTo = null;

-        //String scdlFragment = "";

-        HashMap<QName, PolicySet> policySetTable = new HashMap<QName, PolicySet>();

-        IntentAttachPointType attachPointType = policySetAttachPoint.getType();

-        

-        for ( ConfiguredOperation confOp : opConfigurator.getConfiguredOperations() ) {

-            //validate policysets specified for the attachPoint

-            for (PolicySet policySet : confOp.getPolicySets()) {

-                if ( !policySet.isUnresolved() ) {

-                    //appliesTo = policySet.getAppliesTo();

-        

-                    //if (!PolicyValidationUtils.isPolicySetApplicable(scdlFragment, appliesTo, attachPointType)) {

-                    if (!applicablePolicySets.contains(policySet)) {

-                        throw new PolicyValidationException("Policy Set '" + policySet.getName() 

-                                + " specified for operation " + confOp.getName()  

-                            + "' does not constrain extension type  "

-                            + attachPointType.getName());

-        

-                    }

-                } else {

-                    throw new PolicyValidationException("Policy Set '" + policySet.getName() 

-                            + " specified for operation " + confOp.getName()  

-                        + "' is not defined in this domain  ");

-                }

-            }

-            

-            //get rid of duplicate entries

-            for ( PolicySet policySet : confOp.getPolicySets() ) {

-                policySetTable.put(policySet.getName(), policySet);

-            }

-        

-            confOp.getPolicySets().clear();

-            confOp.getPolicySets().addAll(policySetTable.values());

-            policySetTable.clear();

-            

-            //expand profile intents

-            for ( PolicySet policySet : confOp.getPolicySets() ) {

-                PolicyComputationUtils.expandProfileIntents(policySet.getProvidedIntents());

-            }

-        }

-    }

-    

-        

-    private static void trimProvidedIntents(List<Intent> requiredIntents, List<PolicySet> policySets) {

-        for ( PolicySet policySet : policySets ) {

-            trimProvidedIntents(requiredIntents, policySet);

-        }

-    }

-    

-    private static void determineApplicableDomainPolicySets(List<PolicySet> applicablePolicySets,

-                                                     PolicySetAttachPoint policySetAttachPoint,

-                                                     IntentAttachPointType intentAttachPointType) {

-

-        if (policySetAttachPoint.getRequiredIntents().size() > 0) {

-

-            // form a list of all intents required by the attach point

-            List<Intent> combinedTargetIntents = new ArrayList<Intent>();

-            combinedTargetIntents.addAll(policySetAttachPoint.getRequiredIntents());

-            for (PolicySet targetPolicySet : policySetAttachPoint.getPolicySets()) {

-                combinedTargetIntents.addAll(PolicyComputationUtils.findAndExpandProfileIntents(targetPolicySet.getProvidedIntents()));

-            }

-

-            //since the set of applicable policysets for this attachpoint is known 

-            //we only need to check in that list if there is a policyset that matches

-            for (PolicySet policySet : applicablePolicySets) {

-                // do not use the policy set if it provides intents that conflict with required intents

-                boolean conflict = false;

-                List<Intent> providedIntents = PolicyComputationUtils.findAndExpandProfileIntents(policySet.getProvidedIntents());

-                checkConflict: for (Intent intent : providedIntents) {

-                    for (Intent excluded : intent.getExcludedIntents()) {

-                        if (combinedTargetIntents.contains(excluded)) {

-                            conflict = true;

-                            break checkConflict;

-                        }

-                    }

-                }

-                if (conflict)

-                    continue;

-                int prevSize = policySetAttachPoint.getRequiredIntents().size();

-                trimProvidedIntents(policySetAttachPoint.getRequiredIntents(), policySet);

-                // if any intent was trimmed off, then this policyset must

-                // be attached to the intent attachpoint's policyset

-                if (prevSize != policySetAttachPoint.getRequiredIntents().size()) {

-                    policySetAttachPoint.getPolicySets().add(policySet);

-                }

-            } 

-        }

-    }

-    

-    private static boolean isProvidedInherently(IntentAttachPointType attachPointType, Intent intent) {

-        return ( attachPointType != null && 

-                 (( attachPointType.getAlwaysProvidedIntents() != null &&

-                     attachPointType.getAlwaysProvidedIntents().contains(intent) ) || 

-                  ( attachPointType.getMayProvideIntents() != null &&

-                     attachPointType.getMayProvideIntents().contains(intent) )

-                 ) );

-     }

-    

-    private static void trimProvidedIntents(List<Intent> requiredIntents, PolicySet policySet) {

-        for ( Intent providedIntent : policySet.getProvidedIntents() ) {

-            if ( requiredIntents.contains(providedIntent) ) {

-                requiredIntents.remove(providedIntent);

-            } 

-        }

-        

-        for ( Intent mappedIntent : policySet.getMappedPolicies().keySet() ) {

-            if ( requiredIntents.contains(mappedIntent) ) {

-                requiredIntents.remove(mappedIntent);

-            } 

-        }

-    }

-    

-    private static void filterDuplicatesAndQualifiableIntents(IntentAttachPoint intentAttachPoint) {

-        //remove duplicates

-        Map<QName, Intent> intentsTable = new HashMap<QName, Intent>();

-        for ( Intent intent : intentAttachPoint.getRequiredIntents() ) {

-            intentsTable.put(intent.getName(), intent);

-        }

-        

-        //where qualified form of intent exists retain it and remove the qualifiable intent

-        Map<QName, Intent> intentsTableCopy = new HashMap<QName, Intent>(intentsTable);

-        //if qualified form of intent exists remove the unqualified form

-        for ( Intent intent : intentsTableCopy.values() ) {

-            if ( intent instanceof QualifiedIntent ) {

-                QualifiedIntent qualifiedIntent = (QualifiedIntent)intent;

-                if ( intentsTable.get(qualifiedIntent.getQualifiableIntent().getName()) != null ) {

-                    intentsTable.remove(qualifiedIntent.getQualifiableIntent().getName());

-                }

-            }

-        }

-        intentAttachPoint.getRequiredIntents().clear();

-        intentAttachPoint.getRequiredIntents().addAll(intentsTable.values());

-    }

-    

-    private static void validateIntents(ConfiguredOperation confOp, IntentAttachPointType attachPointType) throws PolicyValidationException {

-        boolean found = false;

-        if ( attachPointType != null ) {

-            //validate intents specified against the parent (binding / implementation)

-            found = false;

-            for (Intent intent : confOp.getRequiredIntents()) {

-                if ( !intent.isUnresolved() ) {

-                    for (QName constrained : intent.getConstrains()) {

-                        if (PolicyValidationUtils.isConstrained(constrained, attachPointType)) {

-                            found = true;

-                            break;

-                        }

-                    }

-        

-                    if (!found) {

-                        throw new PolicyValidationException("Policy Intent '" + intent.getName() 

-                                + " specified for operation " + confOp.getName()  

-                            + "' does not constrain extension type  "

-                            + attachPointType.getName());

-                    }

-                } else {

-                    throw new PolicyValidationException("Policy Intent '" + intent.getName() 

-                            + " specified for operation " + confOp.getName()  

-                        + "' is not defined in this domain  ");

-                }

-            }

-        }

-    }

-

-    static void computeBindingIntentsAndPolicySets(Contract contract)  throws PolicyValidationException {

-        for (Binding binding : contract.getBindings()) {

-            if (binding instanceof PolicySetAttachPoint) {

-                PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;

-                computeIntents((IntentAttachPoint)binding, contract.getRequiredIntents());

-                

-                aggregateAndPruneApplicablePolicySets(contract.getApplicablePolicySets(), 

-                                                      policiedBinding.getApplicablePolicySets());

-    

-                computePolicySets(policiedBinding, contract.getPolicySets());

-    

-                PolicyComputationUtils.checkForMutuallyExclusiveIntents(

-                    policiedBinding.getRequiredIntents(),

-                    policiedBinding.getPolicySets(),

-                    policiedBinding.getType(),

-                    contract.getName());

-    

-                if ( binding instanceof OperationsConfigurator && 

-                        contract instanceof OperationsConfigurator ) {

-                    //add or merge service operations to the binding

-                    addInheritedOpConfOnBindings((OperationsConfigurator)contract,

-                                                 (OperationsConfigurator)binding,

-                                                 (PolicySetAttachPoint)binding);

-                

-                    computeIntentsForOperations((IntentAttachPoint)binding);

-                    computePolicySetsForOperations(contract.getApplicablePolicySets(), 

-                                                   policiedBinding);

-    

-                    for ( ConfiguredOperation confOp : ((OperationsConfigurator)binding).getConfiguredOperations() ) {

-                        PolicyComputationUtils.checkForMutuallyExclusiveIntents(

-                            confOp.getRequiredIntents(),

-                            confOp.getPolicySets(),

-                            policiedBinding.getType(),

-                            contract.getName() + "." + confOp.getName());

-                    }

-    

-                }

-            }

-        }

-        

-        if ( contract.getCallback() != null ) {

-            for (Binding binding : contract.getCallback().getBindings()) {

-                if (binding instanceof PolicySetAttachPoint) {

-                    PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;

-                    computeIntents((IntentAttachPoint)binding, contract.getCallback().getRequiredIntents());

-            

-                    aggregateAndPruneApplicablePolicySets(contract.getApplicablePolicySets(), 

-                                                          policiedBinding.getApplicablePolicySets());

-    

-                    computePolicySets(policiedBinding, contract.getCallback().getPolicySets());

-    

-                    PolicyComputationUtils.checkForMutuallyExclusiveIntents(

-                        policiedBinding.getRequiredIntents(),

-                        policiedBinding.getPolicySets(),

-                        policiedBinding.getType(),

-                        contract.getName() + " callback");

-    

-                }

-            }

-        }

-    }

-

-    private static void computeIntents(IntentAttachPoint policiedBinding, List<Intent> inheritedIntents) 

-                                                                    throws PolicyValidationException {

-            //since the parent component could also contain intents that apply to implementation

-            //and binding elements within, we filter out only those that apply to this binding type

-            List<Intent> prunedIntents = computeInheritableIntents(policiedBinding.getType(), 

-                                                                   inheritedIntents);

-            policiedBinding.getRequiredIntents().addAll(prunedIntents);

-            

-            normalizeIntents(policiedBinding);

-    }

-

-    private static void computePolicySets(PolicySetAttachPoint policiedBinding,

-                                   List<PolicySet> inheritedPolicySets) throws PolicyValidationException {

-                

-        List<PolicySet> prunedPolicySets = computeInheritablePolicySets(inheritedPolicySets,

-                                                                        policiedBinding.getApplicablePolicySets());

-        policiedBinding.getPolicySets().addAll(prunedPolicySets);

-        normalizePolicySets(policiedBinding);

-    }

-

-    static void determineApplicableBindingPolicySets(Contract source, Contract target) throws PolicyConfigurationException {

-        List<Intent> intentsCopy = null;

-        for (Binding aBinding : source.getBindings()) {

-            if (aBinding instanceof PolicySetAttachPoint) {

-                PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)aBinding;

-                IntentAttachPointType bindingType = policiedBinding.getType();

-    

-                

-                intentsCopy = new ArrayList<Intent>(policiedBinding.getRequiredIntents());

-                // add the target component's intents to the reference binding

-                if (target != null) {

-                    for (Intent intent : target.getRequiredIntents()) {

-                        if (!policiedBinding.getRequiredIntents().contains(intent)) {

-                            for (QName constrained : intent.getConstrains()) {

-                                if (bindingType != null && bindingType.getName().getNamespaceURI()

-                                    .equals(constrained.getNamespaceURI())

-                                    && bindingType.getName().getLocalPart().startsWith(constrained

-                                        .getLocalPart())) {

-                                    policiedBinding.getRequiredIntents().add(intent);

-                                    break;

-                                }

-                            }

-                        }

-                    }

-                }

-                

-                //trim intents specified in operations.  First check for policysets specified on the operation

-                //and then in the parent implementation

-                if ( aBinding instanceof OperationsConfigurator ) {

-                    OperationsConfigurator opConfigurator = (OperationsConfigurator)aBinding;

-                    

-                    for ( ConfiguredOperation confOp : opConfigurator.getConfiguredOperations() ) {

-                        List<Intent> opsIntentsCopy = new ArrayList<Intent>(confOp.getRequiredIntents());

-                        

-                        trimInherentlyProvidedIntents(policiedBinding.getType(), 

-                                                      confOp.getRequiredIntents());

-                        trimProvidedIntents(confOp.getRequiredIntents(), confOp.getPolicySets());

-                        trimProvidedIntents(confOp.getRequiredIntents(), policiedBinding.getPolicySets());

-                        

-                        determineApplicableDomainPolicySets(policiedBinding.getApplicablePolicySets(), 

-                                                            confOp,

-                                                            policiedBinding.getType());

-    

-                        if (confOp.getRequiredIntents().size() > 0) {

-                            throw new PolicyConfigurationException("The following are unfulfilled intents for operations configured in "

-                                    + "binding - " + aBinding.getName() + "\nUnfulfilled Intents = " +

-                                    confOp.getRequiredIntents());

-                        }

-                        

-                        //the intents list could have been trimmed when matching for policysets

-                        //since the bindings may need the original set of intents we copy that back

-                        confOp.getRequiredIntents().clear();

-                        confOp.getRequiredIntents().addAll(opsIntentsCopy);

-                        

-                    }

-                }

-    

-                trimInherentlyProvidedIntents(policiedBinding.getType(), 

-                                              policiedBinding.getRequiredIntents());

-                trimProvidedIntents(policiedBinding.getRequiredIntents(), policiedBinding

-                    .getPolicySets());

-    

-                // determine additional policysets that match remaining intents

-                // TODO: resolved to domain policy registry and attach suitable

-                // policy sets to the binding

-                // for now using the SCA Definitions instead of registry

-                // if there are intents that are not provided by any policy set

-                // throw a warning

-                determineApplicableDomainPolicySets(source, policiedBinding);

-                

-                //the intents list could have been trimmed when matching for policysets

-                //since the bindings may need the original set of intents we copy that back

-                policiedBinding.getRequiredIntents().clear();

-                policiedBinding.getRequiredIntents().addAll(intentsCopy);

-                

-            }

-        }

-    }

-

-    private static void determineApplicableDomainPolicySets(Contract contract, 

-                                                     PolicySetAttachPoint policiedBinding) 

-                                                            throws PolicyConfigurationException {

-        //if ( domainPolicySets != null) {

-            determineApplicableDomainPolicySets(policiedBinding.getApplicablePolicySets(), 

-                                                policiedBinding,

-                                                policiedBinding.getType());

-            

-            if ( policiedBinding.getRequiredIntents().size() > 0 ) {

-                if ( contract instanceof Service ) {

-                    throw new PolicyConfigurationException("The following are unfulfilled intents for " +

-                            "binding in service - " + contract.getName() + "\nUnfulfilled Intents = " + 

-                            policiedBinding.getRequiredIntents());

-                } else {

-                    throw new PolicyConfigurationException("The are unfulfilled intents for " +

-                            "binding in reference - " + contract.getName() + "\nUnfulfilled Intents = " + 

-                            policiedBinding.getRequiredIntents());

-                }

-            }

-        //}

-    }

-

-    private static void addInheritedOpConfOnBindings(OperationsConfigurator source, 

-                                              OperationsConfigurator target,

-                                              PolicySetAttachPoint attachPoint) throws PolicyValidationException {

-        boolean found = false;

-        

-        List<ConfiguredOperation> additionalOperations = new ArrayList<ConfiguredOperation>();

-        for ( ConfiguredOperation sourceConfOp : source.getConfiguredOperations() ) {

-            for ( ConfiguredOperation targetConfOp : target.getConfiguredOperations() ) {

-                if ( sourceConfOp.getName().equals(targetConfOp.getName())) {

-                    List<Intent> prunedIntents = computeInheritableIntents(attachPoint.getType(), 

-                                                                           sourceConfOp.getRequiredIntents());

-                    PolicyComputationUtils.addInheritedIntents(prunedIntents, 

-                                                               targetConfOp.getRequiredIntents());

-                    

-                    List<PolicySet> prunedPolicySets  = computeInheritablePolicySets(sourceConfOp.getPolicySets(), 

-                                                                                     attachPoint.getApplicablePolicySets());

-                    PolicyComputationUtils.addInheritedPolicySets(prunedPolicySets, targetConfOp.getPolicySets(), true);

-                    found = true;

-                    break;

-                }

-            }

-            

-            if ( !found ) {

-                additionalOperations.add(sourceConfOp);

-            }

-        }

-        

-        if ( !additionalOperations.isEmpty() ) {

-            target.getConfiguredOperations().addAll(additionalOperations);

-        }

-    }

-

-    private static void aggregateAndPruneApplicablePolicySets(List<PolicySet> source, List<PolicySet> target) {

-        target.addAll(source);

-        //strip duplicates

-        Hashtable<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();

-        for ( PolicySet policySet : target ) {

-            policySetTable.put(policySet.getName(), policySet);

-        }

-        

-        target.clear();

-        target.addAll(policySetTable.values());

-    }

-

-    static <C extends Contract> void inheritDefaultPolicies(Base parent, List<C> contracts) {

-    

-        for (Contract contract : contracts) {

-    

-            // The contract inherits default policies from the parent composite/component.

-            if ( parent instanceof PolicySetAttachPoint )  {

-                PolicyComputationUtils.addDefaultPolicies(

-                                         ((PolicySetAttachPoint)parent).getRequiredIntents(),

-                                         ((PolicySetAttachPoint)parent).getPolicySets(),

-                                         contract.getRequiredIntents(),

-                                         contract.getPolicySets());

-            }

-    

-            // The contract's configured operations inherit default policies from the contract.

-            for ( ConfiguredOperation confOp : contract.getConfiguredOperations() ) {

-                PolicyComputationUtils.addDefaultPolicies(

-                                         contract.getRequiredIntents(),

-                                         contract.getPolicySets(),

-                                         confOp.getRequiredIntents(),

-                                         confOp.getPolicySets());

-            }

-    

-            // The contract's callback inherits default policies from the contract.

-            if (contract.getCallback() != null) {

-                PolicyComputationUtils.addDefaultPolicies(

-                                         contract.getRequiredIntents(),

-                                         contract.getPolicySets(),

-                                         contract.getCallback().getRequiredIntents(),

-                                         contract.getCallback().getPolicySets());

-            }

-    

-        }

-    }

-

-    static void computeImplementationIntentsAndPolicySets(Implementation implementation, Component parent)  

-                                                                throws PolicyValidationException, PolicyConfigurationException {

-        if ( implementation instanceof PolicySetAttachPoint ) {

-            PolicySetAttachPoint policiedImplementation = (PolicySetAttachPoint)implementation;

-            //since for an implementation the component has its policy intents and policysets its possible

-            //that there are some intents there that does not constrain the implementation.. so prune 

-            List<Intent> prunedIntents = computeInheritableIntents(policiedImplementation.getType(), 

-                                                                   parent.getRequiredIntents());

-            parent.getRequiredIntents().clear();

-            parent.getRequiredIntents().addAll(prunedIntents);

-            normalizeIntents(parent);

-    

-            computeIntentsForOperations((OperationsConfigurator)parent,

-                                        (IntentAttachPoint)implementation,

-                                        parent.getRequiredIntents());

-            

-            

-            List<PolicySet> prunedPolicySets = computeInheritablePolicySets(parent.getPolicySets(),

-                                                                            parent.getApplicablePolicySets());

-            parent.getPolicySets().clear();

-            parent.getPolicySets().addAll(prunedPolicySets);

-            normalizePolicySets(parent);

-    

-            PolicyComputationUtils.checkForMutuallyExclusiveIntents(

-                parent.getRequiredIntents(),

-                parent.getPolicySets(),

-                policiedImplementation.getType(),

-                parent.getName());

-    

-            computePolicySetsForOperations(parent.getApplicablePolicySets(), 

-                                           (OperationsConfigurator)parent, 

-                                           (PolicySetAttachPoint)implementation);

-    

-            for ( ConfiguredOperation confOp : ((OperationsConfigurator)parent).getConfiguredOperations() ) {

-                PolicyComputationUtils.checkForMutuallyExclusiveIntents(

-                    confOp.getRequiredIntents(),

-                    confOp.getPolicySets(),

-                    policiedImplementation.getType(),

-                    parent.getName() + "." + confOp.getName());

-            }

-            

-            determineApplicableImplementationPolicySets(parent);

-    

-        }

-    }

-

-    private static void determineApplicableImplementationPolicySets(Component component) throws PolicyConfigurationException {

-        List<Intent> intentsCopy = null;

-        if ( component.getImplementation() instanceof PolicySetAttachPoint ) {

-            PolicySetAttachPoint policiedImplementation = (PolicySetAttachPoint)component.getImplementation();

-           

-            //trim intents specified in operations.  First check for policysets specified on the operation

-            //and then in the parent implementation

-            if ( component instanceof OperationsConfigurator ) {

-                OperationsConfigurator opConfigurator = (OperationsConfigurator)component;

-                

-                for ( ConfiguredOperation confOp : opConfigurator.getConfiguredOperations() ) {

-                    intentsCopy = new ArrayList<Intent>(confOp.getRequiredIntents());

-                    trimInherentlyProvidedIntents(policiedImplementation.getType(), 

-                                                  confOp.getRequiredIntents());

-                    trimProvidedIntents(confOp.getRequiredIntents(), confOp.getPolicySets());

-                    trimProvidedIntents(confOp.getRequiredIntents(), component.getPolicySets());

-                    

-                    determineApplicableDomainPolicySets(component.getApplicablePolicySets(), 

-                                                        confOp,

-                                                        policiedImplementation.getType());

-    

-                    if (confOp.getRequiredIntents().size() > 0) {

-                        throw new PolicyConfigurationException("The following are unfulfilled intents for operations configured in "

-                                + "component implementation - " + component.getName() + "\nUnfulfilled Intents = " +

-                                confOp.getRequiredIntents());

-                    }

-                    

-                    //the intents list could have been trimmed when matching for policysets

-                    //since the implementation may need the original set of intents we copy that back

-                    confOp.getRequiredIntents().clear();

-                    confOp.getRequiredIntents().addAll(intentsCopy);

-                }

-            }

-                

-            intentsCopy = new ArrayList<Intent>(component.getRequiredIntents());

-            trimInherentlyProvidedIntents(policiedImplementation.getType(), 

-                                          component.getRequiredIntents());

-            trimProvidedIntents(component.getRequiredIntents(), component.getPolicySets());

-                

-            //determine additional policysets that match remaining intents

-            //if there are intents that are not provided by any policy set throw a warning

-            //TODO: resolved to domain policy registry and attach suitable policy sets to the implementation

-            //...for now using the SCA Definitions instead of registry

-            //if ( domainPolicySets != null)  {

-                determineApplicableDomainPolicySets(component.getApplicablePolicySets(), 

-                                                    component,

-                                                    policiedImplementation.getType());

-                                                    

-                if (component.getRequiredIntents().size() > 0) {

-                    throw new PolicyConfigurationException("The following are unfulfilled intents for component implementation - " + component

-                        .getName() + "\nUnfulfilled Intents = " + component.getRequiredIntents());

-                }

-            //}

-            

-            //the intents list could have been trimmed when matching for policysets

-            //since the bindings may need the original set of intents we copy that back

-            component.getRequiredIntents().clear();

-            component.getRequiredIntents().addAll(intentsCopy);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
deleted file mode 100644
index e85aec8cea..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.builder.impl;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.OutputStream;
-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.w3c.dom.Node;
-
-/**
- * A simple print utility class to help print model instances.
- * 
- * @version $Rev$ $Date$
- */
-class PrintUtil {
-    private boolean useGetters = false;
-    private PrintWriter out;
-    private int indent;
-
-    public PrintUtil(PrintWriter out, boolean useGetters) {
-        this.out = out;
-        this.useGetters = useGetters;
-    }
-
-    public PrintUtil(OutputStream out) {
-        this.out = new PrintWriter(new OutputStreamWriter(out), true);
-    }
-
-    void indent() {
-        for (int i = 0; i < indent; i++) {
-            out.print("  ");
-        }
-    }
-
-    /**
-     * 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() + "@" + id);
-        } else {
-            printed.add(id);
-            try {
-
-                // Print the object class name
-                indent();
-                out.println(object.getClass().getSimpleName() + " {");
-
-                // 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(" ]");
-                                    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());
-                                            indent--;
-                                        }
-                                    }
-                                } else if (value instanceof Node) {
-                                    indent++;
-                                    indent();
-                                    out.println(accessor.getName(i) + "=" + value.toString());
-                                    indent--;
-                                } else {
-
-                                    // Print an object, recursively
-                                    indent++;
-                                    indent();
-                                    out.println(accessor.getName(i) + "= {");
-                                    indent++;
-                                    print(value, printed);
-                                    indent--;
-                                    indent();
-                                    out.println("}");
-                                    indent--;
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                    }
-                }
-                indent();
-                out.println("}");
-            } 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/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
deleted file mode 100644
index 03f24dfae8..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.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.assembly.builder.impl;
-
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
-
-import org.apache.tuscany.sca.monitor.Problem;
-
-/**
- * Reports a composite assembly problem. 
- *
- * @version $Rev$ $Date$
- */
-public class ProblemImpl implements Problem {
-
-    private String sourceClassName;
-    private String bundleName;
-    private Severity severity;
-    private Object problemObject;
-    private String messageId;
-    private Object[] messageParams;
-    private Exception cause;
-
-    /**
-     * Construct a new problem
-     * 
-     * @param sourceClassName   the class name reporting the problem
-     * @param bundleName        the name of the message bundle to use
-     * @param severity          the severity of the problem
-     * @param problemObject     the model object for which the problem is being reported
-     * @param messageId         the id of the problem message
-     * @param messageParams     the parameters of the problem message
-     */
-    public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Object... messageParams ) {
-        this.sourceClassName = sourceClassName;
-        this.bundleName = bundleName;
-        this.severity = severity;
-        this.problemObject = problemObject;
-        this.messageId = messageId;
-        this.messageParams = messageParams;
-    }
-    
-    /**
-     * Construct a new problem
-     * 
-     * @param sourceClassName   the class name reporting the problem
-     * @param bundleName        the name of the message bundle to use
-     * @param severity          the severity of the problem
-     * @param problemObject     the model object for which the problem is being reported
-     * @param messageId         the id of the problem message
-     * @param cause             the exception which caused the problem
-     */
-    public ProblemImpl(String sourceClassName, String bundleName, Severity severity, Object problemObject, String messageId, Exception cause) {
-        this.sourceClassName = sourceClassName;
-        this.bundleName = bundleName;   
-        this.severity = severity;        
-        this.problemObject = problemObject;
-        this.messageId = messageId;
-        this.cause = cause;
-    }    
-
-    public String getSourceClassName() {
-        return sourceClassName;
-    }
-    
-    public String getBundleName() {
-        return bundleName;
-    }
-    
-    public Severity getSeverity() {
-        return severity;
-    }
-    
-    public Object getProblemObject() {
-        return problemObject;
-    }
-    
-    public String getMessageId() {
-        return messageId;
-    }
-
-    public Object[] getMessageParams() {
-        return messageParams;
-    }
-    
-    public Exception getCause() {
-        return cause;
-    }    
-
-    @Override
-    public String toString() {
-        Logger logger = Logger.getLogger(sourceClassName, bundleName);
-        
-        LogRecord record = new LogRecord(Level.INFO, messageId);
-        
-        if (cause == null){
-            record.setParameters(messageParams);
-            
-        } else {
-            Object[] params = new String[1];
-            params[0] = cause.toString();
-            record.setParameters(params);
-        }
-        record.setResourceBundle(logger.getResourceBundle());
-        record.setSourceClassName(sourceClassName);
- 
-        Formatter formatter = new SimpleFormatter();
-        
-        return formatter.formatMessage(record);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
deleted file mode 100644
index 71971ef5a4..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.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.assembly.builder.impl;
-
-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.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-/**
- * Utility class to deal with processing of component properties that are taking values from the parent 
- * composite's properties or an external file.
- *
- * @version $Rev$ $Date$
- */
-abstract class PropertyConfigurationUtil {
-    private static final DocumentBuilderFactory DOC_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
-    private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
-    
-    private static Document evaluate(Document node, XPathExpression expression)
-        throws XPathExpressionException, ParserConfigurationException {
-
-        Node value = node.getDocumentElement();
-        Node result = (Node)expression.evaluate(value, XPathConstants.NODE);
-        if (result == null) {
-            return null;
-        }
-
-        // TODO: How to wrap the result into a Document?
-        Document document = DOC_BUILDER_FACTORY.newDocumentBuilder().newDocument();
-        if (result instanceof Document) {
-            return (Document)result;
-        } else {
-            //Element root = document.createElementNS(null, "value");
-            //document.appendChild(root);
-            document.appendChild(document.importNode(result, true));
-            return document;
-        }
-    }
-    
-    private static Document loadFromFile(String file) throws MalformedURLException, IOException,
-        TransformerException, ParserConfigurationException {
-        URI uri = URI.create(file);
-        // URI resolution for relative URIs is done when the composite is resolved.
-        URL url = uri.toURL();
-        URLConnection connection = url.openConnection();
-        connection.setUseCaches(false);
-        InputStream is = null;
-        try {
-            is = connection.getInputStream();
-    
-            Source streamSource = new SAXSource(new InputSource(is));
-            DOMResult result = new DOMResult();
-            javax.xml.transform.Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
-            transformer.transform(streamSource, result);
-            
-            Document document = (Document)result.getNode();
-            
-            // TUSCANY-2377, Add a fake value element so it's consistent with
-            // the DOM tree loaded from inside SCDL
-            Element root = document.createElementNS(null, "value");
-            root.appendChild(document.getDocumentElement());
-            document.appendChild(root);
-            return document;
-        } finally {
-            if (is != null) {
-                is.close();
-            }
-        }
-    }
-    
-    static void sourceComponentProperties(Map<String, Property> compositeProperties,
-                                                 Component componentDefinition) throws CompositeBuilderException,
-                                                                               ParserConfigurationException,
-                                                                               XPathExpressionException,
-                                                                               TransformerException,
-                                                                               IOException {
-
-        List<ComponentProperty> componentProperties = componentDefinition.getProperties();
-        for (ComponentProperty aProperty : componentProperties) {
-            String source = aProperty.getSource();
-            String file = aProperty.getFile();
-            if (source != null) {
-                // $<name>/...
-                int index = source.indexOf('/');
-                if (index == -1) {
-                    // Tolerating $prop
-                    source = source + "/";
-                    index = source.length() - 1;
-                }
-                if (source.charAt(0) == '$') {
-                    String name = source.substring(1, index);
-                    Property compositeProp = compositeProperties.get(name);
-                    if (compositeProp == null) {
-                        throw new CompositeBuilderException("The 'source' cannot be resolved to a composite property: " + source);
-                    }
-
-                    Document compositePropDefValues = (Document)compositeProp.getValue();
-
-                    // FIXME: How to deal with namespaces?
-                    Document node = evaluate(compositePropDefValues, aProperty.getSourceXPathExpression());
-
-                    if (node != null) {
-                        aProperty.setValue(node);
-                    }
-                } else {
-                    throw new CompositeBuilderException("The 'source' has an invalid value: " + source);
-                }
-            } else if (file != null) {
-                aProperty.setValue(loadFromFile(aProperty.getFile()));
-
-            }
-        }
-    }
-    
-    private static class DOMNamespaceContext implements NamespaceContext {
-        private Node node;
-
-        /**
-         * @param node
-         */
-        public DOMNamespaceContext(Node node) {
-            super();
-            this.node = node;
-        }
-
-        public String getNamespaceURI(String prefix) {
-            if (prefix == null) {
-                throw new IllegalArgumentException("Prefix is null");
-            } else if (XMLConstants.XML_NS_PREFIX.equals(prefix)) {
-                return XMLConstants.XML_NS_URI;
-            } else if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) {
-                return XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-            }
-            String ns = node.lookupNamespaceURI(prefix);
-            return ns == null ? XMLConstants.NULL_NS_URI : ns;
-        }
-
-        public String getPrefix(String namespaceURI) {
-            if (namespaceURI == null) {
-                throw new IllegalArgumentException("Namespace URI is null");
-            } else if (XMLConstants.XML_NS_URI.equals(namespaceURI)) {
-                return XMLConstants.XML_NS_PREFIX;
-            } else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI)) {
-                return XMLConstants.XMLNS_ATTRIBUTE;
-            }
-            return node.lookupPrefix(namespaceURI);
-        }
-
-        public Iterator<?> getPrefixes(String namespaceURI) {
-            // Not implemented
-            if (namespaceURI == null) {
-                throw new IllegalArgumentException("Namespace URI is null");
-            } else if (XMLConstants.XML_NS_URI.equals(namespaceURI)) {
-                return Arrays.asList(XMLConstants.XML_NS_PREFIX).iterator();
-            } else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI)) {
-                return Arrays.asList(XMLConstants.XMLNS_ATTRIBUTE).iterator();
-            }
-            String prefix = getPrefix(namespaceURI);
-            if (prefix == null) {
-                return Collections.emptyList().iterator();
-            }
-            return Arrays.asList(prefix).iterator();
-        }
-
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
deleted file mode 100644
index 23d547efaf..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.builder.impl;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * This class encapsulates utility methods to deal with reference definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class ReferenceConfigurationUtil {
-
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private static void warning(Monitor monitor, String message, Object model, String... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(ReferenceConfigurationUtil.class.getName(), "assembly-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    static boolean isValidMultiplicityOverride(Multiplicity definedMul, Multiplicity overridenMul) {
-        if (definedMul != overridenMul) {
-            switch (definedMul) {
-                case ZERO_N:
-                    return overridenMul == Multiplicity.ZERO_ONE;
-                case ONE_N:
-                    return overridenMul == Multiplicity.ONE_ONE;
-                default:
-                    return false;
-            }
-        } else {
-            return true;
-        }
-    }
-    
-    static boolean validateMultiplicityAndTargets(Multiplicity multiplicity,
-                                                         List<?> targets, List<Binding> bindings) {
-        
-        // Count targets
-        int count = targets.size();
-        
-        //FIXME workaround, this validation is sometimes invoked too early
-        // before we get a chance to init the multiplicity attribute
-        if (multiplicity == null) {
-            return true;
-        }
-        
-        switch (multiplicity) {
-            case ZERO_N:
-                break;
-            case ZERO_ONE:
-                if (count > 1) {
-                    return false;
-                }
-                break;
-            case ONE_ONE:
-                if (count != 1) {
-                    if (count == 0) {
-                        for (Binding binding: bindings) {
-                            if (!(binding instanceof OptimizableBinding) || binding.getURI()!=null) {
-                                return true;
-                            }
-                        }
-                    }
-                    return false;
-                }
-                break;
-            case ONE_N:
-                if (count < 1) {
-                    if (count == 0) {
-                        for (Binding binding: bindings) {
-                            if (!(binding instanceof OptimizableBinding) || binding.getURI()!=null) {
-                                return true;
-                            }
-                        }
-                    }
-                    return false;
-                }
-                break;
-        }
-        return true;
-    }
-
-    /**
-     * Follow a reference promotion chain down to the innermost (non composite)
-     * component references.
-     * 
-     * @param compositeReference
-     * @return
-     */
-    static List<ComponentReference> getPromotedComponentReferences(CompositeReference compositeReference) {
-        List<ComponentReference> componentReferences = new ArrayList<ComponentReference>();
-        collectPromotedComponentReferences(compositeReference, componentReferences);
-        return componentReferences;
-    }
-
-    /**
-     * Follow a reference promotion chain down to the innermost (non composite)
-     * component references.
-     * 
-     * @param compositeReference
-     * @param componentReferences
-     * @return
-     */
-    private static void collectPromotedComponentReferences(CompositeReference compositeReference,
-                                                           List<ComponentReference> componentReferences) {
-        for (ComponentReference componentReference : compositeReference.getPromotedReferences()) {
-            Reference reference = componentReference.getReference();
-            if (reference instanceof CompositeReference) {
-    
-                // Continue to follow the reference promotion chain
-                collectPromotedComponentReferences((CompositeReference)reference, componentReferences);
-    
-            } else if (reference != null) {
-    
-                // Found a non-composite reference
-                componentReferences.add(componentReference);
-            }
-        }
-    }
-
-    /**
-     * Override the bindings for a promoted reference from an outer component
-     * reference
-     * 
-     * @param reference
-     * @param promotedReference
-     */
-    static void reconcileReferenceBindings(Reference reference,
-                                           ComponentReference promotedReference,
-                                           AssemblyFactory assemblyFactory,
-                                           EndpointFactory endpointFactory,
-                                           Monitor monitor) {
-              
-        if (promotedReference.getMultiplicity() == Multiplicity.ONE_ONE ||
-            promotedReference.getMultiplicity() == Multiplicity.ZERO_ONE) {
-            
-            // if necessary override the promoted endpoints (and bindings) with the top level bindings
-            if (reference.getBindings().size() > 0 ){
-                
-                List<Binding> bindingsToCopyDown = new ArrayList<Binding>();
-                List<Endpoint> endpointsToCopyDown = new ArrayList<Endpoint>();
-                
-                for (Binding binding : reference.getBindings()) {
-                    if ((!(binding instanceof OptimizableBinding)) || binding.getURI() != null) {
-                        bindingsToCopyDown.add(binding);
-                        
-                        if (reference instanceof ComponentReference){
-                            for (Endpoint endpoint : ((ComponentReference)reference).getEndpoints()){
-                                if ( endpoint.getSourceBinding() == binding){
-                                    endpointsToCopyDown.add(endpoint);
-                                    break;
-                                }
-                            }
-                        } else {
-                            // create a new endpoint to represent this promoted binding
-                            Endpoint endpoint = endpointFactory.createEndpoint();
-                            endpoint.setTargetName(binding.getURI());
-                            endpoint.setSourceComponent(null); // TODO - fixed up at start
-                            endpoint.setSourceComponentReference(promotedReference);  
-                            endpoint.setInterfaceContract(reference.getInterfaceContract());
-                            endpoint.setSourceBinding(binding);
-                            endpointsToCopyDown.add(endpoint); 
-                        }
-                    }
-                }
-                
-                if (bindingsToCopyDown.size() > 0) {
-                    promotedReference.getBindings().clear();
-                    promotedReference.getBindings().addAll(bindingsToCopyDown);
-                    
-                    promotedReference.getEndpoints().clear();
-                    promotedReference.getEndpoints().addAll(endpointsToCopyDown);
-                }
-            }
-            
-            if (promotedReference.getBindings().size() > 1) {
-                warning(monitor, "ComponentReferenceMoreWire", promotedReference, promotedReference.getName());                
-            }
-        } else {
-            // if necessary merge the promoted endpoints (and bindings) with the top level bindings
-            if (reference.getBindings().size() > 0 ){
-                
-                for (Binding binding : reference.getBindings()) {
-                    if ((!(binding instanceof OptimizableBinding)) || binding.getURI() != null) {
-                        promotedReference.getBindings().add(binding);
-                        
-                        if (reference instanceof ComponentReference){
-                            for (Endpoint endpoint : ((ComponentReference)reference).getEndpoints()){
-                                if ( endpoint.getSourceBinding() == binding){
-                                    promotedReference.getEndpoints().add(endpoint);
-                                    break;
-                                }
-                            }
-                        } else {
-                            // create a new endpoint to represent this promoted binding
-                            Endpoint endpoint = endpointFactory.createEndpoint();
-                            endpoint.setTargetName(binding.getURI());
-                            endpoint.setSourceComponent(null); // TODO - fixed up at start
-                            endpoint.setSourceComponentReference(promotedReference); 
-                            endpoint.setInterfaceContract(reference.getInterfaceContract());
-                            endpoint.setSourceBinding(binding);
-                            promotedReference.getEndpoints().add(endpoint); 
-                        }
-                    }
-                }                
-            }            
-        }
-        
-        Set<Binding> callbackBindings = new HashSet<Binding>();
-        if (promotedReference.getCallback() != null) {
-            callbackBindings.addAll(promotedReference.getCallback().getBindings());
-        }
-        if (reference.getCallback() != null) {
-            callbackBindings.addAll(reference.getCallback().getBindings());
-        }
-        promotedReference.setCallback(assemblyFactory.createCallback());
-        for (Binding binding : callbackBindings) {
-            if ((!(binding instanceof OptimizableBinding)) || binding.getURI() != null) {
-                promotedReference.getCallback().getBindings().add(binding);
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
deleted file mode 100644
index 41a8b3f8ba..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.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.assembly.builder.impl;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Service;
-
-/**
- * This class encapsulates utility methods to deal with service definitions.
- *
- * @version $Rev$ $Date$
- */
-abstract class ServiceConfigurationUtil {
-
-    /**
-     * Follow a service promotion chain down to the inner most (non composite)
-     * component service.
-     * 
-     * @param topCompositeService
-     * @return
-     */
-    static ComponentService getPromotedComponentService(CompositeService compositeService) {
-        ComponentService componentService = compositeService.getPromotedService();
-        if (componentService != null) {
-            Service service = componentService.getService();
-            if (componentService.getName() != null && service instanceof CompositeService) {
-    
-                // Continue to follow the service promotion chain
-                return getPromotedComponentService((CompositeService)service);
-    
-            } else {
-    
-                // Found a non-composite service
-                return componentService;
-            }
-        } else {
-    
-            // No promoted service
-            return null;
-        }
-    }
-
-    /**
-     * Follow a service promotion chain down to the innermost (non-composite) component.
-     * 
-     * @param compositeService
-     * @return
-     */
-    static Component getPromotedComponent(CompositeService compositeService) {
-        ComponentService componentService = compositeService.getPromotedService();
-        if (componentService != null) {
-            Service service = componentService.getService();
-            if (componentService.getName() != null && service instanceof CompositeService) {
-
-                // Continue to follow the service promotion chain
-                return getPromotedComponent((CompositeService)service);
-
-            } else {
-
-                // Found a non-composite service
-                return compositeService.getPromotedComponent();
-            }
-        } else {
-
-            // No promoted service
-            return null;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
deleted file mode 100644
index b7c63dc2b4..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-
-/**
- * Represents an abstract property.
- * 
- * @version $Rev$ $Date$
- */
-public class AbstractPropertyImpl extends ExtensibleImpl implements AbstractProperty {
-    private Object value;
-    private String name;
-    private QName xsdType;
-    private QName xsdElement;
-    private boolean many;
-    private boolean mustSupply;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    /**
-     * Constructs a new abstract property.
-     */
-    protected AbstractPropertyImpl() {
-    }
-    
-    public Object getValue() {
-        return value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public QName getXSDElement() {
-        return xsdElement;
-    }
-
-    public QName getXSDType() {
-        return xsdType;
-    }
-
-    public boolean isMany() {
-        return many;
-    }
-
-    public boolean isMustSupply() {
-        return mustSupply;
-    }
-
-    public void setValue(Object defaultValue) {
-        this.value = defaultValue;
-    }
-
-    public void setMany(boolean many) {
-        this.many = many;
-    }
-
-    public void setMustSupply(boolean mustSupply) {
-        this.mustSupply = mustSupply;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setXSDElement(QName element) {
-        this.xsdElement = element;
-    }
-
-    public void setXSDType(QName type) {
-        this.xsdType = type;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-    
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
deleted file mode 100644
index d0ee3832c5..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.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.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-
-/**
- * Represents an abstract reference
- * 
- * @version $Rev$ $Date$
- */
-public class AbstractReferenceImpl extends ContractImpl implements AbstractReference {
-    private Multiplicity multiplicity = Multiplicity.ONE_ONE;
-
-    /**
-     * Constructs a new abstract reference.
-     */
-    protected AbstractReferenceImpl() {
-    }
-    
-    public Multiplicity getMultiplicity() {
-        return multiplicity;
-    }
-
-    public void setMultiplicity(Multiplicity multiplicity) {
-        this.multiplicity = multiplicity;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
deleted file mode 100644
index 346764b1b4..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.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.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.AbstractService;
-
-/**
- * Represents an abstract service
- * 
- * @version $Rev$ $Date$
- */
-public class AbstractServiceImpl extends ContractImpl implements AbstractService {
-    
-    /**
-     * Constructs a new abstract service.
-     */
-    protected AbstractServiceImpl() {
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
deleted file mode 100644
index 016a9a5b05..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.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.assembly.impl;
-
-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.AssemblyFactory;
-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.ComponentType;
-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.ConfiguredOperation;
-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.Wire;
-
-/**
- * A factory for the assembly model.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class AssemblyFactoryImpl implements AssemblyFactory {
-
-    public AbstractProperty createAbstractProperty() {
-        return new AbstractPropertyImpl();
-    }
-
-    public AbstractReference createAbstractReference() {
-        return new AbstractReferenceImpl();
-    }
-
-    public AbstractService createAbstractService() {
-        return new AbstractServiceImpl();
-    }
-
-    public Callback createCallback() {
-        return new CallbackImpl();
-    }
-
-    public Component createComponent() {
-        return new ComponentImpl();
-    }
-
-    public ComponentProperty createComponentProperty() {
-        return new ComponentPropertyImpl();
-    }
-
-    public ComponentReference createComponentReference() {
-        return new ComponentReferenceImpl();
-    }
-
-    public ComponentService createComponentService() {
-        return new ComponentServiceImpl();
-    }
-
-    public ComponentType createComponentType() {
-        return new ComponentTypeImpl();
-    }
-
-    public Composite createComposite() {
-        return new CompositeImpl();
-    }
-
-    public CompositeReference createCompositeReference() {
-        return new CompositeReferenceImpl();
-    }
-
-    public CompositeService createCompositeService() {
-        return new CompositeServiceImpl();
-    }
-
-    public ConstrainingType createConstrainingType() {
-        return new ConstrainingTypeImpl();
-    }
-
-    public Property createProperty() {
-        return new PropertyImpl();
-    }
-
-    public Reference createReference() {
-        return new ReferenceImpl();
-    }
-
-    public Service createService() {
-        return new ServiceImpl();
-    }
-
-    public Wire createWire() {
-        return new WireImpl();
-    }
-
-    public ConfiguredOperation createConfiguredOperation() {
-        return new ConfiguredOperationImpl();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
deleted file mode 100644
index 553e600bc9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.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.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-/**
- * Convenience base class for assembly model objects.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class BaseImpl implements Base {
-    private boolean unresolved;
-
-    /**
-     * Constructs a new base model object.
-     */
-    protected BaseImpl() {
-    }
-    
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
deleted file mode 100644
index 4082d81fdb..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.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.impl;
-
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a reference.
- * 
- * @version $Rev$ $Date$
- */
-public class CallbackImpl extends ExtensibleImpl implements Callback {
-    private List<Binding> bindings = new ArrayList<Binding>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<ConfiguredOperation>  configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>(); 
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    protected CallbackImpl() {
-    }
-
-    public List<Binding> getBindings() {
-        return bindings;
-    }
-    
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
deleted file mode 100644
index 34429a6703..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a component.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentImpl extends ExtensibleImpl implements Component, Cloneable, OperationsConfigurator {
-    private ConstrainingType constrainingType;
-    private Implementation implementation;
-    private String name;
-    private String uri;
-    private List<ComponentProperty> properties = new ArrayList<ComponentProperty>();
-    private List<ComponentReference> references = new ArrayList<ComponentReference>();
-    private List<ComponentService> services = new ArrayList<ComponentService>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private Boolean autowire;
-    private IntentAttachPointType type;
-    private List<ConfiguredOperation>  configuredImplOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    /**
-     * Constructs a new component.
-     */
-    protected ComponentImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        ComponentImpl clone = (ComponentImpl)super.clone();
-
-        clone.properties = new ArrayList<ComponentProperty>();
-        for (ComponentProperty property : getProperties()) {
-            clone.properties.add((ComponentProperty)property.clone());
-        }
-        clone.references = new ArrayList<ComponentReference>();
-        for (ComponentReference reference : getReferences()) {
-            clone.references.add((ComponentReference)reference.clone());
-        }
-        clone.services = new ArrayList<ComponentService>();
-        for (ComponentService service : getServices()) {
-            clone.services.add((ComponentService)service.clone());
-        }
-        return clone;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    public Implementation getImplementation() {
-        return implementation;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public List<ComponentProperty> getProperties() {
-        return properties;
-    }
-
-    public List<ComponentReference> getReferences() {
-        return references;
-    }
-
-    public List<ComponentService> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public void setImplementation(Implementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public boolean isAutowire() {
-        return (autowire == null) ? false : autowire.booleanValue();
-    }
-
-    public void setAutowire(Boolean autowire) {
-        this.autowire = autowire;
-    }
-    
-    public Boolean getAutowire() {
-        return autowire;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets;
-        
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-        
-    }
-    
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredImplOperations;
-    }
-
-    public void setConfiguredOperations(List<ConfiguredOperation> configuredOperations) {
-        this.configuredImplOperations = configuredOperations;
-    }
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
deleted file mode 100644
index e2e7b59896..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.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.assembly.impl;
-
-import javax.xml.xpath.XPathExpression;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-import org.apache.tuscany.sca.assembly.Property;
-
-/**
- * Represents a component property.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentPropertyImpl extends PropertyImpl implements ComponentProperty, Cloneable {
-    private String file;
-    private Property property;
-    private String source;
-    private XPathExpression sourceXPathExpression;
-    
-    /**
-     * Constructs a new component property.
-     */
-    protected ComponentPropertyImpl() {
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    // FIXME getValue should not delegate to property.getValue()
-    // Doing this violates the setValue/getValue semantics, as you
-    // can call setValue() then get a different value from getValue()
-    @Override
-    public Object getValue() {
-        if (super.getValue() == null && property != null) {
-            return property.getValue();
-        } else {
-            return super.getValue();
-        }
-    }
- 
-    public String getFile() {
-        return file;
-    }
-
-    public Property getProperty() {
-        return property;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setFile(String file) {
-        this.file = file;
-    }
-
-    public void setProperty(Property property) {
-        this.property = property;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public XPathExpression getSourceXPathExpression() {
-        return sourceXPathExpression;
-    }
-
-    public void setSourceXPathExpression(XPathExpression sourceXPathExpression) {
-        this.sourceXPathExpression = sourceXPathExpression;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
deleted file mode 100644
index ea9f768f4e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * Represents a component reference
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentReferenceImpl extends ReferenceImpl implements ComponentReference, Cloneable {
-    private Reference reference;
-    private Boolean autowire;
-    private List<CompositeReference> promotedAs = new ArrayList<CompositeReference>();
-    private ComponentService callbackService;
-    private List<Endpoint> endpoints = new ArrayList<Endpoint>();
-
-    /**
-     * Constructs a new component reference.
-     */
-    protected ComponentReferenceImpl() {
-        // Set multiplicity to null so that by default it'll inherit from the Reference
-        setMultiplicity(null);
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public Reference getReference() {
-        return reference;
-    }
-
-    public void setReference(Reference reference) {
-        this.reference = reference;
-    }
-
-    public boolean isAutowire() {
-        return (autowire == null) ? false : autowire.booleanValue();
-    }
-
-    public void setAutowire(Boolean autowire) {
-        this.autowire = autowire;
-    }
-    
-    public Boolean getAutowire() {
-        return autowire;
-    }
-
-    public List<CompositeReference> promotedAs() {
-        return promotedAs;
-    }
-
-    public ComponentService getCallbackService() {
-        return callbackService;
-    }
-
-    public void setCallbackService(ComponentService callbackService) {
-        this.callbackService = callbackService;
-    }
-    
-    public List<Endpoint> getEndpoints(){
-        return endpoints;
-    }
-    
-    /**
-     * Use endpoint information to work out what the interface contract for the
-     * binding is. 
-     */
-    public InterfaceContract getInterfaceContract(Binding binding){
-        InterfaceContract interfaceContract = null;
-        
-        for (Endpoint theEndpoint : endpoints){
-            if (theEndpoint.getSourceBinding() == binding){
-                interfaceContract = theEndpoint.getInterfaceContract();
-            }
-        }
-        
-        if (interfaceContract == null){
-            interfaceContract = getInterfaceContract();
-        }
-        return interfaceContract;
-    } 
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
deleted file mode 100644
index 0c78a2505f..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Service;
-
-/**
- * Represents a component service
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentServiceImpl extends ServiceImpl implements ComponentService, Cloneable {
-    private Service service;
-    private List<CompositeService> promotedAs = new ArrayList<CompositeService>();
-    private ComponentReference callbackReference;
-    
-    /**
-     * Constructs a new component service.
-     */
-    protected ComponentServiceImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public Service getService() {
-        return service;
-    }
-
-    public void setService(Service service) {
-        this.service = service;
-    }
-
-    public List<CompositeService> promotedAs() {
-        return promotedAs;
-    }
-
-    public ComponentReference getCallbackReference() {
-        return callbackReference;
-    }
-
-    public void setCallbackReference(ComponentReference callbackReference) {
-        this.callbackReference = callbackReference;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
deleted file mode 100644
index bbe665d52f..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-/** 
- * Represents a component type.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentTypeImpl extends ExtensibleImpl implements ComponentType, Cloneable {
-    private String uri;
-    private ConstrainingType constrainingType;
-    private List<Property> properties = new ArrayList<Property>();
-    private List<Reference> references = new ArrayList<Reference>();
-    private List<Service> services = new ArrayList<Service>();
-    /**
-     * Constructs a new component type.
-     */
-    protected ComponentTypeImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        ComponentTypeImpl clone = (ComponentTypeImpl)super.clone();
-
-        clone.services = new ArrayList<Service>();
-        for (Service service : getServices()) {
-            clone.services.add((Service)service.clone());
-        }
-        clone.references = new ArrayList<Reference>();
-        for (Reference reference : getReferences()) {
-            clone.references.add((Reference)reference.clone());
-        }
-        clone.properties = new ArrayList<Property>();
-        for (Property property : getProperties()) {
-            clone.properties.add((Property)property.clone());
-        }
-        return clone;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getURI()).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else {
-            if (obj instanceof ComponentType) {
-                if (getURI() != null) {
-                    return getURI().equals(((ComponentType)obj).getURI());
-                } else {
-                    return ((ComponentType)obj).getURI() == null;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
deleted file mode 100644
index a0ec95023a..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-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.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.Wire;
-
-/**
- * Implementation of a Composite.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeImpl extends ImplementationImpl implements Composite, Cloneable {
-    private List<Component> components = new ArrayList<Component>();
-    private List<Composite> includes = new ArrayList<Composite>();
-    private QName name;
-    private List<Wire> wires = new ArrayList<Wire>();
-    private Boolean autowire;
-    private boolean local = true;
-
-    /**
-     * Constructs a new composite.
-     */
-    protected CompositeImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        CompositeImpl clone = (CompositeImpl)super.clone();
-
-        clone.components = new ArrayList<Component>();
-        for (Component component : getComponents()) {
-            Component clonedComponent = (Component)component.clone();
-            for (Service service : clone.getServices()) {
-                CompositeService compositeService = (CompositeService)service;
-                // Force the promoted component/service to be rebuilt against the clone
-                if (compositeService.getPromotedComponent() != null) {
-                    compositeService.getPromotedComponent().setUnresolved(true);
-                }
-                if (compositeService.getPromotedService() != null) {
-                    compositeService.getPromotedService().setUnresolved(true);
-                }
-            }
-            for (Reference reference : clone.getReferences()) {
-                CompositeReference compositeReference = (CompositeReference)reference;
-                for (ComponentReference ref : compositeReference.getPromotedReferences()) {
-                    // Force the promoted reference to be rebuilt against the clone
-                    ref.setUnresolved(true);
-                }
-            }
-
-            clone.components.add(clonedComponent);
-        }
-        clone.wires = new ArrayList<Wire>();
-        for (Wire wire : getWires()) {
-            clone.wires.add((Wire)wire.clone());
-        }
-        return clone;
-    }
-
-    public List<Component> getComponents() {
-        return components;
-    }
-
-    public List<Composite> getIncludes() {
-        return includes;
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    public List<Wire> getWires() {
-        return wires;
-    }
-
-    public boolean isLocal() {
-        return local;
-    }
-
-    public void setLocal(boolean local) {
-        this.local = local;
-    }
-
-    public boolean isAutowire() {
-        return (autowire == null) ? false : autowire.booleanValue();
-    }
-
-    public void setAutowire(Boolean autowire) {
-        this.autowire = autowire;
-    }
-    
-    public Boolean getAutowire() {
-        return autowire;
-    }
-    
-    public void setName(QName name) {
-        this.name = name;
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof Composite) {
-            if (getName() != null) {
-                return getName().equals(((Composite)obj).getName());
-            } else {
-                return ((Composite)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-    
-    @Override
-    public String toString(){
-        return getName().toString();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
deleted file mode 100644
index 4348e08fcb..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.CompositeReference;
-
-/**
- * Represents a composite reference.
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeReferenceImpl extends ReferenceImpl implements CompositeReference, Cloneable {
-    private List<ComponentReference> promotedReferences = new ArrayList<ComponentReference>();
-
-    /**
-     * Constructs a new composite reference.
-     */
-    protected CompositeReferenceImpl() {
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public List<ComponentReference> getPromotedReferences() {
-        return promotedReferences;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
deleted file mode 100644
index 6777a96982..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.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.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.CompositeService;
-
-/**
- * Represents a composite service
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeServiceImpl extends ServiceImpl implements CompositeService, Cloneable {
-    private ComponentService promotedService;
-    private Component promotedComponent;
-
-    /**
-     * Constructs a new composite service.
-     */
-    protected CompositeServiceImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public ComponentService getPromotedService() {
-        return promotedService;
-    }
-
-    public void setPromotedService(ComponentService promotedService) {
-        this.promotedService = promotedService;
-    }
-    
-    public Component getPromotedComponent() {
-        return promotedComponent;
-    }
-    
-    public void setPromotedComponent(Component promotedComponent) {
-        this.promotedComponent = promotedComponent;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
deleted file mode 100644
index 1373ce511b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.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.assembly.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.ConfiguredOperation;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Represents an Operation.

- *

- * @version $Rev$ $Date$

- */

-public class ConfiguredOperationImpl extends BaseImpl implements ConfiguredOperation {

-    private List<PolicySet> policySets = new ArrayList<PolicySet>();

-    private List<Intent> requiredIntents = new ArrayList<Intent>();

-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();

-    

-    private String name;

-    private String contractName;

-

-    /**

-     * Constructs a new Operation.

-     */

-    protected ConfiguredOperationImpl() {

-    }

-    

-    public List<PolicySet> getPolicySets() {

-        return policySets;

-    }

-    

-    public void setPolicySets(List<PolicySet> policySets) {

-        this.policySets = policySets; 

-    }

-    

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-    

-    public List<Intent> getRequiredIntents() {

-        return requiredIntents;

-    }

-    

-    public void setRequiredIntents(List<Intent> intents) {

-        this.requiredIntents = intents;

-    }

-

-    public String getContractName() {

-        return contractName;

-    }

-

-    public void setContractName(String contractName) {

-        this.contractName = contractName;

-    }

-

-    public IntentAttachPointType getType() {

-        return null;

-    }

-

-    public void setType(IntentAttachPointType type) {

-    }

-

-    public List<PolicySet> getApplicablePolicySets() {

-        return applicablePolicySets;

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
deleted file mode 100644
index d5701df74e..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-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.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-
-/**
- * Represents a constraining type.
- * 
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeImpl extends ExtensibleImpl implements ConstrainingType {
-    private QName name;
-    private List<AbstractProperty> properties = new ArrayList<AbstractProperty>();
-    private List<AbstractReference> references = new ArrayList<AbstractReference>();
-    private List<AbstractService> services = new ArrayList<AbstractService>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    
-    /**
-     * Constructs a new ConstrainingType
-     */
-    protected ConstrainingTypeImpl() {
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    public void setName(QName name) {
-        this.name = name;
-    }
-
-    public List<AbstractProperty> getProperties() {
-        return properties;
-    }
-
-    public List<AbstractReference> getReferences() {
-        return references;
-    }
-
-    public List<AbstractService> getServices() {
-        return services;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof ConstrainingType) {
-            if (getName() != null) {
-                return getName().equals(((ConstrainingType)obj).getName());
-            } else {
-                return ((ConstrainingType)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-    
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-    
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
deleted file mode 100644
index 491c835246..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-
-/**
- * Implementation of a Contract.
- *
- * @version $Rev$ $Date$
- */
-public class ContractImpl extends ExtensibleImpl implements AbstractContract {
-    private InterfaceContract interfaceContract;
-    private String name;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<ConfiguredOperation>  configuredOperations = new ArrayList<ConfiguredOperation>();
-    
-    private boolean isCallback = false;
-    
-    /**
-     * Constructs a new contract.
-     */
-    protected ContractImpl() {
-    }
-    
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public InterfaceContract getInterfaceContract() {
-        return interfaceContract;
-    }
-    
-    public void setInterfaceContract(InterfaceContract interfaceContract) {
-        this.interfaceContract = interfaceContract;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public boolean isCallback() {
-        return isCallback;
-    }
-
-    public void setIsCallback(boolean isCallback) {
-        this.isCallback = isCallback;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-    
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public void setConfiguredOperations(List<ConfiguredOperation> configuredOperations) {
-        this.configuredOperations = configuredOperations;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
deleted file mode 100644
index ece51cbe9b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.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.assembly.impl;
-
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointFactory;
-
-/**
- * A factory for the Endpoint model.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class EndpointFactoryImpl implements EndpointFactory {
-    
-    public EndpointFactoryImpl (){
-        
-    }
-
-    public Endpoint createEndpoint() {
-        return new EndpointImpl();
-    } 
-    
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
deleted file mode 100644
index 5748abb07d..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.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.assembly.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.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * The assembly model object for an endpoint.
- * 
- * @version $Rev$ $Date$
- */
-public class EndpointImpl implements Endpoint {
-   
-    private String targetName;
-        
-    private Component sourceComponent;
-    private ComponentReference sourceComponentReference;
-    private Binding resolvedBinding;
-    private Binding resolvedCallbackBinding;
-    
-    private List<Binding> candidateBindings = new ArrayList<Binding>();
-    
-    private Component targetComponent;
-    private ComponentService targetComponentService;
-    private Binding targetBinding;
-    private Binding targetCallbackBinding;
-    
-    private InterfaceContract interfaceContract;
-    
-    protected EndpointImpl() {
-    }
-          
-    public boolean isUnresolved() {
-        return resolvedBinding == null;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-        // do nothing as the status is determined by having
-        // a resolved source binding
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public String getTargetName(){
-        return targetName;
-    }
-    
-    public void setTargetName(String targetName){
-        this.targetName = targetName;
-    }
-
-    public Component getSourceComponent() {
-        return sourceComponent;
-    }
-
-    public void setSourceComponent(Component sourceComponent) {
-        this.sourceComponent = sourceComponent;
-    }
-
-    public ComponentReference getSourceComponentReference() {
-        return sourceComponentReference;
-    }
-
-    public void setSourceComponentReference(ComponentReference sourceComponentReference) {
-        this.sourceComponentReference = sourceComponentReference;
-    }    
-    
-    public Binding getSourceBinding() {
-        return resolvedBinding;
-    }
-
-    public void setSourceBinding(Binding resolvedBinding) {
-        this.resolvedBinding = resolvedBinding;
-    }
-    
-    public Binding getSourceCallbackBinding(){
-        return resolvedCallbackBinding;
-    }
-
-    public void setSourceCallbackBinding(Binding resolvedCallbackBinding){
-        this.resolvedCallbackBinding = resolvedCallbackBinding;   
-    }    
-
-    public List<Binding> getCandidateBindings() {
-        return candidateBindings;
-    }
-    
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-
-    public void setTargetComponent(Component targetComponent) {
-        this.targetComponent = targetComponent;
-    }
-
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-
-    public void setTargetComponentService(ComponentService targetComponentService) {
-        this.targetComponentService = targetComponentService;
-    }
-    
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-
-    public void setTargetBinding(Binding targetBinding) {
-        this.targetBinding = targetBinding;
-    }
-    
-    public Binding getTargetCallbackBinding(){
-        return targetCallbackBinding;
-    }
-    
-    public void setTargetCallbackBinding(Binding targetCallbackBinding){
-        this.targetCallbackBinding = targetCallbackBinding;   
-    } 
-    
-    public InterfaceContract getInterfaceContract() {
-        return interfaceContract;
-    }
-    
-    public void setInterfaceContract(InterfaceContract interfaceContract) {
-        this.interfaceContract = interfaceContract;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
deleted file mode 100644
index 9a7ca09e43..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Extensible;
-
-/**
- * Convenience base class for extensible assembly model objects.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class ExtensibleImpl extends BaseImpl implements Extensible {
-    private List<Object> extensions = new ArrayList<Object>();
-
-    /**
-     * Constructs a new base model object.
-     */
-    protected ExtensibleImpl() {
-    }
-    
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
deleted file mode 100644
index aa75922489..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Base implementation class of Implementation model interface
- *
- * @version $Rev$ $Date$
- */
-public abstract class ImplementationImpl extends ComponentTypeImpl implements Implementation, PolicySetAttachPoint,
-    OperationsConfigurator {
-
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private List<ConfiguredOperation> configuredOperations = new ArrayList<ConfiguredOperation>();
-    private IntentAttachPointType type;
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-
-    protected ImplementationImpl() {
-        super();
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
deleted file mode 100644
index 0c1051199f..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a property.
- * 
- * @version $Rev$ $Date$
- */
-public class PropertyImpl extends AbstractPropertyImpl implements Property, Cloneable {
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    /**
-     * Constructs a new property.
-     */
-    protected PropertyImpl() {
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
deleted file mode 100644
index 1800222bfb..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.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.assembly.impl;
-
-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.ComponentService;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a reference.
- * 
- * @version $Rev$ $Date$
- */
-public class ReferenceImpl extends AbstractReferenceImpl implements Reference, Cloneable {
-    private List<Binding> bindings = new ArrayList<Binding>();
-    private boolean wiredByImpl;
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<ComponentService> targets = new ArrayList<ComponentService>();
-    private Callback callback;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private boolean promotionOverride;
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    /**
-     * Constructs a new reference.
-     */
-    protected ReferenceImpl() {
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        ReferenceImpl clone = (ReferenceImpl)super.clone();
-        clone.bindings = new ArrayList<Binding>();
-        clone.bindings.addAll(getBindings());
-        clone.targets = new ArrayList<ComponentService>();
-        clone.targets.addAll(getTargets());
-        return clone;
-    }
-
-    public List<Binding> getBindings() {
-        return bindings;
-    }
-
-    public <B> B getBinding(Class<B> bindingClass) {
-        for (Binding binding : bindings) {
-            if (bindingClass.isInstance(binding)) {
-                return bindingClass.cast(binding);
-            }
-        }
-        return null;
-    }
-
-    public <B> B getCallbackBinding(Class<B> bindingClass) {
-        if (callback != null) {
-            for (Binding binding : callback.getBindings()) {
-                if (bindingClass.isInstance(binding)) {
-                    return bindingClass.cast(binding);
-                }
-            }
-        }
-        return null;
-    }
-
-    public boolean isWiredByImpl() {
-        return wiredByImpl;
-    }
-
-    public void setWiredByImpl(boolean wiredByImpl) {
-        this.wiredByImpl = wiredByImpl;
-    }
-
-    public boolean isPromotionOverride() {
-        return promotionOverride;
-    }
-
-    public void setPromotionOverride(boolean promotionOverride) {
-        this.promotionOverride = promotionOverride;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<ComponentService> getTargets() {
-        return targets;
-    }
-
-    public Callback getCallback() {
-        return callback;
-    }
-
-    public void setCallback(Callback callback) {
-        this.callback = callback;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-    
-    /**
-     * By default return the interface contract for the reference
-     */
-    public InterfaceContract getInterfaceContract(Binding binding){
-        return getInterfaceContract();
-    }      
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
deleted file mode 100644
index 8d745cb7e1..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.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.assembly.impl;
-
-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.Service;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a reference.
- * 
- * @version $Rev$ $Date$
- */
-public class ServiceImpl extends AbstractServiceImpl implements Service, Cloneable {
-    private List<Binding> bindings = new ArrayList<Binding>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private Callback callback;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    /**
-     * Constructs a new service.
-     */
-    protected ServiceImpl() {
-    }
-    
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        ServiceImpl clone = (ServiceImpl)super.clone();
-        clone.bindings = new ArrayList<Binding>();
-        clone.bindings.addAll(getBindings());
-        return clone;
-    }
-
-    public List<Binding> getBindings() {
-        return bindings;
-    }
-
-    public <B> B getBinding(Class<B> bindingClass) {
-        for (Binding binding : bindings) {
-            if (bindingClass.isInstance(binding)) {
-                return bindingClass.cast(binding);
-            }
-        }
-        return null;
-    }
-
-    public <B> B getCallbackBinding(Class<B> bindingClass) {
-        if (callback != null) {
-            for (Binding binding : callback.getBindings()) {
-                if (bindingClass.isInstance(binding)) {
-                    return bindingClass.cast(binding);
-                }
-            }
-        }
-        return null;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public Callback getCallback() {
-        return callback;
-    }
-
-    public void setCallback(Callback callback) {
-        this.callback = callback;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-    
-    /**
-     * By default return the interface contract for the service
-     */
-    public InterfaceContract getInterfaceContract(Binding binding){
-        return getInterfaceContract();
-    }     
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
deleted file mode 100644
index 1a7abc8564..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.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.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Wire;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a wire
- * 
- * @version $Rev$ $Date$
- */
-public class WireImpl extends ExtensibleImpl implements Wire, Cloneable {
-    private ComponentReference source;
-    private ComponentService target;
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    /**
-     * Constructs a new wire.
-     */
-    protected WireImpl() {
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public ComponentReference getSource() {
-        return source;
-    }
-
-    public ComponentService getTarget() {
-        return target;
-    }
-
-    public void setSource(ComponentReference source) {
-        this.source = source;
-    }
-
-    public void setTarget(ComponentService target) {
-        this.target = target;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public IntentAttachPointType getType() {
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
deleted file mode 100644
index 859c4bde4b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ /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.assembly.DefaultAssemblyFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
deleted file mode 100644
index 8dbff76ad9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ /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.assembly.DefaultEndpointFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages.properties b/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages.properties
deleted file mode 100644
index f9760aa3cb..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ /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.
-#
-#
-DuplicateComponentName = Duplicate component name: Composite = {0} Component = {1}
-DuplicateComponentServiceName = Duplicate component service name: Component = {0} Service = {1}
-DuplicateComponentReferenceName = Duplicate component reference name: Component = {0} Reference = {1}
-DuplicateComponentPropertyName = Duplicate component property name: Component = {0} Property = {1}
-NoComponentImplementation = No implementation for component: Component = {0}
-ServiceNotFoundForComponentService = Service not found for component service: Component = {0} Service = {1}
-UnresolvedComponentImplementation = Component implementation not found: Component = {0} Uri = {1}
-DuplicateImplementationPropertyName = Duplicate property name: Component = {0} Property = {1}
-DuplicateImplementationServiceName = Duplicate service name: Component = {0} Service = {1}
-DuplicateImplementationReferenceName = Duplicate reference name: Component = {0} Reference = {1}
-PropertyNotFound = Property not found for component property: Component = {0} Property = {1}
-PropertyMustSupplyIncompatible = Component property mustSupply attribute incompatible with property: Component = {0} Property = {1}
-PropertyMustSupplyNull = No value configured on a mustSupply property: Component = {0} Property = {1}
-PropertyOverrideManyAttribute = Component property many attribute incompatible with property: Component = {0} Property = {1}
-ReferenceNotFound = Reference not found for component reference: Component = {0} Reference = {1}
-ReferenceIncompatibleMultiplicity = Component reference multiplicity incompatible with reference multiplicity: Component = {0} Reference = {1}
-ReferenceIncompatibleInterface = Incompatible interfaces on component reference and target: Composite = {0} Reference = {1} Service = {2}
-ReferenceIncompatibleComponentInterface = Component reference interface incompatible with reference interface: Component = {0} Reference = {1}
-ServiceIncompatibleComponentInterface = Component service interface incompatible with service interface: Component = {0} Service = {1}
-MultipleBindingsForService = Multiple bindings with the same name for a service: Binding = {0} Service = {1} Binding = {2}
-MultipleBindingsForReference = Multiple bindings with the same name for a reference: Binding = {0} Reference = {1} Binding = {2}
-ReferenceWithoutTargets = No targets for reference: Composite = {0} Reference = {1}
-PromotedReferenceNotFound = Promoted component reference not found: Composite = {0} Reference = {1}
-PromotedServiceNotFound = Promoted component service not found: Composite = {0} Service = {1}
-ComponentReferenceTargetNotFound = Component reference target not found, it might be a remote service running elsewhere in the SCA Domain: Composite = {0} Service = {1}
-NoSCABindingAvailableForUnresolvedService = A local service cannot be found for reference {0} target {1} and there is no SCA binding available to represent the unresolved target
-NoMatchingBinding = Component reference {0} does not have a binding which matches the bindings of service {1}
-NoMatchingCallbackBinding = Component reference {0} does not have a callback binding which matches the callback bindings of service {1}
-ReferenceEndPointMixWithTarget = Reference {0} must not specify endpoints using both target attribute and with binding uri attribute
-PolicyRelatedException = Policy Related Exception occured due to : {0}
-CompositeAlreadyIncluded = Composite {0} has already been included.
-ComponentReferenceMoreWire = Component reference {0} has more than one wires
-WireTargetNotFound = Wire target not found : {0}
-WireSourceNotFound = Wire source not found : {0}
-WireIncompatibleInterface = Incompatible interfaces on wire source and target : source = {0} target = {1}
-ComponentIncompatibleInterface = Incompatible interfaces on component reference and target : reference = {0} target = {1}
-TooManyReferenceTargets = Too many targets on reference: {0}
-ReferenceInterfaceNotSubSet = Interface of composite reference {0} must be compatible with the interface declared by promoted component reference.
-ServiceInterfaceNotSubSet = Interface of composite service {0} must be subset of the interface declared by promoted component service.
-NoComponentReferenceTarget = No target services found for the component reference to be autowired: {0}
-NoTypeForComponentProperty = No type specified on component property: Component = {0} Property = {1}
-URLSyntaxException = URLSyntaxException when creating binding URI at component = {0} service = {1} binding = {2}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
deleted file mode 100644
index b94d37ba2d..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/main/resources/assembly-validation-messages_it.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.
-#
-#
-DuplicateComponentName = Nome del componente duplicato: Composite = {0} Component = {1}
-DuplicateComponentServiceName = Nome del servizio del componente duplicato: Component = {0} Service = {1}
-DuplicateComponentReferenceName = Nome del reference del componente duplicato: Component = {0} Reference = {1}
-DuplicateComponentPropertyName = Nome della property del componente duplicato: Component = {0} Property = {1}
-NoComponentImplementation = Implementazione insistente per il componente: Component = {0}
-ServiceNotFoundForComponentService = Servizio non trovato per il componente: Component = {0} Service = {1}
-UnresolvedComponentImplementation = Implementazione del componente non trovata: Component = {0} Uri = {1}
-DuplicateImplementationPropertyName = Nome della property del componente duplicata: Component = {0} Property = {1}
-DuplicateImplementationReferenceName = Nome del riferimento duplicato: Component = {0} Reference = {1}
-PropertyNotFound = Property non trovata per il  componente: Component = {0} Property = {1}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
deleted file mode 100644
index 8a3a89aba4..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.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.assembly;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-
-/**
- * Test building of assembly model instances using the assembly factory.
- * 
- * @version $Rev$ $Date$
- */
-public class AssemblyFactoryTestCase extends TestCase {
-
-    private AssemblyFactory assemblyFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        assemblyFactory = new DefaultAssemblyFactory();
-    }
-
-    public void testCreateComponent() {
-        createComponent("AccountServiceComponent1");
-    }
-
-    public void testCreateComponentType() {
-        createComponentType();
-    }
-
-    public void testCreateComposite() {
-        createComposite();
-    }
-
-    public void testCreateConstrainingType() {
-        createConstrainingType();
-    }
-
-    /**
-     * Create a composite
-     */
-    Composite createComposite() {
-        Composite c = assemblyFactory.createComposite();
-
-        Component c1 = createComponent("AccountServiceComponent1");
-        c.getComponents().add(c1);
-        Component c2 = createComponent("AccountServiceComponent2");
-        c.getComponents().add(c2);
-
-        Wire w = assemblyFactory.createWire();
-        w.setSource(c1.getReferences().get(0));
-        w.setTarget(c2.getServices().get(0));
-        c.getWires().add(w);
-
-        CompositeService cs = assemblyFactory.createCompositeService();
-        cs.setName("AccountService");
-        cs.setPromotedService(c1.getServices().get(0));
-        cs.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        c.getServices().add(cs);
-        cs.getBindings().add(new TestBinding(assemblyFactory));
-
-        CompositeReference cr = assemblyFactory.createCompositeReference();
-        cr.setName("StockQuoteService");
-        cr.getPromotedReferences().add(c2.getReferences().get(1));
-        cr.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        c.getReferences().add(cr);
-        cr.getBindings().add(new TestBinding(assemblyFactory));
-
-        return c;
-    }
-
-    /**
-     * Create a new component
-     */
-    Component createComponent(String name) {
-        Component c = assemblyFactory.createComponent();
-        c.setName(name);
-
-        ConstrainingType constraint = createConstrainingType();
-        c.setConstrainingType(constraint);
-
-        Implementation i = new TestImplementation(assemblyFactory);
-        c.setImplementation(i);
-
-        ComponentProperty p = assemblyFactory.createComponentProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        p.setProperty(i.getProperties().get(0));
-        c.getProperties().add(p);
-
-        ComponentReference ref1 = assemblyFactory.createComponentReference();
-        ref1.setName("accountDataService");
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ref1.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref1.setReference(i.getReferences().get(0));
-        c.getReferences().add(ref1);
-        ref1.getBindings().add(new TestBinding(assemblyFactory));
-
-        ComponentReference ref2 = assemblyFactory.createComponentReference();
-        ref2.setName("stockQuoteService");
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ref2.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref2.setReference(i.getReferences().get(1));
-        c.getReferences().add(ref2);
-        ref2.getBindings().add(new TestBinding(assemblyFactory));
-
-        ComponentService s = assemblyFactory.createComponentService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        s.setService(i.getServices().get(0));
-        c.getServices().add(s);
-        s.getBindings().add(new TestBinding(assemblyFactory));
-
-        return c;
-    }
-
-    /**
-     * Create a new component type
-     * 
-     * @return
-     */
-    ComponentType createComponentType() {
-        ComponentType ctype = assemblyFactory.createComponentType();
-
-        Property p = assemblyFactory.createProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        ctype.getProperties().add(p);
-
-        Reference ref1 = assemblyFactory.createReference();
-        ref1.setName("accountDataService");
-        ref1.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref1);
-        ref1.getBindings().add(new TestBinding(assemblyFactory));
-
-        Reference ref2 = assemblyFactory.createReference();
-        ref2.setName("stockQuoteService");
-        ref2.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref2);
-        ref2.getBindings().add(new TestBinding(assemblyFactory));
-
-        Service s = assemblyFactory.createService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ctype.getServices().add(s);
-        s.getBindings().add(new TestBinding(assemblyFactory));
-
-        return ctype;
-    }
-
-    /**
-     * Create a new constraining type
-     * 
-     * @return
-     */
-    ConstrainingType createConstrainingType() {
-        ConstrainingType ctype = assemblyFactory.createConstrainingType();
-
-        AbstractProperty p = assemblyFactory.createAbstractProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        ctype.getProperties().add(p);
-
-        AbstractReference ref1 = assemblyFactory.createAbstractReference();
-        ref1.setName("accountDataService");
-        ref1.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref1);
-
-        AbstractReference ref2 = assemblyFactory.createAbstractReference();
-        ref2.setName("stockQuoteService");
-        ref2.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref2);
-
-        AbstractService s = assemblyFactory.createAbstractService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(assemblyFactory));
-        ctype.getServices().add(s);
-
-        return ctype;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
deleted file mode 100644
index 40d5f4e63f..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.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.assembly;
-
-
-/**
- * A test interface model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestBinding implements Binding {
-    public TestBinding(AssemblyFactory factory) {
-    }
-
-    public String getName() {
-        return null;
-    }
-
-    public String getURI() {
-        return "http://test";
-    }
-
-    public void setName(String name) {
-    }
-
-    public void setURI(String uri) {
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-    
-    public boolean isUnresolved() {
-        return false;
-    }
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
deleted file mode 100644
index 19702954c9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.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;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-
-/**
- * A test component implementation model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestImplementation extends ImplementationImpl implements Implementation {
-    public TestImplementation(AssemblyFactory factory) {
-
-        Property p = factory.createProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        getProperties().add(p);
-
-        Reference ref1 = factory.createReference();
-        ref1.setName("accountDataService");
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        getReferences().add(ref1);
-        ref1.getBindings().add(new TestBinding(factory));
-
-        Reference ref2 = factory.createReference();
-        ref2.setName("stockQuoteService");
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ref2.setInterfaceContract(new TestInterfaceContract(factory));
-        getReferences().add(ref2);
-        ref2.getBindings().add(new TestBinding(factory));
-
-        Service s = factory.createService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(factory));
-        getServices().add(s);
-        s.getBindings().add(new TestBinding(factory));
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
deleted file mode 100644
index dbe0cb8225..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.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.assembly;
-
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
-
-/**
- * A test interface model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestInterface extends InterfaceImpl implements Interface {
-
-    public TestInterface(AssemblyFactory factory) {
-
-        setRemotable(true);
-
-        Operation operation = new TestOperation();
-        operation.setName("test");
-        getOperations().add(operation);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
deleted file mode 100644
index ee6b95edc9..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.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.assembly;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractImpl;
-
-/**
- * A test interface contract model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestInterfaceContract extends InterfaceContractImpl implements InterfaceContract {
-
-    public TestInterfaceContract(AssemblyFactory factory) {
-        
-        TestInterface testInterface = new TestInterface(factory);
-        setInterface(testInterface);
-
-        TestInterface testCallbackInterface = new TestInterface(factory);
-        setCallbackInterface(testCallbackInterface);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
deleted file mode 100644
index d94a7e93a3..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.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.assembly;
-
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-
-/**
- * A test operation model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestOperation extends OperationImpl {
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
deleted file mode 100644
index fabafc998b..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.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.assembly.builder.impl;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-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.CompositeReference;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-
-/**
- * Test the CompositeBuilder.
- *
- * @version $Rev$ $Date$
- */
-public class CompositeBuilderTestCase extends TestCase {
-    
-    private AssemblyFactory assemblyFactory;
-    
-    @Override
-    protected void setUp() throws Exception {
-        assemblyFactory = new DefaultAssemblyFactory();
-    }
-    
-    public void testFuseIncludes() throws Exception {
-        Composite c1 = assemblyFactory.createComposite();
-        c1.setName(new QName("http://foo", "C1"));
-        Component a = assemblyFactory.createComponent();
-        a.setName("a");
-        c1.getComponents().add(a);
-        CompositeService s = assemblyFactory.createCompositeService();
-        s.setName("s");
-        c1.getServices().add(s);
-        CompositeReference r = assemblyFactory.createCompositeReference();
-        r.setName("r");
-        c1.getReferences().add(r);
-
-        Composite c2 = assemblyFactory.createComposite();
-        c2.setName(new QName("http://foo", "C2"));
-        c1.getIncludes().add(c2);
-        Component b = assemblyFactory.createComponent();
-        b.setName("b");
-        c2.getComponents().add(b);
-        
-        Composite c = assemblyFactory.createComposite();
-        c.setName(new QName("http://foo", "C"));
-        c.getIncludes().add(c1);
-        
-        new CompositeIncludeBuilderImpl(null).build(c);
-        
-        assertTrue(c.getComponents().get(0).getName().equals("a"));
-        assertTrue(c.getComponents().get(1).getName().equals("b"));
-        assertTrue(c.getServices().get(0).getName().equals("s"));
-        assertTrue(c.getReferences().get(0).getName().equals("r"));
-    }
-    
-    public void testExpandComposites() throws Exception {
-        Composite c1 = assemblyFactory.createComposite();
-        c1.setName(new QName("http://foo", "C1"));
-        Component a = assemblyFactory.createComponent();
-        a.setName("a");
-        c1.getComponents().add(a);
-        CompositeService s = assemblyFactory.createCompositeService();
-        s.setName("s");
-        c1.getServices().add(s);
-        CompositeReference r = assemblyFactory.createCompositeReference();
-        r.setName("r");
-        c1.getReferences().add(r);
-
-        Composite c2 = assemblyFactory.createComposite();
-        c2.setName(new QName("http://foo", "C2"));
-        Component b = assemblyFactory.createComponent();
-        b.setName("b");
-        c2.getComponents().add(b);
-        
-        Composite c = assemblyFactory.createComposite();
-        c.setName(new QName("http://foo", "C"));
-        Component x = assemblyFactory.createComponent();
-        x.setName("x");
-        x.setImplementation(c1);
-        c.getComponents().add(x);
-        Component y = assemblyFactory.createComponent();
-        y.setName("y");
-        y.setImplementation(c2);
-        c.getComponents().add(y);
-        Component z = assemblyFactory.createComponent();
-        z.setName("z");
-        z.setImplementation(c1);
-        c.getComponents().add(z);
-        
-        new CompositeCloneBuilderImpl(null).build(c);
-        
-        assertTrue(c.getComponents().get(0).getImplementation() != c1);
-        assertTrue(c.getComponents().get(1).getImplementation() != c2);
-        assertTrue(c.getComponents().get(2).getImplementation() != c1);
-
-        Composite i = (Composite)c.getComponents().get(0).getImplementation();
-        assertTrue(i.getComponents().get(0) != a);
-        assertTrue(i.getComponents().get(0).getName().equals("a"));
-        assertTrue(i.getServices().get(0).getName().equals("s"));
-        assertTrue(i.getServices().get(0) != s);
-        assertTrue(i.getReferences().get(0).getName().equals("r"));
-        assertTrue(i.getReferences().get(0) != r);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
deleted file mode 100644
index 82b1fd8665..0000000000
--- a/tags/java/sca/1.3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.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.assembly.builder.impl;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.xml.namespace.QName;
-
-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.AssemblyFactory;
-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.ComponentType;
-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.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.assembly.TestBinding;
-import org.apache.tuscany.sca.assembly.TestImplementation;
-import org.apache.tuscany.sca.assembly.TestInterfaceContract;
-import org.apache.tuscany.sca.assembly.Wire;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PrintUtilTestCase {
-
-    private AssemblyFactory factory = new DefaultAssemblyFactory();
-    
-    /**
-     * Create a composite
-     */
-    Composite createComposite() {
-        Composite c = factory.createComposite();
-
-        Component c1 = createComponent("AccountServiceComponent1");
-        c.getComponents().add(c1);
-        Component c2 = createComponent("AccountServiceComponent2");
-        c.getComponents().add(c2);
-
-        Wire w = factory.createWire();
-        w.setSource(c1.getReferences().get(0));
-        w.setTarget(c2.getServices().get(0));
-        c.getWires().add(w);
-
-        CompositeService cs = factory.createCompositeService();
-        cs.setName("AccountService");
-        cs.setPromotedService(c1.getServices().get(0));
-        cs.setInterfaceContract(new TestInterfaceContract(factory));
-        c.getServices().add(cs);
-        cs.getBindings().add(new TestBinding(factory));
-
-        CompositeReference cr = factory.createCompositeReference();
-        cr.setName("StockQuoteService");
-        cr.getPromotedReferences().add(c2.getReferences().get(1));
-        cr.setInterfaceContract(new TestInterfaceContract(factory));
-        c.getReferences().add(cr);
-        cr.getBindings().add(new TestBinding(factory));
-
-        return c;
-    }
-
-    /**
-     * Create a new component
-     */
-    Component createComponent(String name) {
-        Component c = factory.createComponent();
-        c.setName(name);
-
-        ConstrainingType constraint = createConstrainingType();
-        c.setConstrainingType(constraint);
-
-        Implementation i = new TestImplementation(factory);
-        c.setImplementation(i);
-
-        ComponentProperty p = factory.createComponentProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        p.setProperty(i.getProperties().get(0));
-        c.getProperties().add(p);
-
-        ComponentReference ref1 = factory.createComponentReference();
-        ref1.setName("accountDataService");
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ref1.setInterfaceContract(new TestInterfaceContract(factory));
-        ref1.setReference(i.getReferences().get(0));
-        c.getReferences().add(ref1);
-        ref1.getBindings().add(new TestBinding(factory));
-
-        ComponentReference ref2 = factory.createComponentReference();
-        ref2.setName("stockQuoteService");
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ref2.setInterfaceContract(new TestInterfaceContract(factory));
-        ref2.setReference(i.getReferences().get(1));
-        c.getReferences().add(ref2);
-        ref2.getBindings().add(new TestBinding(factory));
-
-        ComponentService s = factory.createComponentService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(factory));
-        s.setService(i.getServices().get(0));
-        c.getServices().add(s);
-        s.getBindings().add(new TestBinding(factory));
-
-        return c;
-    }
-
-    /**
-     * Create a new component type
-     * 
-     * @return
-     */
-    ComponentType createComponentType() {
-        ComponentType ctype = factory.createComponentType();
-
-        Property p = factory.createProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        ctype.getProperties().add(p);
-
-        Reference ref1 = factory.createReference();
-        ref1.setName("accountDataService");
-        ref1.setInterfaceContract(new TestInterfaceContract(factory));
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref1);
-        ref1.getBindings().add(new TestBinding(factory));
-
-        Reference ref2 = factory.createReference();
-        ref2.setName("stockQuoteService");
-        ref2.setInterfaceContract(new TestInterfaceContract(factory));
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref2);
-        ref2.getBindings().add(new TestBinding(factory));
-
-        Service s = factory.createService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(factory));
-        ctype.getServices().add(s);
-        s.getBindings().add(new TestBinding(factory));
-
-        return ctype;
-    }
-
-    /**
-     * Create a new constraining type
-     * 
-     * @return
-     */
-    ConstrainingType createConstrainingType() {
-        ConstrainingType ctype = factory.createConstrainingType();
-
-        AbstractProperty p = factory.createAbstractProperty();
-        p.setName("currency");
-        p.setValue("USD");
-        p.setMustSupply(true);
-        p.setXSDType(new QName("", ""));
-        ctype.getProperties().add(p);
-
-        AbstractReference ref1 = factory.createAbstractReference();
-        ref1.setName("accountDataService");
-        ref1.setInterfaceContract(new TestInterfaceContract(factory));
-        ref1.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref1);
-
-        AbstractReference ref2 = factory.createAbstractReference();
-        ref2.setName("stockQuoteService");
-        ref2.setInterfaceContract(new TestInterfaceContract(factory));
-        ref2.setMultiplicity(Multiplicity.ONE_ONE);
-        ctype.getReferences().add(ref2);
-
-        AbstractService s = factory.createAbstractService();
-        s.setName("AccountService");
-        s.setInterfaceContract(new TestInterfaceContract(factory));
-        ctype.getServices().add(s);
-
-        return ctype;
-    }
-
-    @Test
-    public void testPrint1() {
-        Composite composite = createComposite();
-        StringWriter sw = new StringWriter();
-        PrintUtil p = new PrintUtil(new PrintWriter(sw), true);
-        p.print(composite);
-        // System.out.println(sw.toString());
-    }
-
-    @Test
-    public void testPrint2() {
-        Composite composite = createComposite();
-        StringWriter sw = new StringWriter();
-        PrintUtil p = new PrintUtil(new PrintWriter(sw), false);
-        p.print(composite);
-        // System.out.println(sw.toString());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/LICENSE b/tags/java/sca/1.3/modules/binding-atom-abdera/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom-abdera/NOTICE b/tags/java/sca/1.3/modules/binding-atom-abdera/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/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/tags/java/sca/1.3/modules/binding-atom-abdera/pom.xml b/tags/java/sca/1.3/modules/binding-atom-abdera/pom.xml
deleted file mode 100644
index 6fc7722249..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</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.3.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.3.0-incubating</version>
-                  <exclusions>
-                     <exclusion>
-                        <groupId>xom</groupId>
-                        <artifactId>xom</artifactId>
-                     </exclusion>
-                  </exclusions>
-	    </dependency>           
-                
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> 
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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</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>
-
-
-    <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.atom.abdera</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
deleted file mode 100644
index 7356cd0d2a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
deleted file mode 100644
index cc351442e7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
deleted file mode 100644
index b457840922..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
deleted file mode 100644
index 9b55bfd0ac..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.osoa.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.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) {
-
-                    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();
-
-                // 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) {
-            // TODO implement
-            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) {
-            // TODO implement
-            return super.invoke(msg);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
deleted file mode 100644
index 8244a2495f..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.URLDecoder;
-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.model.Collection;
-import org.apache.abdera.model.Document;
-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.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;
-
-
-/**
- * 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 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
-    	
-        // 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");
-            
-            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("/")) {
-
-            // Return a feed containing the entries in the collection
-            Feed feed = null;
-            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());
-                }
-                feed = (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 = abderaFactory.newFeed();
-                    
-                    // Set the feed title
-                    if (title != null) {
-                        feed.setTitle(title);
-                    } else {
-                        feed.setTitle("Feed");
-                    }
-                    
-                    // Add entries to the feed
-                    for (Entry<Object, Object> entry: collection) {
-                        org.apache.abdera.model.Entry feedEntry = feedEntry(entry, itemClassType, itemXMLType, mediator, abderaFactory);
-                        feed.addEntry(feedEntry);
-                    }
-                }
-            }
-            if (feed != null) {
-                
-                // Write the Atom feed
-                response.setContentType("application/atom+xml; charset=utf-8");
-                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) {
-                response.setContentType("application/atom+xml; charset=utf-8");
-                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);
-        }
-        
-    }
-
-    @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();
-            } 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");
-                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) {
-
-                // 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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
deleted file mode 100644
index b6b805e383..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-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.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);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
deleted file mode 100644
index 62fde86122..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
deleted file mode 100644
index f2b1d1f72b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
deleted file mode 100644
index 958f1f8591..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.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.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);
-        
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-    }
-
-    public void stop() {
-        servletHost.removeServletMapping(servletMapping);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 1b9052299c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
deleted file mode 100644
index 34d3ed1d1c..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.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;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Consumer {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Consumer.composite");
-
-        CustomerClient testService = scaDomain.getService(CustomerClient.class, "CustomerClient");
-        testService.testCustomerCollection();
-
-        scaDomain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
deleted file mode 100644
index 5e9331ae06..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/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.atom;
-
-public interface CustomerClient {
-
-    void testCustomerCollection() throws Exception;
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
deleted file mode 100644
index 7346612383..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.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.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.osoa.sca.annotations.Reference;
-
-public class CustomerClientImpl implements CustomerClient {
-
-    protected final Abdera abdera = new Abdera();
-    
-    @Reference
-    public Collection resourceCollection;
-
-    public void testCustomerCollection() throws Exception {
-
-        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 = 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/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
deleted file mode 100644
index dcea5a9039..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.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.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.osoa.sca.annotations.Scope;
-
-
-
-@Scope("COMPOSITE")
-public class CustomerCollectionImpl implements Collection {
-	private final Abdera abdera = new Abdera();
-    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++) {
-            String id = "urn:uuid:customer-" + UUID.randomUUID().toString();
-            
-            Entry entry = abdera.getFactory().newEntry();
-            entry.setId(id);
-            entry.setTitle("customer " + "Jane Doe_" + String.valueOf(i));
-            
-            Content content = this.abdera.getFactory().newContent();
-            content.setContentType(Content.Type.TEXT);
-            content.setValue("Jane Doe_" + String.valueOf(i));
-            
-            entry.setContentElement(content);
-            
-            entry.addLink("" + id, "edit");
-            entry.addLink("" + id, "alternate");
-    
-            entry.setUpdated(new Date());
-
-            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);
-
-        entry.addLink("" + id, "edit");
-        entry.addLink("" + id, "alternate");
-
-        entry.setUpdated(new Date());
-
-        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());
-
-        entry.setUpdated(new Date());
-        entries.put(id, entry);
-    }
-
-    public void delete(String id) {
-        System.out.println(">>> ResourceCollectionImpl.delete id=" + id);
-        entries.remove(id);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Feed getFeed() {
-        System.out.println(">>> ResourceCollectionImpl.get collection");
-
-        Feed feed = this.abdera.getFactory().newFeed();
-        feed.setTitle("customers");
-        feed.setSubtitle("This is a sample feed");
-        feed.setUpdated(new Date());
-        feed.addLink("");
-        feed.addLink("","self");
-
-        for (Entry entry : entries.values()) {
-        	feed.addEntry(entry);
-        }
-
-        return feed;
-    }
-
-    public Feed query(String queryString) {
-        System.out.println(">>> ResourceCollectionImpl.query collection " + queryString);
-        return getFeed();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
deleted file mode 100644
index 3e1bf543e5..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.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.atom;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Provider {
-
-    public static void main(String[] args) {
-
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Provider.composite");
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        scaDomain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
deleted file mode 100644
index 05037429a7..0000000000
--- a/tags/java/sca/1.3/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="resourceCollection">
-        	<tuscany:binding.atom uri="http://localhost:8084/customer"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/tags/java/sca/1.3/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
deleted file mode 100644
index 60097ee0f7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/LICENSE b/tags/java/sca/1.3/modules/binding-atom/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/NOTICE b/tags/java/sca/1.3/modules/binding-atom/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom/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/tags/java/sca/1.3/modules/binding-atom/pom.xml b/tags/java/sca/1.3/modules/binding-atom/pom.xml
deleted file mode 100644
index 6072b0bef3..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.atom</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
deleted file mode 100644
index 807d6a8971..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
deleted file mode 100644
index 6e5623e1a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
deleted file mode 100644
index ea06625d34..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
deleted file mode 100644
index 39db5e5865..0000000000
--- a/tags/java/sca/1.3/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.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.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, OptimizableBinding, 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 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 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
-    }
-
-    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;
-    }
-
-    //FIXME Temporary to get access to the target binding information
-    // To be removed when the distributed domain supports wiring of other
-    // bindings than the SCA binding
-    private Binding targetBinding; 
-    private Component targetComponent; 
-    private ComponentService targetComponentService; 
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-    
-    public void setTargetBinding(Binding binding) {
-        this.targetBinding = binding;
-    }
-    
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-    
-    public void setTargetComponent(Component component) {
-        this.targetComponent = component;
-    }
-    
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-    
-    public void setTargetComponentService(ComponentService service) {
-        this.targetComponentService = service; 
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/tags/java/sca/1.3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
deleted file mode 100644
index a8117db8f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 52e0e916f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-dwr/LICENSE b/tags/java/sca/1.3/modules/binding-dwr/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-dwr/NOTICE b/tags/java/sca/1.3/modules/binding-dwr/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/pom.xml b/tags/java/sca/1.3/modules/binding-dwr/pom.xml
deleted file mode 100644
index 7be01e4f7f..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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.3</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.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-http</artifactId>

-            <version>1.3</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.2</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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
deleted file mode 100644
index ae5cf327ab..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
deleted file mode 100644
index d14751f235..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
deleted file mode 100644
index 24e6dbbcd4..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
deleted file mode 100644
index 1d073c9ecf..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
deleted file mode 100644
index 7d5a7f1677..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/tags/java/sca/1.3/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
deleted file mode 100644
index 3a2471d8f3..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/tags/java/sca/1.3/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
deleted file mode 100644
index 1a9f91fab2..0000000000
--- a/tags/java/sca/1.3/modules/binding-dwr/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/tags/java/sca/1.3/modules/binding-ejb-runtime/LICENSE b/tags/java/sca/1.3/modules/binding-ejb-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/NOTICE b/tags/java/sca/1.3/modules/binding-ejb-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb-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/tags/java/sca/1.3/modules/binding-ejb-runtime/pom.xml b/tags/java/sca/1.3/modules/binding-ejb-runtime/pom.xml
deleted file mode 100644
index 1b1def88ad..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb-runtime/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>tuscany-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</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.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</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>
-
-            </exclusions>
-
-        </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>
-
-    <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.ejb.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ejb*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
deleted file mode 100644
index c65868c23b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
deleted file mode 100644
index 82554a1c8f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
deleted file mode 100644
index de8090c45b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
deleted file mode 100644
index 1be4a98a48..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
deleted file mode 100644
index 3ff0ed552a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
deleted file mode 100644
index f9aa9ffa22..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
deleted file mode 100644
index 9247c1d3db..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
deleted file mode 100644
index a6ea583d0b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
deleted file mode 100644
index 2a02bf0d08..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
deleted file mode 100644
index 637a1c05f9..0000000000
--- a/tags/java/sca/1.3/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.osoa.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
-    public 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
-     */
-    protected 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
-     */
-    protected 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
-     */
-    protected 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
-     */
-    protected Object readValue(InputStream in, Class type) {
-        return org.apache.tuscany.sca.binding.ejb.corba.Java2IDLUtil.readObject(type, in);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
deleted file mode 100644
index 4fe6423384..0000000000
--- a/tags/java/sca/1.3/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$
- */
-public 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;
-    boolean managed = true;
-
-    public 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);
-        }
-    }
-
-    public EJBLocator(String hostName, int port) {
-        this.hostName = (hostName == null) ? DEFAULT_HOST : hostName;
-        this.port = port > 0 ? port : DEFAULT_NAMING_PORT;
-        this.root = SERVER_ROOT;
-    }
-
-    public 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");
-        }
-    }
-
-    public 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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
deleted file mode 100644
index 879445256c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-
-/**
- * Factor class that is used to create EJB Proxies.
- *
- * @version $Rev$ $Date$
- */
-public 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>
-     */
-    public 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
-     */
-    protected 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
-     */
-    protected static 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
-     */
-    protected 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
-     */
-    protected 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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
deleted file mode 100644
index 95d0542e4f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.ServiceUnavailableException;
-
-public final class EJBStubHelper {
-
-    private static Object stub;
-    private static ServiceRuntimeException exception;
-
-    private EJBStubHelper() {
-    }
-
-    /**
-     * @param owner
-     * @param jndiName
-     * @return
-     */
-
-    public static Object lookup(NamingEndpoint endpoint, InterfaceInfo ejbInterface) {
-        return getStub(endpoint, ejbInterface);
-    }
-
-    public 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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
deleted file mode 100644
index b383ac4090..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.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.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$
- */
-public 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>();
-
-    public 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);
-        }
-    }
-
-    public 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
-     */
-    public Map<String, MethodInfo> getMethods() {
-        return methods;
-    }
-
-    /**
-     * @return
-     */
-    public MethodInfo getMethod(String name) {
-        return (MethodInfo)methods.get(name);
-    }
-
-    /**
-     * @return
-     */
-    public 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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
deleted file mode 100644
index 25bd0dd21d..0000000000
--- a/tags/java/sca/1.3/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.osoa.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$
- */
-public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public Map getMethods() {
-        return methodMap;
-    }
-
-    /**
-     * Invoke a method using Java reflection.
-     * 
-     * @param method
-     * @param object
-     * @param args
-     * @return
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     */
-    public 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
-     */
-    public 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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
deleted file mode 100644
index e98c41df90..0000000000
--- a/tags/java/sca/1.3/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$
- */
-public 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);
-    }
-
-    public 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;
-    }
-
-    protected 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
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @return
-     */
-    public String[] getParameterTypes() {
-        return parameterTypes;
-    }
-
-    /**
-     * @return
-     */
-    public String getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * @return
-     */
-    public 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.
-     */
-    public String getIDLName() {
-        return IDLName;
-    }
-
-    /**
-     * @param name The iDLName to set.
-     */
-    public void setIDLName(String name) {
-        IDLName = name;
-    }
-
-    /**
-     * @return the method
-     */
-    public Method getMethod() {
-        return method;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
deleted file mode 100644
index 346b7c5cf6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index a89f711da9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
deleted file mode 100644
index 28477dd3ac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
deleted file mode 100644
index 28dafedaeb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- *
- * Compatible EJB interface
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface BankManagerFacade {
-    Double getAccountBalance( String accountNo );
-    void changeAccountBalance( String accountNo, Double balance );
-}
diff --git a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/Customer.java
deleted file mode 100644
index 49ece71f7a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
deleted file mode 100644
index 3d3f785a50..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
deleted file mode 100644
index 7cefba530a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
deleted file mode 100644
index 799bcaa672..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
deleted file mode 100644
index e480e648d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
deleted file mode 100644
index 0d02be3b95..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
deleted file mode 100644
index 82471acb16..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.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.ejb.tests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-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 SCADomain scaDomain;
-
-    @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");
-
-        scaDomain = SCADomain.newInstance("account/account.composite");
-
-        // 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 {
-        scaDomain.close();
-    }
-
-    public void testCalculator() throws Exception {
-        Customer customer = scaDomain.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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
deleted file mode 100644
index 48e87fb6d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
deleted file mode 100644
index 66b3feb458..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/tags/java/sca/1.3/modules/binding-ejb-runtime/src/test/resources/account/account.composite
deleted file mode 100644
index 14f77eed08..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/LICENSE b/tags/java/sca/1.3/modules/binding-ejb/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/NOTICE b/tags/java/sca/1.3/modules/binding-ejb/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb/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/tags/java/sca/1.3/modules/binding-ejb/pom.xml b/tags/java/sca/1.3/modules/binding-ejb/pom.xml
deleted file mode 100644
index 00f0c79bb9..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.ejb</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ejb*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
deleted file mode 100644
index 271a113429..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
deleted file mode 100644
index 6e2c8d358f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
deleted file mode 100644
index 13b069a6bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
deleted file mode 100644
index e84de86eca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
deleted file mode 100644
index e601ea28f8..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.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.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
-     */
-    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/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
deleted file mode 100644
index 9a487e02d1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.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.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.builder.impl.ProblemImpl;
-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.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;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * 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<EJBBindingImpl> {
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-
-    public EJBBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.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 = new ProblemImpl(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 EJBBindingImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        EJBBindingImpl ejbBinding = new EJBBindingImpl();
-
-        // 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(EJBBindingImpl 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<EJBBindingImpl> getModelType() {
-        return EJBBindingImpl.class;
-    }
-
-    public void resolve(EJBBindingImpl ejbBinding, ModelResolver modelResolver) throws ContributionResolveException {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
deleted file mode 100644
index c445a82ecb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 82e85ef067..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/tags/java/sca/1.3/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
deleted file mode 100644
index 28477dd3ac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http-runtime/LICENSE b/tags/java/sca/1.3/modules/binding-http-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http-runtime/NOTICE b/tags/java/sca/1.3/modules/binding-http-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-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/tags/java/sca/1.3/modules/binding-http-runtime/pom.xml b/tags/java/sca/1.3/modules/binding-http-runtime/pom.xml
deleted file mode 100644
index b7e7742503..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</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-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.http.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.http*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
deleted file mode 100644
index fccd10f3cd..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-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.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);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
deleted file mode 100644
index e20d420d49..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
deleted file mode 100644
index ef3b993c1f..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.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.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;
-    
-    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;
-        for (InvocationChain invocationChain : wire.getInvocationChains()) {
-            Operation operation = invocationChain.getTargetOperation();
-            String operationName = operation.getName();
-            if (operationName.equals("get")) {
-                Invoker getInvoker = invocationChain.getHeadInvoker();
-                servlet = new HTTPGetListenerServlet(getInvoker, messageFactory);
-                break;
-            } else if (operationName.equals("service")) {
-                Invoker serviceInvoker = invocationChain.getHeadInvoker();
-                servlet = new HTTPServiceListenerServlet(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);
-        
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-    }
-
-    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/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
deleted file mode 100644
index f3da2367f0..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.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.http.provider;
-
-import java.io.IOException;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-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 service requests to the
- * target component implementation.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPServiceListenerServlet implements Servlet {
-    
-    private ServletConfig config;
-    private MessageFactory messageFactory;
-    private Invoker serviceInvoker;
-    
-    /**
-     * Constructs a new HTTPServiceListenerServlet.
-     */
-    public HTTPServiceListenerServlet(Invoker serviceInvoker, MessageFactory messageFactory) {
-        this.serviceInvoker = serviceInvoker;
-        this.messageFactory = messageFactory;
-    }
-
-    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 {
-        
-        // 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());
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 0fa8d44c08..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
deleted file mode 100644
index bc87dd2f93..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.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.binding.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * 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/test 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 SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("test.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    /**
-     * 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();
-        os.write(REQUEST3.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>uh oh</body>") != -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/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
deleted file mode 100644
index 0e0360d821..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.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.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>uh oh</body></html>".getBytes());
-        
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
deleted file mode 100644
index 1cfc02a473..0000000000
--- a/tags/java/sca/1.3/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.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.http;
-
-import java.io.IOException;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-http-runtime/src/test/resources/content/test.html b/tags/java/sca/1.3/modules/binding-http-runtime/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http-runtime/src/test/resources/test.composite b/tags/java/sca/1.3/modules/binding-http-runtime/src/test/resources/test.composite
deleted file mode 100644
index 62c4af4e22..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http/LICENSE b/tags/java/sca/1.3/modules/binding-http/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http/NOTICE b/tags/java/sca/1.3/modules/binding-http/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-http/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/tags/java/sca/1.3/modules/binding-http/pom.xml b/tags/java/sca/1.3/modules/binding-http/pom.xml
deleted file mode 100644
index 44e658b9cb..0000000000
--- a/tags/java/sca/1.3/modules/binding-http/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.http</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.http*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
deleted file mode 100644
index 6192b92dfe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
deleted file mode 100644
index 370e4cdb67..0000000000
--- a/tags/java/sca/1.3/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 createHTTPResourceBinding();
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
deleted file mode 100644
index 7e72b7dd85..0000000000
--- a/tags/java/sca/1.3/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 createHTTPResourceBinding() {
-        return new HTTPBindingImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
deleted file mode 100644
index ced0d79887..0000000000
--- a/tags/java/sca/1.3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.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.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-
-
-/**
- * Implementation of the HTTP binding model.
- * 
- * @version $Rev$ $Date$
- */
-class HTTPBindingImpl implements HTTPBinding {
-    
-    private String name;
-    private String uri;
-
-    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
-    }
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/tags/java/sca/1.3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
deleted file mode 100644
index 44da6b166c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index cc07784cb7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jms/LICENSE b/tags/java/sca/1.3/modules/binding-jms/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jms/NOTICE b/tags/java/sca/1.3/modules/binding-jms/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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/tags/java/sca/1.3/modules/binding-jms/pom.xml b/tags/java/sca/1.3/modules/binding-jms/pom.xml
deleted file mode 100644
index 67a739a6b5..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jms</artifactId>
-    <name>Apache Tuscany SCA JMS Binding Extension</name>
-
-    <dependencies>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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>
-    
-
-    <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</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.jms*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
deleted file mode 100644
index cdab5382d7..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.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.jms.impl;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-
-/**
- * Models a binding to a JMS resource.
- *
- * @version $Rev$ $Date$
- */
-
-public class JMSBinding implements Binding {
-
-    /**
-     * Clone the binding
-     */
-    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
-
-    // <binding.jms correlationScheme="string"? Not yet implemented in binding
-    // initialContextFactory="xs:anyURI"?
-    // jndiURL="xs:anyURI"?
-    // requestConnection="QName"? Not yet implemented in binding
-    // responseConnection="QName"? Not yet implemented in binding
-    // operationProperties="QName"? Not yet implemented in binding
-    // ...>
-    private String correlationScheme = JMSBindingConstants.CORRELATE_MSG_ID;
-    private String initialContextFactoryName;
-    private String jndiURL;
-    // private String requestConnection = null;
-    // private String responseConnection = null;
-    // private String operationProperties = null;
-    // 
-    // <destination name="xs:anyURI"
-    // type="string"? Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </destination>?
-    private String destinationName = JMSBindingConstants.DEFAULT_DESTINATION_NAME;
-    private String destinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
-    private String destinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-    // 
-    // <connectionFactory name="xs:anyURI" Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </connectionFactory>?
-    private String connectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
-    private String connectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-    // 
-    // <activationSpec name="xs:anyURI" Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </activationSpec>?
-    private String activationSpecName = null;
-    private String activationSpecCreate = null;
-    // 
-    // <response>
-    // <destination name="xs:anyURI"
-    // type="string"? Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </destination>?
-    private String responseDestinationName = JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME;
-    private String responseDestinationType = JMSBindingConstants.DESTINATION_TYPE_QUEUE;
-    private String responseDestinationCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-    // 
-    // <connectionFactory name="xs:anyURI" Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </connectionFactory>?
-    private String responseConnectionFactoryName = JMSBindingConstants.DEFAULT_CONNECTION_FACTORY_NAME;
-    private String responseConnectionFactoryCreate = JMSBindingConstants.CREATE_IF_NOT_EXIST;
-    // 
-    // <activationSpec name="xs:anyURI" Not yet implemented in binding
-    // create="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </activationSpec>?
-    private String responseActivationSpecName = null;
-    private String responseActivationSpecCreate = null;
-    // </response>?
-    // 
-    // <resourceAdapter name="NMTOKEN">? Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </resourceAdapter>?
-    // private String resourceAdapterName = null;
-    // 
-    // <headers JMSType="string"? Not yet implemented in binding
-    // JMSCorrelationId="string"? Not yet implemented in binding
-    // JMSDeliveryMode="string"? Not yet implemented in binding
-    // JMSTimeToLive="int"? Not yet implemented in binding
-    // JMSPriority="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </headers>?
-    // private String jmsType = null;
-    // private String jmsCorrelationId = null;
-    private int jmsDeliveryMode = DeliveryMode.NON_PERSISTENT; // Maps to javax.jms.DeliveryMode
-    private int jmsTimeToLive = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;
-    private int jmsPriority = JMSBindingConstants.DEFAULT_PRIORITY;
-    // 
-    // <operationProperties name="string" Not yet implemented in binding
-    // nativeOperation="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // <headers JMSType="string"? Not yet implemented in binding
-    // JMSCorrelationId="string"? Not yet implemented in binding
-    // JMSDeliveryMode="string"? Not yet implemented in binding
-    // JMSTimeToLive="int"? Not yet implemented in binding
-    // JMSPriority="string"?> Not yet implemented in binding
-    // <property name="NMTOKEN" Not yet implemented in binding
-    // type="NMTOKEN">* Not yet implemented in binding
-    // </headers>?
-    // </operationProperties>*
-    // </binding.jms>
-
-    // Other properties not directly related to the
-    // XML definition of the JMS binding
-
-    // 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;
-
-    // TODO .....
-    private String replyTo;
-
-    // Methods required by the Tuscany SPI
-
-    /**
-     * No arg constructor used by the JSMBindingFactoryImpl to create JMS binding model objects
-     */
-    public JMSBinding() {
-        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() {
-        return destinationName;
-    }
-
-    public void setDestinationName(String destinationName) {
-        this.destinationName = destinationName;
-    }
-
-    public String getDestinationType() {
-        return destinationType;
-    }
-
-    public void setDestinationType(String destinationType) {
-        this.destinationType = destinationType;
-    }
-
-    public String getDestinationCreate() {
-        return this.destinationCreate;
-    }
-
-    public void setDestinationCreate(String create) {
-        this.destinationCreate = create;
-    }
-
-    public String getConnectionFactoryName() {
-        return connectionFactoryName;
-    }
-
-    public void setConnectionFactoryName(String connectionFactoryName) {
-        this.connectionFactoryName = connectionFactoryName;
-    }
-
-    public String getConnectionFactoryCreate() {
-        return this.connectionFactoryCreate;
-    }
-
-    public void setConnectionFactoryCreate(String create) {
-        this.connectionFactoryCreate = create;
-    }
-
-    public String getActivationSpecName() {
-        return activationSpecName;
-    }
-
-    public void setActivationSpecName(String activationSpecName) {
-        this.activationSpecName = activationSpecName;
-    }
-
-    public String getActivationSpecCreate() {
-        return this.activationSpecCreate;
-    }
-
-    public void setActivationSpecCreate(String create) {
-        this.activationSpecCreate = create;
-    }
-
-    public String getResponseDestinationName() {
-        return this.responseDestinationName;
-    }
-
-    public void setResponseDestinationName(String name) {
-        this.responseDestinationName = name;
-    }
-
-    public String getResponseDestinationType() {
-        return this.responseDestinationType;
-    }
-
-    public void setResponseDestinationType(String type) {
-        this.responseDestinationType = type;
-    }
-
-    public String getResponseDestinationCreate() {
-        return this.responseDestinationCreate;
-    }
-
-    public void setResponseDestinationCreate(String create) {
-        this.responseDestinationCreate = create;
-    }
-
-    public String getResponseConnectionFactoryName() {
-        return responseConnectionFactoryName;
-    }
-
-    public void setResponseConnectionFactoryName(String connectionFactoryName) {
-        this.responseConnectionFactoryName = connectionFactoryName;
-    }
-
-    public String getResponseConnectionFactoryCreate() {
-        return this.responseConnectionFactoryCreate;
-    }
-
-    public void setResponseConnectionFactoryCreate(String create) {
-        this.responseConnectionFactoryCreate = create;
-    }
-
-    public String getResponseActivationSpecName() {
-        return responseActivationSpecName;
-    }
-
-    public void setResponseActivationSpecName(String activationSpecName) {
-        this.responseActivationSpecName = activationSpecName;
-    }
-
-    public String getResponseActivationSpecCreate() {
-        return this.responseActivationSpecCreate;
-    }
-
-    public void setResponseActivationSpecCreate(String create) {
-        this.responseActivationSpecCreate = create;
-    }
-
-    public int getDeliveryMode() {
-        return jmsDeliveryMode;
-    }
-
-    public void setDeliveryMode(int deliveryMode) {
-        this.jmsDeliveryMode = deliveryMode;
-    }
-
-    public int getTimeToLive() {
-        return jmsTimeToLive;
-    }
-
-    public void setTimeToLive(int timeToLive) {
-        this.jmsTimeToLive = timeToLive;
-    }
-
-    public int getPriority() {
-        return jmsPriority;
-    }
-
-    public void setPriority(int priority) {
-        this.jmsPriority = priority;
-    }
-
-    // operations to manage the other information required by the
-    // JMS binding
-
-    public String getJmsResourceFactoryName() {
-        return jmsResourceFactoryName;
-    }
-
-    public void setJmsResourceFactoryName(String jmsResourceFactoryName) {
-        this.jmsResourceFactoryName = jmsResourceFactoryName;
-    }
-
-//    public JMSResourceFactory getJmsResourceFactory() {
-//        return (JMSResourceFactory)instantiate(null, jmsResourceFactoryName);
-//    }
-
-    public void setRequestMessageProcessorName(String name) {
-        this.requestMessageProcessorName = name;
-    }
-
-    public String getRequestMessageProcessorName() {
-        return requestMessageProcessorName;
-    }
-
-    public JMSMessageProcessor getRequestMessageProcessor() {
-        return (JMSMessageProcessor)instantiate(null, requestMessageProcessorName);
-    }
-
-    public void setResponseMessageProcessorName(String name) {
-        this.responseMessageProcessorName = name;
-    }
-
-    public String getResponseMessageProcessorName() {
-        return responseMessageProcessorName;
-    }
-
-    public JMSMessageProcessor getResponseMessageProcessor() {
-        return (JMSMessageProcessor)instantiate(null, 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;
-    }
-
-    /**
-     * 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 Object instantiate(ClassLoader cl, String className) {
-        Object instance;
-        if (cl == null) {
-            cl = this.getClass().getClassLoader();
-        }
-
-        try {
-            Class clazz;
-
-            try {
-                clazz = cl.loadClass(className);
-            } catch (ClassNotFoundException e) {
-                clazz = this.getClass().getClassLoader().loadClass(className);
-            }
-
-            Constructor constructor = clazz.getDeclaredConstructor(new Class[] {JMSBinding.class});
-            instance = constructor.newInstance(this);
-
-        } catch (Throwable e) {
-            throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e);
-        }
-
-        return instance;
-    }
-
-    /**
-     * 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
-    }
-
-    // TODO...
-
-    public String getReplyTo() {
-        return replyTo;
-    }
-
-    public void setReplyTo(String replyTo) {
-        this.replyTo = replyTo;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
deleted file mode 100644
index c6267117b4..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.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.impl;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-
-/**
- * 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;
-    String DEFAULT_RF_CLASSNAME = "org.apache.tuscany.sca.host.jms.activemq.JMSResourceFactoryImpl";
-    String DEFAULT_MP_CLASSNAME = XMLTextMessageProcessor.class.getName();
-    String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
-
-    String FAULT_PROPERTY = "org.apache.tuscany.sca.fault";
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
deleted file mode 100644
index 0928e02082..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/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.impl;
-
-/**
- * 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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
deleted file mode 100644
index e2243e8fdf..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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 static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-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.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.ObjectMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
-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;
-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>?
- * 
- *     <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;
-
-    public JMSBindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        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 = new ProblemImpl(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 = new ProblemImpl(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 = new JMSBinding();
-
-        // 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);
-                //throw new JMSBindingException("invalid correlationScheme: " + 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 = XMLTextMessageProcessor.class.getName();
-            } else if ("TextMessage".equalsIgnoreCase(messageProcessorName)) {
-                messageProcessorName = TextMessageProcessor.class.getName();
-            } else if ("ObjectMessage".equalsIgnoreCase(messageProcessorName)) {
-                messageProcessorName = ObjectMessageProcessor.class.getName();
-            }
-            jmsBinding.setRequestMessageProcessorName(messageProcessorName);
-            jmsBinding.setResponseMessageProcessorName(messageProcessorName);
-
-        }
-
-        // Read requestConnection
-        // TODO
-        // Read reponseConnection
-        // TODO
-        // Read operationProperties
-        // TODO
-
-        // Read sub-elements of binding.jms
-        boolean endFound = false;
-        while (!endFound) {
-            switch (reader.next()) {
-                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);
-                    }
-                    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());
-                        //throw new RuntimeException("Incomplete binding.jms definition found unexpected element " 
-                        		                    //+ x.toString());
-                    }
-            }
-        }
-
-        jmsBinding.validate();
-
-        return jmsBinding;
-    }
-
-    protected void parseURI(String uri, JMSBinding jmsBinding) {
-        if (!uri.startsWith("jms:")) {
-        	error("MustStartWithSchema", jmsBinding, uri);
-            //throw new JMSBindingException("uri must start with the scheme 'jms:' for uri: " + 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 {
-    }
-
-    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);
-            //throw new RuntimeException("missing connectionFactory name");
-        }
-    }
-
-    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());
-                        //throw new RuntimeException("Incomplete binding.jms/response definition found unexpected element " 
-                    	                            //+ x.toString());
-                    }
-            }
-        }
-    }
-
-    private void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-    	warning("DoesntProcessResourceAdapter", jmsBinding);
-    }
-
-    private void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-    	warning("DoesntProcessHeaders", jmsBinding);
-    }
-
-    private void parseOperationProperties(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
-    	warning("DoesntProcessOperationProperties", jmsBinding);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
deleted file mode 100644
index 0b7de9f401..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.osoa.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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
deleted file mode 100644
index e5d14dd42f..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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 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 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.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Interceptor 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 requestDest;
-    protected Destination replyDest;
-
-    public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory) {
-
-        this.operation = operation;
-        operationName = operation.getName();
-
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        requestMessageProcessor = jmsBinding.getRequestMessageProcessor();
-        responseMessageProcessor = jmsBinding.getResponseMessageProcessor();
-        try {
-            requestDest = lookupDestination();
-            replyDest = 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)
-     */
-    private 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)
-     */
-    private 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
-     */
-    private 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 msg) {
-        try {
-            Object resp = invokeTarget((Object[])msg.getBody(), (short)0);
-            msg.setBody(resp);
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e.getCause());
-        } catch (ServiceRuntimeException e) {
-            if (e.getCause() instanceof InvocationTargetException) {
-                if ((e.getCause().getCause() instanceof RuntimeException)) {
-                    msg.setFaultBody(e.getCause());
-                } else {
-                    msg.setFaultBody(e.getCause().getCause());
-                }
-            } else {
-                msg.setFaultBody(e);
-            }
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-        return msg;
-    }
-
-    public Object invokeTarget(Object payload, final short sequence) throws InvocationTargetException {
-        try {
-            Session session = jmsResourceFactory.createSession();
-            try {
-
-                Destination replyToDest;
-                if (operation.isNonBlocking()) {
-                    replyToDest = null;
-                } else {
-                    replyToDest = (replyDest != null) ? replyDest : session.createTemporaryQueue();
-                }
-
-                Message requestMsg = sendRequest((Object[])payload, session, replyToDest);
-                if (replyToDest == null) {
-                    return null;
-                } else {
-                    Message replyMsg = receiveReply(session, replyToDest, requestMsg.getJMSMessageID());
-                    return ((Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg))[0];
-                }
-
-            } finally {
-                session.close();
-            }
-        } catch (JMSException e) {
-            throw new InvocationTargetException(e);
-        } catch (NamingException e) {
-            throw new InvocationTargetException(e);
-        }
-    }
-
-    protected Message sendRequest(Object payload, Session session, Destination replyToDest) throws JMSException {
-
-        Message requestMsg = requestMessageProcessor.insertPayloadIntoJMSMessage(session, payload);
-
-        requestMsg.setJMSDeliveryMode(jmsBinding.getDeliveryMode());
-        requestMsg.setJMSPriority(jmsBinding.getPriority());
-
-        requestMessageProcessor.setOperationName(operationName, requestMsg);
-        requestMsg.setJMSReplyTo(replyToDest);
-
-        MessageProducer producer = session.createProducer(requestDest);
-        try {
-            producer.send(requestMsg);
-        } finally {
-            producer.close();
-        }
-        return requestMsg;
-    }
-
-    protected Message receiveReply(Session session, Destination replyToDest, String requestMsgId) throws JMSException,
-        NamingException {
-        String msgSelector = "JMSCorrelationID = '" + requestMsgId + "'";
-        MessageConsumer consumer = session.createConsumer(replyToDest, msgSelector);
-        Message replyMsg;
-        try {
-            jmsResourceFactory.startConnection();
-            replyMsg = consumer.receive(jmsBinding.getTimeToLive());
-        } finally {
-            consumer.close();
-        }
-        if (replyMsg == null) {
-            throw new JMSBindingException("No reply message received on " + replyToDest + " for message id " + requestMsgId);
-        }
-        return replyMsg;
-    }
-    
-    public boolean allowsPassByReference() {
-        // JMS always pass by value
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
deleted file mode 100644
index 61c4ec65fc..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.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.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.Session;
-import javax.naming.NamingException;
-
-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.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Listener for the JMSBinding.
- *
- * @version $Rev$ $Date$
- */
-public class JMSBindingListener implements MessageListener {
-
-    private static final Logger logger = Logger.getLogger(JMSBindingListener.class.getName());
-
-    private static final String ON_MESSAGE_METHOD_NAME = "onMessage";
-    private JMSBinding jmsBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private RuntimeComponentService service;
-    private JMSMessageProcessor requestMessageProcessor;
-    private JMSMessageProcessor responseMessageProcessor;
-    private String correlationScheme;
-
-    public JMSBindingListener(JMSBinding jmsBinding,
-                              JMSResourceFactory jmsResourceFactory,
-                              RuntimeComponentService service) throws NamingException {
-        this.jmsBinding = jmsBinding;
-        this.jmsResourceFactory = jmsResourceFactory;
-        this.service = service;
-        requestMessageProcessor = jmsBinding.getRequestMessageProcessor();
-        responseMessageProcessor = jmsBinding.getResponseMessageProcessor();
-        correlationScheme = jmsBinding.getCorrelationScheme();
-    }
-
-    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);
-        Object requestPayload = requestMessageProcessor.extractPayloadFromJMSMessage(requestJMSMsg);
-
-        List<Operation> opList = service.getInterfaceContract().getInterface().getOperations();
-
-        Operation operation = null;
-
-        if (opList.size() == 1) {
-            // SCA JMS Binding Specification - Rule 1.5.1 line 203
-            operation = opList.get(0);
-        } else if (operationName != null) {
-            // SCA JMS Binding Specification - Rule 1.5.1 line 205
-            for (Operation op : opList) {
-                if (op.getName().equals(operationName)) {
-                    operation = op;
-                    break;
-                }
-            }
-        } else {
-            // SCA JMS Binding Specification - Rule 1.5.1 line 207
-            for (Operation op : opList) {
-                if (op.getName().equals(ON_MESSAGE_METHOD_NAME)) {
-                    operation = op;
-                    break;
-                }
-            }
-        }
-
-        if (operation != null) {
-            return service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload);
-        } else {
-            throw new JMSBindingException("Can't find operation " + (operationName != null ? operationName
-                : ON_MESSAGE_METHOD_NAME));
-        }
-
-    }
-
-    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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
deleted file mode 100644
index 57fc0e1230..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.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.jms.provider;
-
-import org.apache.tuscany.sca.binding.jms.impl.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;
-
-    public JMSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        workScheduler = utilities.getUtility(WorkScheduler.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   JMSBinding binding) {
-        return new JMSBindingReferenceBindingProvider(component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               JMSBinding binding) {
-        return new JMSBindingServiceBindingProvider(component, service, binding, workScheduler);
-    }
-
-    public Class<JMSBinding> getModelType() {
-        return JMSBinding.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
deleted file mode 100644
index 4920e92ae5..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.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.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jms.JMSException;
-
-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.interfacedef.Interface;
-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 JMS reference binding provider.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private RuntimeComponentReference reference;
-    private JMSBinding jmsBinding;
-    private List<JMSBindingInvoker> jmsBindingInvokers = new ArrayList<JMSBindingInvoker>();
-    private JMSResourceFactory jmsResourceFactory;
-
-    public JMSBindingReferenceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentReference reference,
-                                              JMSBinding binding) {
-        this.reference = reference;
-        this.jmsBinding = binding;
-        jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());
-
-        if (XMLTextMessageProcessor.class.isAssignableFrom(jmsBinding.getRequestMessageProcessor().getClass())) {
-            setXMLDataBinding(reference);
-        }
-
-    }
-
-    protected void setXMLDataBinding(RuntimeComponentReference reference) {
-        try {
-            InterfaceContract ic = (InterfaceContract)reference.getInterfaceContract().clone();
-
-            Interface ii = (Interface)ic.getInterface().clone();
-            ii.resetDataBinding("org.apache.axiom.om.OMElement");
-            ic.setInterface(ii);
-            reference.setInterfaceContract(ic);
-
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Invoker createInvoker(Operation operation) {
-
-        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
-            throw new JMSBindingException("No destination specified for reference " + reference.getName());
-        }
-
-        /* The following doesn't work as I can't get to the 
-         * target list on the composite reference
-                // if the default destination queue name is set
-                // set the destination queue name to the wired service name
-                // so that any wires can be assured a unique endpoint.
-                
-                if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)){
-                    // get the name of the target service
-                    List<ComponentService> targets = reference.getTargets();
-                    
-                    if (targets.size() < 1){
-                        throw new JMSBindingException("No target specified for reference " +
-                                                      reference.getName() +
-                                                      " so destination queue name can't be determined");
-                    }
-                    
-                    if (targets.size() > 1){
-                        throw new JMSBindingException("More than one target specified for reference " +
-                                                      reference.getName() +
-                                                      " so destination queue name can't be determined");
-                    }
-                    
-                    ComponentService service = targets.get(0);
-                    jmsBinding.setDestinationName(service.getName());
-                }
-                
-                
-                // if the default response queue name is set 
-                // set the response queue to the names of this 
-                // reference
-                if (jmsBinding.getResponseDestinationName().equals(JMSBindingConstants.DEFAULT_RESPONSE_DESTINATION_NAME)){
-                    jmsBinding.setResponseDestinationName(reference.getName());
-                }    
-        */        
-        JMSBindingInvoker invoker = new JMSBindingInvoker(jmsBinding, operation, jmsResourceFactory);
-        jmsBindingInvokers.add(invoker);
-        return invoker;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public void start() {
-
-    }
-
-    public void stop() {
-        try {
-            jmsResourceFactory.closeConnection();
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
deleted file mode 100644
index 15a4d0ada2..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.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.Session;
-import javax.naming.NamingException;
-
-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.interfacedef.Interface;
-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.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * Implementation of the JMS service binding provider.
- * 
- * @version $Rev$ $Date$
- */
-public class JMSBindingServiceBindingProvider implements ServiceBindingProvider {
-    private static final Logger logger = Logger.getLogger(JMSBindingServiceBindingProvider.class.getName());
-
-    private RuntimeComponentService service;
-    private JMSBinding jmsBinding;
-    private JMSResourceFactory jmsResourceFactory;
-    private MessageConsumer consumer;
-    private WorkScheduler workScheduler;
-    private boolean running;
-
-    public JMSBindingServiceBindingProvider(RuntimeComponent component,
-                                            RuntimeComponentService service,
-                                            JMSBinding binding,
-                                            WorkScheduler workScheduler) {
-        this.service = service;
-        this.jmsBinding = binding;
-        this.workScheduler = workScheduler;
-
-        jmsResourceFactory = new JMSResourceFactory(binding.getConnectionFactoryName(), binding.getInitialContextFactoryName(), binding.getJndiURL());
-
-        if (jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME)) {
-            // use the SCA service name as the default destination name
-            jmsBinding.setDestinationName(service.getName());
-        }
-
-        if (XMLTextMessageProcessor.class.isAssignableFrom(jmsBinding.getRequestMessageProcessor().getClass())) {
-            setXMLDataBinding(service);
-        }
-
-    }
-
-    protected void setXMLDataBinding(RuntimeComponentService service) {
-        if (service.getInterfaceContract() != null) {
-            try {
-                InterfaceContract ic = (InterfaceContract)service.getInterfaceContract().clone();
-
-                Interface ii = (Interface)ic.getInterface().clone();
-                ii.resetDataBinding("org.apache.axiom.om.OMElement");
-                ic.setInterface(ii);
-                service.setInterfaceContract(ic);
-
-            } catch (CloneNotSupportedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    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) {
-            throw new JMSBindingException("Error stopping JMSServiceBinding", e);
-        }
-    }
-
-    private void registerListerner() throws NamingException, JMSException {
-
-        Session session = jmsResourceFactory.createSession();
-        Destination destination = lookupDestinationQueue();
-
-        consumer = session.createConsumer(destination);
-
-        final JMSBindingListener listener = new JMSBindingListener(jmsBinding, jmsResourceFactory, service);
-        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 '" + service.getName() + "' listening on destination " + jmsBinding.getDestinationName());
-    }
-
-    /**
-     * 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 {
-        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;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
deleted file mode 100644
index 733cebacac..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
deleted file mode 100644
index 9b5e8e64b9..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.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.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.JMSBindingException;
-
-/**
- * Abstracts away any JMS provide specific feature from the JMS binding
- *
- * @version $Rev$ $Date$
- */
-public class JMSResourceFactory {
-
-    private String initialContextFactoryName;
-    private String connectionFactoryName = "ConnectionFactory";
-    private String jndiURL;
-
-    private Connection connection;
-    private Context context;
-    private boolean isConnectionStarted;
-
-    public JMSResourceFactory(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.binding.jms.JMSResourceFactory#getConnection()
-     */
-    public Connection getConnection() throws NamingException, JMSException {
-        if (connection == null) {
-            createConnection();
-        }
-        return connection;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
-     */
-    public Session createSession() throws JMSException, NamingException {
-        return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()
-     */
-    public void startConnection() throws JMSException, NamingException {
-        if (!isConnectionStarted) {
-            getConnection().start();
-            isConnectionStarted = true;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()
-     */
-    public void closeConnection() throws JMSException {
-        if (connection != null) {
-            connection.close();
-        }
-    }
-
-    private void createConnection() throws NamingException, JMSException {
-        ConnectionFactory connectionFactory = (ConnectionFactory)jndiLookUp(connectionFactoryName);
-        if (connectionFactory == null) {
-            throw new JMSBindingException("connection factory not found: " + connectionFactoryName);
-        }
-        connection = connectionFactory.createConnection();
-    }
-
-    private 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 
-     */
-    private 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");
-    		}
-    	}
-	}
-
-	public Destination lookupDestination(String jndiName) throws NamingException {
-        return (Destination)jndiLookUp(jndiName);
-    }
-
-    /**
-     * 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 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 (NamingException ex) {
-            // ignore
-        }
-        if (o == null) {
-            try {
-                o = getInitialContext().lookup(name);
-            } catch (NamingException ex) {
-                // ignore
-            }
-        }
-        return o;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
deleted file mode 100644
index e63c1ec19b..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.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.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.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.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 {
-
-            return new Object[] {((ObjectMessage)msg).getObject()};
-
-        } catch (JMSException e) {
-            throw new JMSBindingException(e);
-        }
-    }
-
-    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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
deleted file mode 100644
index cf9f6ce88b..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.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 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.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/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
deleted file mode 100644
index 8f4237b4bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.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.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.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.impl.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/tags/java/sca/1.3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ac37a0f26b..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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.jms.impl.JMSBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.jms,model=org.apache.tuscany.sca.binding.jms.impl.JMSBinding
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index dec0991984..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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.impl.JMSBinding

diff --git a/tags/java/sca/1.3/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/tags/java/sca/1.3/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
deleted file mode 100644
index be26a615dd..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ /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.
-#
-#
-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}
-
-
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
deleted file mode 100644
index fb80362457..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
deleted file mode 100644
index 515da3144a..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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.osoa.sca.annotations.Remotable;
-
-/**
- * Interface for the HelloWorld Service.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface HelloWorldService {
-    String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
deleted file mode 100644
index a8808c1bd1..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
deleted file mode 100644
index b27795ab09..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, 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;

-

-import javax.jms.TextMessage;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

-import org.apache.tuscany.sca.binding.jms.provider.JMSBindingListener;

-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;

-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.impl.OperationImpl;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-import org.easymock.EasyMock;

-import org.junit.Test;

-

-/**

- * This unit test is used to ensure that a JMS Message delivered to a Component will select the correct operation based

- * on the details in section 1.5 of the JMS Binding specification.

- *

- * @version $Rev$ $Date$

- */

-public class OperationSelectionTestCaseFIXME {

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName is not specified in the JMS

-     * Message

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameNotSpecified() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - not specified

-        final String scaOperationName = null;

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message matches the

-     * method name on the Service

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameMatches() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - matches operation name

-        final String scaOperationName = expectedOperation.getName();

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a Single method where scaOperationName in the JMS Message is

-     * different the method name on the Service

-     * <p>

-     * Expected behaviour is that the single method will be invoked as scaOperationName is ignored

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithOnlyOneOperationScaOperationNameDifferent() throws Exception {

-        // Create the operation we should match

-        final Operation expectedOperation = newOperation("myOperation");

-

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        operations.add(expectedOperation);

-

-        // The name of the Operation in the JMS Message - different to operation name

-        final String scaOperationName = "Does Not Match Opeation Name";

-

-        // Do the test

-        doTestJMSBinding(expectedOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS

-     * Message matches an operation name

-     * <p>

-     * Expected behaviour is that the named method will be invoked.

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithMultipleOperationsScaOperationNameSpecified() throws Exception {

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        for (int i = 0; i < 5; i++) {

-            operations.add(newOperation("operation" + i));

-        }

-

-        // Now try and invoke each operation

-        for (Operation expectedOperation : operations) {

-            // The name of the Operation in the JMS Message

-            final String scaOperationName = expectedOperation.getName();

-

-            // Do the test

-            doTestJMSBinding(expectedOperation, operations, scaOperationName);

-        }

-    }

-

-    /**

-     * This test attempts to invoke a Service with a multiple operations where scaOperationName specified in the JMS

-     * Message is not set so we invoke the onMessage() method

-     * <p>

-     * Expected behaviour is that the onMessage() method should be used instead

-     * 

-     * @throws Exception Failed

-     */

-    @Test

-    public void testServiceWithMultipleOperationsScaOperationNotSpecified() throws Exception {

-        // Create the list of operations for the Service

-        final List<Operation> operations = new ArrayList<Operation>();

-        for (int i = 0; i < 5; i++) {

-            operations.add(newOperation("operation" + i));

-        }

-

-        // Add the onMessage operation to the Service Contract

-        final Operation onMessageOperation = newOperation("onMessage");

-        operations.add(onMessageOperation);

-

-        // The name of the Operation in the JMS Message is not set so it will attempt

-        // to invoke the onMessage() method

-        final String scaOperationName = null;

-

-        // Do the test

-        doTestJMSBinding(onMessageOperation, operations, scaOperationName);

-    }

-

-    /**

-     * This is the test method that will attempt to unit test invoking a Service with the specified operations using a

-     * JMS Message with the specified scaOperationName to ensure that it invokes the expectedOperation

-     * 

-     * @param expectedOperation The Operation we are expecting to be invoked over JMS

-     * @param operations The list of Operations supported by the Service

-     * @param scaOperationName The value to set scaOperationName in the JMS Message

-     * @throws Exception Failed

-     */

-    private void doTestJMSBinding(Operation expectedOperation, List<Operation> operations, String scaOperationName)

-        throws Exception {

-        // Create the test JMS Binding

-        final JMSBinding jmsBinding = new JMSBinding();

-        JMSResourceFactory jmsResourceFactory = null;

-

-        // Extra information for the method we are invoking

-        final String operationParams = "Hello";

-        final Object operationReturnValue = "Operation Success";

-

-        // Mock up the Service. Basically, it is going to call:

-        // List<Operation> opList = service.getInterfaceContract().getInterface().getOperations();

-        final InterfaceContract ifaceContract = EasyMock.createStrictMock(InterfaceContract.class);

-        final RuntimeComponentService service = EasyMock.createStrictMock(RuntimeComponentService.class);

-        final Interface iface = EasyMock.createStrictMock(Interface.class);

-        EasyMock.expect(iface.getOperations()).andReturn(operations);

-        EasyMock.expect(ifaceContract.getInterface()).andReturn(iface);

-        EasyMock.expect(service.getInterfaceContract()).andReturn(ifaceContract);

-

-        // Mock up getting and invoking the RuntimeWire. It is going to call:

-        // service.getRuntimeWire(jmsBinding).invoke(operation, (Object[])requestPayload);

-        final RuntimeWire runtimeWire = EasyMock.createStrictMock(RuntimeWire.class);

-        EasyMock.expect(service.getRuntimeWire(jmsBinding)).andReturn(runtimeWire);

-        EasyMock.expect(runtimeWire.invoke(expectedOperation, new Object[] {operationParams}))

-            .andReturn(operationReturnValue);

-

-        // Create the JMS Binding Listener

-        final JMSBindingListener bindingListener = new JMSBindingListener(jmsBinding, jmsResourceFactory, service);

-

-        // Simulate a message

-        final TextMessage requestJMSMsg = EasyMock.createStrictMock(TextMessage.class);

-        EasyMock.expect(requestJMSMsg.getStringProperty("scaOperationName")).andReturn(scaOperationName);

-        EasyMock.expect(requestJMSMsg.getText()).andReturn(operationParams);

-        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(null);

-

-        // Lets put all the mocks into replay mode

-        // EasyMock.replay(iface);

-        EasyMock.replay(ifaceContract);

-        EasyMock.replay(service);

-        EasyMock.replay(requestJMSMsg);

-        EasyMock.replay(runtimeWire);

-

-        // Do the test

-        bindingListener.onMessage(requestJMSMsg);

-

-        // Verify our Mock objects

-        // EasyMock.verify(iface);

-        // EasyMock.verify(ifaceContract);

-        // EasyMock.verify(service);

-        // EasyMock.verify(requestJMSMsg);

-        // EasyMock.verify(runtimeWire);

-    }

-

-    private static Operation newOperation(String name) {

-        Operation operation = new OperationImpl();

-        operation.setName(name);

-        return operation;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
deleted file mode 100644
index 96f0497303..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, 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 junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;

-import org.junit.Test;

-

-/**

- * This unit test tests various combinations of the JMS Binding create modes for both request and response queues.

- * <p>

- * The SCA JMS Binding specification lists 3 create modes:

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

- *

- * @version $Rev$ $Date$

- */

-public class JMSBindingReferenceQueueCreateModeTestCaseFIXME {

-

-    /**

-     * Test creating a request queue in "never" mode where the queue does not exist. We are expecting an exception

-     */

-    @Test

-    public void testRequestCreateNeverQueueNotExist() {

-        String requestCreateMode = "never";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = true;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a request queue in "never" mode where the queue exists. We are expecting this to work

-     */

-    @Test

-    public void testRequestCreateNeverQueueExists() {

-        String requestCreateMode = "never";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a request queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testRequestCreateIfNotExistQueueNotExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a request queue in "ifnotexist" mode where the queue exists. We are expecting this to work

-     */

-    @Test

-    public void testRequestCreateIfNotExistQueueExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a request queue in "always" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testRequestCreateAlwaysQueueNotExist() {

-        String requestCreateMode = "always";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a request queue in "always" mode where the queue exists. We are expecting an exception

-     */

-    @Test

-    public void testRequestCreateAlwaysQueueExists() {

-        String requestCreateMode = "always";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = true;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "never" mode where the queue does not exist. We are expecting an exception

-     */

-    @Test

-    public void testResponseCreateNeverQueueNotExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "never";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = true;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "never" mode where the queue exists. We are expecting this to work

-     */

-    @Test

-    public void testResponseCreateNeverQueueExists() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "never";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testResponseCreateIfNotExistQueueNotExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "ifnotexist" mode where the queue not exists. We are expecting this to work

-     */

-    @Test

-    public void testResponseCreateIfNotExistQueueExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "ifnotexist";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "always" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testResponseCreateAlwaysQueueNotExist() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "always";

-        boolean preCreateQueue = false;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = false;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * Test creating a response queue in "always" mode where the queue exists. We are expecting an exception

-     */

-    @Test

-    public void testResponseCreateAlwaysQueueExists() {

-        String requestCreateMode = "ifnotexist";

-        String responseCreateMode = "always";

-        boolean preCreateQueue = true;

-        boolean expectingRequestException = false;

-        boolean expectingResponseException = true;

-

-        doTestCase(requestCreateMode,

-                   responseCreateMode,

-                   preCreateQueue,

-                   expectingRequestException,

-                   expectingResponseException);

-    }

-

-    /**

-     * This is the main test method for the various test scenarios for the JMS Binding.

-     * 

-     * @param requestCreateMode The required create mode for the request destination queue

-     * @param responseCreateMode The required create mode for the response destination queue

-     * @param preCreateQueue Whether the queue should be pre-created.

-     * @param expectingRequestException true if we are expecting an exception because the request queue configuration is

-     *            invalid; false otherwise

-     * @param expectingResponseException true if we are expecting an exception because the request queue configuration

-     *            is invalid; false otherwise

-     */

-    private void doTestCase(String requestCreateMode,

-                            String responseCreateMode,

-                            boolean preCreateQueue,

-                            boolean expectingRequestException,

-                            boolean expectingResponseException) {

-        String requestDestinationName = "SomeRequestDestination";

-        String responseDestinationName = "SomeResponseDestination";

-        String jmsBindingName = "MyJMSBinding";

-

-        // Create a JMS Binding with the required test parameters

-        JMSBinding jmsBinding = new JMSBinding();

-        jmsBinding.setDestinationCreate(requestCreateMode);

-        jmsBinding.setResponseDestinationCreate(responseCreateMode);

-        if (preCreateQueue) {

-//            jmsBinding.setJmsResourceFactoryName(new JMSResourceFactory(null, null, null));

-        } else {

-//            jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueNotExist.class.getName());

-        }

-        jmsBinding.setDestinationName(requestDestinationName);

-        jmsBinding.setResponseDestinationName(responseDestinationName);

-        jmsBinding.setName(jmsBindingName);

-

-        // Create the operation

-        Operation operation = new OperationImpl();

-        operation.setName("OperationName");

-

-        // Try and create the JMS Binding Invoker for the JMS Binding

-        try {

-            new JMSBindingInvoker(jmsBinding, operation, null);

-

-            // Check whether we were expecting an exception

-            if (expectingRequestException || expectingResponseException) {

-                // We were expecting an exception

-                Assert.fail("This binding should have failed as it is invalid");

-            }

-        } catch (JMSBindingException ex) {

-            // Were we expecting an exception

-            if (!expectingRequestException && !expectingResponseException) {

-                // No we were not expecting an exception

-                Assert.fail("Unexpected exception of " + ex);

-            }

-

-            // Validate that the expected exception has the text we expect

-            if (expectingRequestException) {

-                Assert.assertTrue(ex.getMessage().indexOf("JMS Destination") != -1);

-                Assert.assertTrue(ex.getMessage().indexOf(requestCreateMode) != -1);

-                Assert.assertTrue(ex.getMessage().indexOf(requestDestinationName) != -1);

-            } else if (expectingResponseException) {

-                Assert.assertTrue(ex.getMessage().indexOf("JMS Response Destination") != -1);

-                Assert.assertTrue(ex.getMessage().indexOf(responseCreateMode) != -1);

-                Assert.assertTrue(ex.getMessage().indexOf(responseDestinationName) != -1);

-            }

-            Assert.assertTrue(ex.getMessage().indexOf("registering binding " + jmsBindingName + " invoker") != -1);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java b/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
deleted file mode 100644
index c3c18fbfbe..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, 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 junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;

-import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;

-import org.apache.tuscany.sca.core.assembly.RuntimeComponentServiceImpl;

-import org.apache.tuscany.sca.runtime.RuntimeComponentService;

-import org.junit.Test;

-

-/**

- * This method tests various combinations of the JMS Binding create modes.

- * <p>

- * The SCA JMS Binding specification lists 3 create modes:

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

- *

- * @version $Rev$ $Date$

- */

-public class JMSBindingServiceQueueCreateModeTestCaseFIXME {

-    /**

-     * Test creating a queue in "never" mode where the queue does not exist. We are expecting an exception

-     */

-    @Test

-    public void testCreateNeverQueueNotExist() {

-        String createMode = "never";

-        boolean preCreateQueue = false;

-        boolean expectingException = true;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * Test creating a queue in "never" mode where the queue exists. We are expecting this to work

-     */

-    @Test

-    public void testCreateNeverQueueExist() {

-        String createMode = "never";

-        boolean preCreateQueue = true;

-        boolean expectingException = false;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * Test creating a queue in "ifnotexist" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testCreateIfNotExistQueueNotExist() {

-        String createMode = "ifnotexist";

-        boolean preCreateQueue = false;

-        boolean expectingException = false;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * Test creating a queue in "ifnotexist" mode where the queue exists. We are expecting this to work

-     */

-    @Test

-    public void testCreateIfNotExistQueueExist() {

-        String createMode = "ifnotexist";

-        boolean preCreateQueue = true;

-        boolean expectingException = false;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * Test creating a queue in "always" mode where the queue does not exist. We are expecting this to work

-     */

-    @Test

-    public void testCreateAlwaysQueueNotExist() {

-        String createMode = "always";

-        boolean preCreateQueue = false;

-        boolean expectingException = false;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * Test creating a queue in "always" mode where the queue exists. We are expecting an exception

-     */

-    @Test

-    public void testCreateAlwaysQueueExist() {

-        String createMode = "always";

-        boolean preCreateQueue = true;

-        boolean expectingException = true;

-

-        doTestCase(createMode, preCreateQueue, expectingException);

-    }

-

-    /**

-     * This is the main test method for the various test scenarios for the JMS Binding.

-     * 

-     * @param createMode The required create mode for the destination queue

-     * @param preCreateQueue Whether the queue should be pre-created.

-     * @param expectingException true if test should throw an exception

-     */

-    private void doTestCase(String createMode, boolean preCreateQueue, boolean expectingException) {

-        String destinationName = "SomeDestination";

-        String jmsBindingName = "MyJMSBinding";

-        String serviceName = "MyServiceName";

-

-        // Create a JMS Binding with the required test parameters

-        JMSBinding jmsBinding = new JMSBinding();

-        jmsBinding.setDestinationCreate(createMode);

-//        if (preCreateQueue) {

-//            jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueExist.class.getName());

-//        } else {

-//            jmsBinding.setJmsResourceFactoryName(MockJMSResourceFactoryQueueNotExist.class.getName());

-//        }

-        jmsBinding.setDestinationName(destinationName);

-        jmsBinding.setName(jmsBindingName);

-

-        RuntimeComponentService service = new RuntimeComponentServiceImpl();

-        service.setName(serviceName);

-

-        // Try and create the JMS Binding Service for the JMS Binding

-        try {

-            JMSBindingServiceBindingProvider jmsService =

-                new JMSBindingServiceBindingProvider(null, service, jmsBinding, null);

-            jmsService.start();

-

-            // Check whether we were expecting an exception

-            if (expectingException) {

-                // We were expecting an exception

-                Assert.fail("This binding should have failed as it is invalid");

-            }

-        } catch (JMSBindingException ex) {

-            // Were we expecting an exception

-            if (!expectingException) {

-                ex.printStackTrace();

-                // No we were not expecting an exception

-                Assert.fail("Unexpected exception of " + ex);

-            }

-

-            // We should get a JMSBindingException

-            Assert.assertTrue(ex.getMessage().indexOf("Error starting JMSServiceBinding") != -1);

-

-            // Validate that the expected chained exception exception has the text we expect

-            Assert.assertNotNull(ex.getCause());

-            Assert.assertTrue(ex.getCause().getMessage().indexOf("JMS Destination") != -1);

-            Assert.assertTrue(ex.getCause().getMessage().indexOf(createMode) != -1);

-            Assert.assertTrue(ex.getCause().getMessage().indexOf(destinationName) != -1);

-            Assert

-                .assertTrue(ex.getCause().getMessage().indexOf("registering service " + serviceName + " listener") != -1);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-jms/src/test/resources/simple/client.composite b/tags/java/sca/1.3/modules/binding-jms/src/test/resources/simple/client.composite
deleted file mode 100644
index dcea428493..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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/tags/java/sca/1.3/modules/binding-jms/src/test/resources/simple/service.composite b/tags/java/sca/1.3/modules/binding-jms/src/test/resources/simple/service.composite
deleted file mode 100644
index 44b7b29610..0000000000
--- a/tags/java/sca/1.3/modules/binding-jms/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/LICENSE b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/NOTICE b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/pom.xml b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/pom.xml
deleted file mode 100644
index 45a9f86c94..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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</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-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-	        <groupId>httpunit</groupId>
-	        <artifactId>httpunit</artifactId>
-	        <version>1.6.1</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.jsonrpc.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>
-                            !org.apache.tuscany.sca.binding.jsonrpc,
-                            org.apache.tuscany.sca.binding.jsonrpc*
-                        </Export-Package>
-                        <Import-Package>
-                            org.apache.tuscany.sca.assembly.xml,
-                            org.apache.tuscany.sca.binding.jsonrpc,
-                            *
-                         </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
deleted file mode 100644
index a9fff462fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
deleted file mode 100644
index eb85453bbb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
deleted file mode 100644
index e2528f59e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
deleted file mode 100644
index 2ebbecff68..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.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.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().setDefaultDataBinding(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());
-        
-        // 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();
-        }
-        
-        // 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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
deleted file mode 100644
index da4461c1cd..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.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.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.osoa.sca.ServiceRuntimeException;
-
-import com.metaparadigm.jsonrpc.JSONRPCBridge;
-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;
-        JSONObject jsonResponse = new JSONObject();
-        try {
-            result = wire.invoke(jsonOperation, args);
-            try {
-                jsonResponse.put("result", result);
-                jsonResponse.putOpt("id", id);
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
-        } catch (InvocationTargetException e) {
-            try {
-                jsonResponse.put("error", e.getCause());
-                jsonResponse.putOpt("id", id);
-            } catch (Exception e1) {
-                throw new ServiceRuntimeException(e);
-            }
-        } catch(RuntimeException e) {
-            e.printStackTrace();
-            throw e;
-        }
-        
-        //get response to send to client
-        return jsonResponse.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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
deleted file mode 100644
index 64339fda7b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
deleted file mode 100644
index 999588abf1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 4767358e7a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
deleted file mode 100644
index d837bab91c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java
deleted file mode 100644
index 584228abde..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/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 org.apache.tuscany.sca.binding.jsonrpc;
-
-/**
- * Interface of our sample JSONRPC service.
- * 
- * @version $Rev$ $Date$
- */
-public interface Echo {
-    
-    String echo(String msg);
-}
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java
deleted file mode 100644
index e63cafd6a6..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.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.jsonrpc;
-
-
-
-/**
- * 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;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
deleted file mode 100644
index f937e80cf5..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.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.jsonrpc;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.json.JSONObject;
-
-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 extends TestCase {
-
-    private static final String SERVICE_PATH = "/EchoService";
-
-    private static final String SERVICE_URL = "http://localhost:8085/SCADomain" + SERVICE_PATH;
-
-    private SCADomain domain;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("JSONRPCBinding.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    	domain.close();
-    }
-
-    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);
-
-        assertEquals(200, response.getResponseCode());
-        JSONObject jsonResp = new JSONObject(response.getText());
-        assertEquals("echo: Hello JSON-RPC", jsonResp.getString("result"));
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/tags/java/sca/1.3/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
deleted file mode 100644
index 491b42c69c..0000000000
--- a/tags/java/sca/1.3/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="org.apache.tuscany.sca.binding.jsonrpc.Echo"/>

-        <tuscany:binding.jsonrpc uri="http://localhost:8085/SCADomain/EchoService"/>

-    </service>

-

-    <component name="EchoComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.jsonrpc.EchoComponentImpl"/>

-    </component>

-    

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc/LICENSE b/tags/java/sca/1.3/modules/binding-jsonrpc/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-jsonrpc/NOTICE b/tags/java/sca/1.3/modules/binding-jsonrpc/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc/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/tags/java/sca/1.3/modules/binding-jsonrpc/pom.xml b/tags/java/sca/1.3/modules/binding-jsonrpc/pom.xml
deleted file mode 100644
index e6e5c4a51f..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.jsonrpc</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.jsonrpc*</Export-Package>
-                        <Import-Package>org.apache.tuscany.sca.assembly.xml,*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/tags/java/sca/1.3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
deleted file mode 100644
index 409acf99f7..0000000000
--- a/tags/java/sca/1.3/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.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.jsonrpc;
-
-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;
-
-/**
- * A model for the JSONRPC binding.
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCBinding implements OptimizableBinding {
-    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
-    }
-
-    //FIXME Temporary to get access to the target binding information
-    // To be removed when the distributed domain supports wiring of other
-    // bindings than the SCA binding
-    private Binding targetBinding; 
-    private Component targetComponent; 
-    private ComponentService targetComponentService; 
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-    
-    public void setTargetBinding(Binding binding) {
-        this.targetBinding = binding;
-    }
-    
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-    
-    public void setTargetComponent(Component component) {
-        this.targetComponent = component;
-    }
-    
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-    
-    public void setTargetComponentService(ComponentService service) {
-        this.targetComponentService = service; 
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 3adbec0f97..0000000000
--- a/tags/java/sca/1.3/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.0#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding

diff --git a/tags/java/sca/1.3/modules/binding-notification/LICENSE b/tags/java/sca/1.3/modules/binding-notification/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/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/tags/java/sca/1.3/modules/binding-notification/NOTICE b/tags/java/sca/1.3/modules/binding-notification/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/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/tags/java/sca/1.3/modules/binding-notification/pom.xml b/tags/java/sca/1.3/modules/binding-notification/pom.xml
deleted file mode 100644
index 378daf625e..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * 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.3</version>

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

-    </parent>

-

-    <artifactId>tuscany-binding-notification</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Extension</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-core</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-host-http</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.1</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-databinding-axiom</artifactId>

-            <version>1.3</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>

-            </exclusions>

-            <version>1.2.5</version>

-        </dependency>

-		        

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-            <scope>runtime</scope>

-        </dependency>

-        <!-- test dependencies -->

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</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.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.5</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.notification</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.binding.notification*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
deleted file mode 100644
index 8e6a78551a..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.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.notification;

-

-/**

- * Creates runtime artifacts for the notification binding

- *

- * @version $Rev$ $Date$

- */

-public class DefaultNotificationBindingFactory implements NotificationBindingFactory {

-    

-    public NotificationBinding createNotificationBinding() {

-        return new NotificationBindingImpl();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
deleted file mode 100644
index 940a69784b..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.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.notification;

-

-import java.net.URI;

-

-import org.apache.tuscany.sca.assembly.Binding;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface NotificationBinding extends Binding {

-

-    String getNtmAddress();

-    

-    void setNtmAddress(String ntm);

-    

-    URI getNotificationType();

-    

-    void setNotificationType(URI notificationType);

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
deleted file mode 100644
index 31a8b26c02..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.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.notification;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface NotificationBindingFactory {

-

-    NotificationBinding createNotificationBinding();

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
deleted file mode 100644
index f4c210ba7c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.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.notification;

-

-import java.net.URI;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationBindingImpl implements NotificationBinding {

-    private String name;

-    private String uri;

-    protected String ntmAddress;

-    protected URI notificationType;

-    

-    @Override

-    public Object clone() {

-        return this;

-    }

-

-    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 String getNtmAddress() {

-        return ntmAddress;

-    }

-    

-    public void setNtmAddress(String ntmAddress) {

-        this.ntmAddress = ntmAddress;

-    }

-    

-    public URI getNotificationType() {

-        return notificationType;

-    }

-    

-    public void setNotificationType(URI notificationType) {

-        this.notificationType = notificationType;

-    }

-    

-    public void setUnresolved(boolean unresolved) {

-    }

-    

-    public boolean isUnresolved() {

-        return false;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
deleted file mode 100644
index 7fdeee189b..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.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.notification;

-

-import org.apache.tuscany.sca.assembly.AssemblyFactory;

-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;

-import org.apache.tuscany.sca.binding.notification.encoding.DefaultEncodingRegistry;

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ModuleActivator;

-import org.apache.tuscany.sca.host.http.ExtensibleServletHost;

-import org.apache.tuscany.sca.host.http.ServletHost;

-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;

-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;

-import org.apache.tuscany.sca.policy.PolicyFactory;

-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationBindingModuleActivator implements ModuleActivator {

-

-    private NotificationBindingProcessor bindingProcessor;

-    

-    private DefaultEncodingRegistry encodingRegistry;

-    private ServletHost servletHost;

-    

-	

-    public void start(ExtensionPointRegistry registry) {

-        encodingRegistry = new DefaultEncodingRegistry();

-        servletHost = new ExtensibleServletHost(registry.getExtensionPoint(ServletHostExtensionPoint.class));

-        

-        AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();

-        PolicyFactory policyFactory = new DefaultPolicyFactory();

-        DefaultNotificationBindingFactory bindingFactory = new DefaultNotificationBindingFactory();

-        bindingProcessor = new NotificationBindingProcessor(assemblyFactory, policyFactory, bindingFactory);

-        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        processors.addArtifactProcessor(bindingProcessor);

-        

-        NotificationBindingProviderFactory nbpf = new NotificationBindingProviderFactory(servletHost,

-                                                                                         encodingRegistry);

-        ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);

-        providerFactories.addProviderFactory(nbpf);

-    }

-

-    public void stop(ExtensionPointRegistry registry) {

-    	encodingRegistry.stop();

-        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        processors.removeArtifactProcessor(bindingProcessor);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
deleted file mode 100644
index 892700779f..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.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.notification;

-

-import java.net.URI;

-import java.net.URISyntaxException;

-

-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.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.PolicyFactory;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationBindingProcessor implements StAXArtifactProcessor<NotificationBinding> {

-

-    protected static final QName BINDING_NOTIFICATION = new QName(Constants.SCA10_TUSCANY_NS, "binding.notification");

-    

-    private NotificationBindingFactory bindingFactory;

-

-    public NotificationBindingProcessor(AssemblyFactory assemblyFactory,

-                                        PolicyFactory policyFactory,

-                                        NotificationBindingFactory bindingFactory) {

-        this.bindingFactory = bindingFactory;

-    }

-

-    public QName getArtifactType() {

-        return BINDING_NOTIFICATION;

-    }

-    

-    public Class<NotificationBinding> getModelType() {

-        return NotificationBinding.class;

-    }

-

-    public NotificationBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        assert BINDING_NOTIFICATION.equals(reader.getName());

-        String bindingUri = reader.getAttributeValue(null, "uri");

-        String name = reader.getAttributeValue(null, "name");

-        String ntm = reader.getAttributeValue(null, "ntm");

-        String notificationType = reader.getAttributeValue(null, "notificationType");

-

-        NotificationBinding binding = bindingFactory.createNotificationBinding();

-        if (name != null) {

-            binding.setName(name);

-        }

-        if (bindingUri != null) {

-            binding.setURI(bindingUri);

-        }

-        if (ntm != null) {

-            binding.setNtmAddress(ntm);

-        }

-        if (notificationType != null) {

-            try {

-                binding.setNotificationType(new URI(notificationType));

-            } catch(URISyntaxException e) {

-                throw new ContributionReadException(e);

-            }

-        }

-        return binding;

-    }

-

-    public void write(NotificationBinding notificationBinding, XMLStreamWriter writer)

-            throws ContributionWriteException, XMLStreamException {

-        

-        //FIXME Implement this method

-    }

-

-    public void resolve(NotificationBinding notificationBinding, ModelResolver resolver) throws ContributionResolveException {

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
deleted file mode 100644
index e5ea616fdb..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.binding.notification;

-

-import java.net.InetAddress;

-import java.net.URI;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.apache.tuscany.sca.binding.notification.encoding.AbstractEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReferenceEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerIDEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReferenceEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokersEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideResponseEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReferenceEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;

-import org.apache.tuscany.sca.binding.notification.encoding.EndConsumersEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.EndProducersEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddressEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumersEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NeighborsEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAckEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponseEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponseEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponseEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.ReferencePropertiesEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.RemoveBrokerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.RemovedBrokerEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnectionEnDeCoder;

-import org.apache.tuscany.sca.binding.notification.encoding.SubscribeEnDeCoder;

-import org.apache.tuscany.sca.host.http.ServletHost;

-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 runtime representation of the notification reference binding

- * 

- * @version $Rev$ $Date$

- */

-public class NotificationBindingProviderFactory implements BindingProviderFactory<NotificationBinding>,

-    NotificationBrokerManager {

-    private static final String DEFAULT_PORT = "8083";

-

-    private ServletHost servletHost;

-    private NotificationTypeManagerImpl notificationTypeManager;

-    private EncodingRegistry encodingRegistry;

-    private String httpUrl;

-    private Map<URI, NotificationReferenceBindingProvider> referenceBindingProviders;

-    private Map<URI, NotificationServiceBindingProvider> serviceBindingProviders;

-

-    private static NotificationBindingProviderFactory factoryInstance = null;

-

-    public NotificationBindingProviderFactory(ServletHost servletHost, EncodingRegistry encodingRegistry) {

-        this.servletHost = servletHost;

-        this.encodingRegistry = encodingRegistry;

-        this.referenceBindingProviders = new HashMap<URI, NotificationReferenceBindingProvider>();

-        this.serviceBindingProviders = new HashMap<URI, NotificationServiceBindingProvider>();

-

-        factoryInstance = this;

-    }

-

-    public Class<NotificationBinding> getModelType() {

-        return NotificationBinding.class;

-    }

-

-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,

-                                                                   RuntimeComponentReference reference,

-                                                                   NotificationBinding binding) {

-        init();

-        URI notificationType = binding.getNotificationType();

-        if (!validReferenceBinding(binding)) {

-            throw new RuntimeException("Binding not valid");

-        }

-        NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);

-        if (referenceBindingProvider == null) {

-            referenceBindingProvider =

-                new NotificationReferenceBindingProvider(binding, component, reference, servletHost,

-                                                         notificationTypeManager, encodingRegistry, httpUrl, this);

-            referenceBindingProviders.put(notificationType, referenceBindingProvider);

-        }

-        return referenceBindingProvider;

-    }

-

-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,

-                                                               RuntimeComponentService service,

-                                                               NotificationBinding binding) {

-        init();

-        URI notificationType = binding.getNotificationType();

-        if (!validServiceBinding(binding)) {

-            throw new RuntimeException("Binding not valid");

-        }

-        NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);

-        if (serviceBindingProvider == null) {

-            serviceBindingProvider =

-                new NotificationServiceBindingProvider(binding, component, service, servletHost,

-                                                       notificationTypeManager, encodingRegistry, httpUrl, this);

-            serviceBindingProviders.put(notificationType, serviceBindingProvider);

-        }

-        return serviceBindingProvider;

-    }

-

-    private boolean validServiceBinding(NotificationBinding binding) {

-        URI notificationType = binding.getNotificationType();

-        NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);

-        if (referenceBindingProvider != null) {

-            return validBinding(binding, referenceBindingProvider.getBinding());

-        }

-        return true;

-    }

-

-    private boolean validReferenceBinding(NotificationBinding binding) {

-        URI notificationType = binding.getNotificationType();

-        NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);

-        if (serviceBindingProvider != null) {

-            return validBinding(binding, serviceBindingProvider.getBinding());

-        }

-        return true;

-    }

-

-    private boolean validBinding(NotificationBinding binding1, NotificationBinding binding2) {

-        String binding1NtmAddress = binding1.getNtmAddress();

-        String binding2NtmAddress = binding2.getNtmAddress();

-        if (binding1NtmAddress == null && binding2NtmAddress == null) {

-            return true;

-        } else if (binding1NtmAddress == null || binding2NtmAddress == null) {

-            return false;

-        } else {

-            return binding1NtmAddress.equals(binding2NtmAddress);

-        }

-    }

-

-    /*

-     * These methods are intended to be called by the binding providers' start

-     * methods. By the time this happens, both referenceBindingProvider != null &&

-     * serviceBindingProvider != null, if they are ever going to be

-     */

-    public void serviceProviderStarted(URI notificationType,

-                                       NotificationServiceBindingProvider serviceBindingProvider,

-                                       URL remoteNtmUrl) {

-        NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);

-        if (referenceBindingProvider == null) {

-            serviceBindingProvider.deployConsumer();

-        } else if (referenceBindingProvider.isStarted()) {

-            String brokerID = BrokerID.generate();

-            deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);

-        }

-    }

-

-    public void referenceProviderStarted(URI notificationType,

-                                         NotificationReferenceBindingProvider referenceBindingProvider,

-                                         URL remoteNtmUrl) {

-        NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);

-        if (serviceBindingProvider == null) {

-            referenceBindingProvider.deployProducer();

-        } else if (serviceBindingProvider.isStarted()) {

-            String brokerID = BrokerID.generate();

-            deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);

-        }

-    }

-

-    private void deployBroker(URI notificationType,

-                              NotificationServiceBindingProvider serviceBindingProvider,

-                              NotificationReferenceBindingProvider referenceBindingProvider,

-                              String brokerID,

-                              URL remoteNtmUrl) {

-        URL consumerUrl = serviceBindingProvider.getURL();

-        URL producerUrl = referenceBindingProvider.getURL();

-        List<EndpointReference> consumerList = new ArrayList<EndpointReference>();

-        List<EndpointReference> producerList = new ArrayList<EndpointReference>();

-        boolean firstBroker =

-            notificationTypeManager.newBroker(notificationType,

-                                              consumerUrl,

-                                              producerUrl,

-                                              brokerID,

-                                              remoteNtmUrl,

-                                              consumerList,

-                                              producerList);

-        if (firstBroker) {

-            serviceBindingProvider.deployBroker(brokerID, null, producerList);

-            referenceBindingProvider.deployBroker(brokerID, null, consumerList);

-            if (!consumerList.isEmpty() || !producerList.isEmpty()) {

-                notificationTypeManager.newBrokerAck(remoteNtmUrl);

-            }

-        } else {

-            // returned lists contain broker consumers and producers and are the

-            // same length

-            int index = consumerList.size() - 1;

-            // establish connection with picked broker

-            EndpointReference brokerConsumerEPR = consumerList.get(index);

-            EndpointReference brokerProducerEPR = producerList.get(index);

-            serviceBindingProvider.deployBroker(brokerID, brokerProducerEPR, null);

-            referenceBindingProvider.deployBroker(brokerID, brokerConsumerEPR, null);

-        }

-    }

-

-    public void replaceConsumersBrokerConnection(URI notificationType, EndpointReference chosenBrokerProducerEpr) {

-        NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);

-        if (serviceBindingProvider == null) {

-            throw new RuntimeException("Missing service binding provider for [" + notificationType + "]");

-        }

-        serviceBindingProvider.replaceBrokerConnection(chosenBrokerProducerEpr);

-    }

-

-    public static void removeBroker(URI notificationType) {

-        if (factoryInstance == null) {

-            throw new RuntimeException("Missing factory instance");

-        }

-        NotificationReferenceBindingProvider referenceBindingProvider =

-            factoryInstance.referenceBindingProviders.get(notificationType);

-        NotificationServiceBindingProvider serviceBindingProvider =

-            factoryInstance.serviceBindingProviders.get(notificationType);

-        if (referenceBindingProvider == null || serviceBindingProvider == null) {

-            throw new RuntimeException("Not a broker for [" + notificationType + "]");

-        }

-        referenceBindingProvider.undeployBroker(serviceBindingProvider.getURL());

-    }

-

-    private String getBaseURI() {

-        if (httpUrl == null) {

-            // Allow priviledged access to read system property. Requires PropertyPermision in security policy.

-            String httpPort = AccessController.doPrivileged(new PrivilegedAction<String>() {

-                public String run() {

-                    return System.getProperty("notification.httpPort");

-                }

-            });

-            

-            if (httpPort == null) {

-                httpPort = DEFAULT_PORT;

-            }

-            String localHost = null;

-            try {

-                localHost = InetAddress.getLocalHost().getCanonicalHostName();

-            } catch (Exception e) {

-                e.printStackTrace();

-                localHost = "localhost";

-            }

-            httpUrl = "http://" + localHost + ((httpPort != null) ? (":" + httpPort) : "");

-        }

-        return httpUrl;

-    }

-

-    @SuppressWarnings("unchecked")

-    public void init() {

-        if (notificationTypeManager == null) {

-            AbstractEnDeCoder subscribeEnDeCoder = new SubscribeEnDeCoder(encodingRegistry);

-            subscribeEnDeCoder.start();

-            AbstractEnDeCoder consumerReferenceEnDeCoder = new ConsumerReferenceEnDeCoder(encodingRegistry);

-            consumerReferenceEnDeCoder.start();

-            AbstractEnDeCoder endpointAddressEnDeCoder = new EndpointAddressEnDeCoder(encodingRegistry);

-            endpointAddressEnDeCoder.start();

-            AbstractEnDeCoder newConsumerEnDeCoder = new NewConsumerEnDeCoder(encodingRegistry);

-            newConsumerEnDeCoder.start();

-            AbstractEnDeCoder newProducerEnDeCoder = new NewProducerEnDeCoder(encodingRegistry);

-            newProducerEnDeCoder.start();

-            AbstractEnDeCoder newConsumerResponseEnDeCoder = new NewConsumerResponseEnDeCoder(encodingRegistry);

-            newConsumerResponseEnDeCoder.start();

-            AbstractEnDeCoder newProducerResponseEnDeCoder = new NewProducerResponseEnDeCoder(encodingRegistry);

-            newProducerResponseEnDeCoder.start();

-            AbstractEnDeCoder newBrokerEnDeCoder = new NewBrokerEnDeCoder(encodingRegistry);

-            newBrokerEnDeCoder.start();

-            AbstractEnDeCoder brokerConsumerReferenceEnDeCoder = new BrokerConsumerReferenceEnDeCoder(encodingRegistry);

-            brokerConsumerReferenceEnDeCoder.start();

-            AbstractEnDeCoder brokerProducerReferenceEnDeCoder = new BrokerProducerReferenceEnDeCoder(encodingRegistry);

-            brokerProducerReferenceEnDeCoder.start();

-            AbstractEnDeCoder newBrokerResponseEnDeCoder = new NewBrokerResponseEnDeCoder(encodingRegistry);

-            newBrokerResponseEnDeCoder.start();

-            AbstractEnDeCoder brokersEnDeCoder = new BrokersEnDeCoder(encodingRegistry);

-            brokersEnDeCoder.start();

-            AbstractEnDeCoder brokerEnDeCoder = new BrokerEnDeCoder(encodingRegistry);

-            brokerEnDeCoder.start();

-            AbstractEnDeCoder endConsumersEnDeCoder = new EndConsumersEnDeCoder(encodingRegistry);

-            endConsumersEnDeCoder.start();

-            AbstractEnDeCoder endProducersEnDeCoder = new EndProducersEnDeCoder(encodingRegistry);

-            endProducersEnDeCoder.start();

-            AbstractEnDeCoder endpointReferenceEnDeCoder = new EndpointReferenceEnDeCoder(encodingRegistry);

-            endpointReferenceEnDeCoder.start();

-            AbstractEnDeCoder referencePropertiesEnDeCoder = new ReferencePropertiesEnDeCoder(encodingRegistry);

-            referencePropertiesEnDeCoder.start();

-            AbstractEnDeCoder brokerIDEnDeCoder = new BrokerIDEnDeCoder(encodingRegistry);

-            brokerIDEnDeCoder.start();

-            AbstractEnDeCoder connectionOverrideEnDeCoder = new ConnectionOverrideEnDeCoder(encodingRegistry);

-            connectionOverrideEnDeCoder.start();

-            AbstractEnDeCoder connectionOverrideResponseEnDeCoder =

-                new ConnectionOverrideResponseEnDeCoder(encodingRegistry);

-            connectionOverrideResponseEnDeCoder.start();

-            AbstractEnDeCoder newBrokerAckEnDeCoder = new NewBrokerAckEnDeCoder(encodingRegistry);

-            newBrokerAckEnDeCoder.start();

-            AbstractEnDeCoder neighborBrokerConsumersEnDeCoder = new NeighborBrokerConsumersEnDeCoder(encodingRegistry);

-            neighborBrokerConsumersEnDeCoder.start();

-            AbstractEnDeCoder removeBrokerEnDeCoder = new RemoveBrokerEnDeCoder(encodingRegistry);

-            removeBrokerEnDeCoder.start();

-            AbstractEnDeCoder removedBrokerEnDeCoder = new RemovedBrokerEnDeCoder(encodingRegistry);

-            removedBrokerEnDeCoder.start();

-            AbstractEnDeCoder neighborsEnDeCoder = new NeighborsEnDeCoder(encodingRegistry);

-            neighborsEnDeCoder.start();

-            AbstractEnDeCoder replaceBrokerConnectionEnDeCoder = new ReplaceBrokerConnectionEnDeCoder(encodingRegistry);

-            replaceBrokerConnectionEnDeCoder.start();

-

-            notificationTypeManager = new NotificationTypeManagerImpl();

-            notificationTypeManager.setServletHost(servletHost);

-            notificationTypeManager.setEncodingRegistry(encodingRegistry);

-            notificationTypeManager.init();

-

-            getBaseURI();

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
deleted file mode 100644
index 8a6d57e825..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.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.notification;

-

-import java.net.URI;

-import java.net.URL;

-

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface NotificationBrokerManager {

-

-    void serviceProviderStarted(URI notificationType,

-                                NotificationServiceBindingProvider serviceBindingProvider,

-                                URL remoteNtmUrl);

-    

-    void referenceProviderStarted(URI notificationType,

-                                  NotificationReferenceBindingProvider referenceBindingProvider,

-                                  URL remoteNtmUrl);

-    

-    void replaceConsumersBrokerConnection(URI notificationType, EndpointReference chosenBrokerProducerEpr);

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
deleted file mode 100644
index 8980fa26ff..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.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.binding.notification;

-

-import java.io.OutputStream;

-import java.util.HashMap;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.tuscany.sca.binding.notification.NotificationReferenceBindingProvider.SubscriberInfo;

-import org.apache.tuscany.sca.binding.notification.encoding.Constants;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.IOUtilsException;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.Writeable;

-import org.apache.tuscany.sca.implementation.notification.ImmutableMessage;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Invoker;

-import org.apache.tuscany.sca.invocation.Message;

-

-/**

- * Turns invoke into remote message fan-out

- *

- * @version $Rev$ $Date$

- */

-public class NotificationReferenceBindingInvoker implements Invoker {

-

-    private static final Message RESPONSE = new ImmutableMessage();

-    private Operation operation;

-    

-    private NotificationReferenceBindingProvider notificationReferenceBindingProvider;

-

-    public NotificationReferenceBindingInvoker(Operation operation,

-                                               NotificationReferenceBindingProvider notificationReferenceBindingProvider) {

-        this.operation = operation;

-        this.notificationReferenceBindingProvider = notificationReferenceBindingProvider;

-    }

-    

-    public Message invoke(Message msg) {

-        Object payload = msg.getBody();

-        if (payload == null) {

-            throw new RuntimeException("Message body is null");

-        }

-        Writeable writeable = null;

-        String incomingBrokerID = null;

-        if (payload.getClass().isArray()) {

-            Object[] bodyArray = (Object[])payload;

-            if (bodyArray.length == 3) {

-                writeable = getWriteableFromByteArray((byte[])bodyArray[1]);

-                incomingBrokerID = (String)bodyArray[2];

-            } else if (bodyArray.length == 1) {

-                writeable = getWriteableFromPayload(bodyArray[0]);

-            } else {

-                throw new RuntimeException("Invalid body array size");

-            }

-        } else {

-            writeable = getWriteableFromPayload(payload);

-        }

-

-        try {

-            for (SubscriberInfo subscriber : notificationReferenceBindingProvider.getSubscribers()) {

-                // check for each subscriber's broker id and skip if equal

-                if (incomingBrokerID != null && subscriber.brokerID != null && incomingBrokerID.equals(subscriber.brokerID)) {

-                    continue;

-                }

-                HashMap<String, String> headers = new HashMap<String, String>();

-                headers.put(IOUtils.Notification_Operation, operation.getName());

-                String brokerID = notificationReferenceBindingProvider.getBrokerID();

-                if (brokerID != null) {

-                    headers.put(Constants.Broker_ID, brokerID);

-                }

-                IOUtils.sendHttpRequest(subscriber.address, headers, writeable, null);

-            }

-        } catch(Exception e) {

-            e.printStackTrace();

-            throw new RuntimeException("Sender caught exception", e);

-        }

-        return RESPONSE;

-    }

-    

-    private Writeable getWriteableFromPayload(Object payload) throws RuntimeException {

-        if (!(payload instanceof OMElement)) {

-            throw new RuntimeException("payload not OMElement");

-        }

-        final OMElement element = (OMElement)payload;

-        Writeable writeable = new Writeable() {

-            public void write(OutputStream os) throws IOUtilsException {

-                try {

-                    element.serialize(os);

-                    os.flush();

-                } catch(Exception e) {

-                    throw new IOUtilsException(e);

-                }

-            }

-        };

-        return writeable;

-    }

-

-    private Writeable getWriteableFromByteArray(final byte[] payload) {

-        Writeable writeable = new Writeable() {

-            public void write(OutputStream os) throws IOUtilsException {

-                try {

-                    os.write(payload);

-                    os.flush();

-                } catch(Exception e) {

-                    throw new IOUtilsException(e);

-                }

-            }

-        };

-        return writeable;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
deleted file mode 100644
index c1a8162836..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.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.notification;

-

-import java.net.URI;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import javax.servlet.ServletInputStream;

-import javax.servlet.ServletOutputStream;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.tuscany.sca.binding.notification.encoding.Broker;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;

-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverride;

-import org.apache.tuscany.sca.binding.notification.encoding.Constants;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingObject;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingUtils;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnection;

-import org.apache.tuscany.sca.binding.notification.encoding.Subscribe;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet;

-import org.apache.tuscany.sca.binding.notification.util.URIUtil;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet.NotificationServletStreamHandler;

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

-

-/**

- * The runtime representation of the notification reference binding

- *

- * @version $Rev$ $Date$

- */

-public class NotificationReferenceBindingProvider

-        implements ReferenceBindingProvider, NotificationServletStreamHandler {

-

-    private static final String producerPathBase = "/producer";

-    private NotificationReferenceBindingInvoker invoker;

-    private RuntimeComponentReference reference;

-    private NotificationBinding notificationBinding;

-    private ServletHost servletHost;

-    private NotificationTypeManager ntm;

-    private EncodingRegistry encodingRegistry;

-    private URI notificationType;

-    private URL myUrl;

-    private URL remoteNtmUrl;

-    private boolean started;

-    private NotificationBrokerManager brokerManager;

-

-    private List<SubscriberInfo> subscribers;

-    private String brokerID;

-    

-    public NotificationReferenceBindingProvider(NotificationBinding notificationBinding,

-                                                RuntimeComponent component,

-                                                RuntimeComponentReference reference,

-                                                ServletHost servletHost,

-                                                NotificationTypeManager ntm,

-                                                EncodingRegistry encodingRegistry,

-                                                String httpUrl,

-                                                NotificationBrokerManager brokerManager) {

-        this.invoker = null;

-        this.notificationBinding = notificationBinding;

-        this.reference = reference;

-        this.servletHost = servletHost;

-        this.ntm = ntm;

-        this.encodingRegistry = encodingRegistry;

-        this.notificationType = notificationBinding.getNotificationType();

-        String ntmAddress = notificationBinding.getNtmAddress();

-        String notificationTypePath = URIUtil.getPath(notificationType);

-        try {

-            this.myUrl = new URL(httpUrl + producerPathBase + notificationTypePath);

-            this.remoteNtmUrl = null;

-            if (ntmAddress != null && notificationType != null) {

-                remoteNtmUrl = new URL(ntmAddress + notificationTypePath);

-            }

-        } catch(Exception e) {

-            throw new RuntimeException(e);

-        }

-        this.started = false;

-        this.brokerManager = brokerManager;

-        

-        URI uri = URI.create(component.getURI() + "/" + notificationBinding.getName());

-        notificationBinding.setURI(uri.toString());

-        Interface interfaze = reference.getInterfaceContract().getInterface();

-        interfaze.resetDataBinding(OMElement.class.getName());

-        for (Operation operation : interfaze.getOperations()) {

-            operation.setNonBlocking(false);

-        }

-

-        this.subscribers = new ArrayList<SubscriberInfo>();

-        this.brokerID = null;

-    }

-    

-    public NotificationBinding getBinding() {

-        return notificationBinding;

-    }

-    

-    public URL getURL() {

-        return myUrl;

-    }

-

-    public boolean isStarted() {

-        return started;

-    }

-    

-    public void setBrokerID(String brokerID) {

-        this.brokerID = brokerID;

-    }

-    

-    public String getBrokerID() {

-        return brokerID;

-    }

-

-    public Invoker createInvoker(Operation operation) {

-        if (invoker == null) {

-            invoker = new NotificationReferenceBindingInvoker(operation, this);

-        }

-        return invoker;

-    }

-

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return reference.getInterfaceContract();

-    }

-

-    public void start() {

-        if (started) {

-            return;

-        }

-

-        brokerManager.referenceProviderStarted(notificationType, this, remoteNtmUrl);

-        started = true;

-    }

-

-    public void stop() {

-    }

-    

-    public void deployProducer() {

-        List<URL> consumerList = new ArrayList<URL>();

-        String sequenceType;

-        try {

-            sequenceType = ntm.newProducer(notificationType, myUrl, remoteNtmUrl, consumerList);

-        } catch(Exception e) {

-            throw new RuntimeException(e);

-        }

-        if (Constants.EndConsumers.equals(sequenceType)) {

-            for (URL consumerUrl : consumerList) {

-                addSubscriberUrl(consumerUrl);

-            }

-        } else if (Constants.BrokerConsumers.equals(sequenceType)) {

-            // Pick a broker consumer, for now the first one

-            URL consumerUrl = consumerList.get(0);

-            addSubscriberUrl(consumerUrl);

-        }

-

-        servletHost.addServletMapping(myUrl.toString(), new NotificationServlet(this));

-    }

-    

-    public void deployBroker(String brokerID, EndpointReference brokerConsumerEPR, List<EndpointReference> consumerList) {

-        if (brokerConsumerEPR != null) {

-            addSubscriber(brokerConsumerEPR);            

-        }

-        if (consumerList != null && !consumerList.isEmpty()) {

-            for (EndpointReference consumerEPR : consumerList) {

-                addSubscriber(consumerEPR);

-            }

-        }

-        setBrokerID(brokerID);

-        servletHost.addServletMapping(myUrl.toString(), new NotificationServlet(this));

-    }

-    

-    public void undeployBroker(URL brokerConsumerUrl) {

-        EndpointReference brokerConsumerEpr = EncodingUtils.createEndpointReference(brokerConsumerUrl, getBrokerID());

-        ntm.removeBroker(brokerConsumerEpr, getNeighborBrokerConsumerEprs(), remoteNtmUrl);

-        removeBrokerSubscribers();

-    }

-    

-    public void handle(Map<String, String> headers, ServletInputStream istream, int contentLength, ServletOutputStream ostream) {

-

-        try {

-            EncodingObject eo = EncodingUtils.decodeFromStream(encodingRegistry, istream);

-            if (eo instanceof Subscribe) {

-                Subscribe sub = (Subscribe)eo;

-                addSubscriber(sub.getConsumerReference().getReference());

-            } else if (eo instanceof ConnectionOverride) {

-                ConnectionOverride co = (ConnectionOverride)eo;

-                replaceSubscribers(co.getBrokerConsumerReference().getReference());

-            } else if (eo instanceof ReplaceBrokerConnection) {

-                ReplaceBrokerConnection rbc = (ReplaceBrokerConnection)eo;

-                URL removedBrokerConsumerEpr = rbc.getRemovedBroker().getReference().getEndpointAddress().getAddress();

-                if (rbc.getNeighbors() != null) {

-                    int choice = rbc.getNeighbors().getBrokerSequence().size() - 1;

-                    Broker chosenBroker = rbc.getNeighbors().getBrokerSequence().get(choice);

-                    replaceBrokerSubscriber(removedBrokerConsumerEpr,

-                                                    chosenBroker.getBrokerConsumerReference().getReference());

-                    brokerManager.replaceConsumersBrokerConnection(notificationType,

-                                                                   chosenBroker.getBrokerProducerReference().getReference());

-                } else {

-                    replaceBrokerSubscriber(removedBrokerConsumerEpr, null);

-                }

-            } else {

-                throw new RuntimeException("Unknown encoding object");

-            }

-        } catch(Throwable e) {

-            e.printStackTrace();

-            throw new RuntimeException(e);

-        }

-    }

-

-    public synchronized List<SubscriberInfo> getSubscribers() {

-        return subscribers;

-    }

-    

-    private void addSubscriberUrl(URL subscriberUrl) {

-        addSubscriber(subscriberUrl, null);

-    }

-    

-    private void addSubscriber(EndpointReference subscriberEPR) {

-        BrokerID brokerID = null;

-        if (subscriberEPR.getReferenceProperties() != null) {

-            brokerID = subscriberEPR.getReferenceProperties().getProperty(BrokerID.class);

-        }

-        addSubscriber(subscriberEPR.getEndpointAddress().getAddress(), (brokerID != null ? brokerID.getID() : null));

-    }

-

-    private void addSubscriber(URL address, String brokerID) {

-        synchronized(this) {

-            SubscriberInfo si = new SubscriberInfo(address);

-            si.brokerID = brokerID;

-            if (subscribers == null) {

-                subscribers = new ArrayList<SubscriberInfo>();

-            }

-            subscribers.add(si);

-        }

-    }

-    

-    private void replaceSubscribers(EndpointReference brokerConsumerEPR) {

-        synchronized(this) {

-            subscribers = null;

-        }

-        addSubscriber(brokerConsumerEPR);

-    }

-    

-    private void replaceBrokerSubscriber(URL removedBrokerConsumerUrl, EndpointReference chosenBrokerConsumerEpr) {

-        synchronized(this) {

-            if (subscribers == null) {

-                throw new RuntimeException("No subscribers");

-            }

-            SubscriberInfo siToRemove = null;

-            for (SubscriberInfo si : subscribers) {

-                if (si.address.equals(removedBrokerConsumerUrl)) {

-                    siToRemove = si;

-                }

-            }

-            if (siToRemove == null) {

-                throw new RuntimeException("Can't find info for broker to remove [" + removedBrokerConsumerUrl + "]");

-            }

-            if (!subscribers.remove(siToRemove)) {

-                throw new RuntimeException("Can't remove info for [" + siToRemove.address + "]");

-            }

-        }

-        if (chosenBrokerConsumerEpr != null) {

-            addSubscriber(chosenBrokerConsumerEpr);

-        }

-    }

-    

-    private List<EndpointReference> getNeighborBrokerConsumerEprs() {

-        synchronized(this) {

-            if (subscribers == null) {

-                throw new RuntimeException("No subscribers");

-            }

-            List<EndpointReference> neighborBrokerConsumerEprs = new ArrayList<EndpointReference>();

-            for(SubscriberInfo si : subscribers) {

-                if (si.brokerID != null) {

-                    neighborBrokerConsumerEprs.add(EncodingUtils.createEndpointReference(si.address, si.brokerID));

-                }

-            }

-            

-            return neighborBrokerConsumerEprs;

-        }

-    }

-    

-    private void removeBrokerSubscribers() {

-        synchronized(this) {

-            if (subscribers == null) {

-                throw new RuntimeException("No subscribers");

-            }

-            List<SubscriberInfo> sisToRemove = new ArrayList<SubscriberInfo>();

-            for (SubscriberInfo si : subscribers) {

-                if (si.brokerID != null) {

-                    sisToRemove.add(si);

-                }

-            }

-            for(SubscriberInfo si : sisToRemove) {

-                if (!subscribers.remove(si)) {

-                    throw new RuntimeException("Can't remove broker subscriber [" + si.address + "]");

-                }

-            }

-        }

-    }

-    

-    class SubscriberInfo {

-        public URL address;

-        public String brokerID;

-        

-        public SubscriberInfo(URL address) {

-            this.address = address;

-            this.brokerID = null;

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
deleted file mode 100644
index 4511fb454b..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.binding.notification;

-

-import java.io.ByteArrayInputStream;

-import java.io.IOException;

-import java.io.OutputStream;

-import java.net.URI;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import javax.servlet.ServletInputStream;

-import javax.servlet.ServletOutputStream;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.impl.builder.StAXOMBuilder;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReference;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;

-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverride;

-import org.apache.tuscany.sca.binding.notification.encoding.Constants;

-import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReference;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingUtils;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddress;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-import org.apache.tuscany.sca.binding.notification.encoding.ReferenceProperties;

-import org.apache.tuscany.sca.binding.notification.encoding.Subscribe;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet;

-import org.apache.tuscany.sca.binding.notification.util.URIUtil;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.IOUtilsException;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.Writeable;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet.NotificationServletStreamHandler;

-import org.apache.tuscany.sca.core.invocation.MessageImpl;

-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.Operation;

-import org.apache.tuscany.sca.invocation.InvocationChain;

-import org.apache.tuscany.sca.invocation.Message;

-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;

-

-/**

- * The runtime representation of the local service binding

- *

- * @version $Rev$ $Date$

- */

-public class NotificationServiceBindingProvider

-        implements ServiceBindingProvider, NotificationServletStreamHandler {

-    

-    private RuntimeWire wire;

-    private NotificationBinding notificationBinding;

-    private RuntimeComponentService service;

-    private ServletHost servletHost;

-    private NotificationTypeManager ntm;

-    private EncodingRegistry encodingRegistry;

-    private URI notificationType;

-    private URL myUrl;

-    private URL remoteNtmUrl;

-    private static final String consumerPathBase = "/consumer";

-    private boolean started;

-    private NotificationBrokerManager brokerManager;

-    private String brokerID;

-    

-    public NotificationServiceBindingProvider(NotificationBinding notificationBinding,

-                                              RuntimeComponent component,

-                                              RuntimeComponentService service,

-                                              ServletHost servletHost,

-                                              NotificationTypeManager ntm,

-                                              EncodingRegistry encodingRegistry,

-                                              String httpUrl,

-                                              NotificationBrokerManager brokerManager) {

-        this.notificationBinding = notificationBinding;

-        this.service = service;

-        this.servletHost = servletHost;

-        this.ntm = ntm;

-        this.encodingRegistry = encodingRegistry;

-        this.notificationType = notificationBinding.getNotificationType();

-        String ntmAddress = notificationBinding.getNtmAddress();

-        String notificationTypePath = URIUtil.getPath(notificationType);

-        try {

-            this.myUrl = new URL(httpUrl + consumerPathBase + notificationTypePath);

-            remoteNtmUrl = null;

-            if (ntmAddress != null && notificationType != null) {

-                remoteNtmUrl = new URL(ntmAddress + notificationTypePath);

-            }

-        } catch(Exception e) {

-            throw new RuntimeException(e);

-        }

-        this.started = false;

-        this.brokerManager = brokerManager;

-        this.brokerID = null;

-

-        URI uri = URI.create(component.getURI() + "/" + notificationBinding.getName());

-        notificationBinding.setURI(uri.toString());

-        Interface interfaze = service.getInterfaceContract().getInterface();

-        interfaze.resetDataBinding(OMElement.class.getName());

-        for (Operation operation : interfaze.getOperations()) {

-            operation.setNonBlocking(false);

-        }

-    }

-    

-    public NotificationBinding getBinding() {

-        return notificationBinding;

-    }

-    

-    public boolean isStarted() {

-        return started;

-    }

-    

-    public URL getURL() {

-        return myUrl;

-    }

-

-    public InterfaceContract getBindingInterfaceContract() {

-        return service.getInterfaceContract();

-    }

-    

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-    public void start() {

-        if (started) {

-            return;

-        }

-        

-        RuntimeComponentService componentService = (RuntimeComponentService) service;

-        wire = componentService.getRuntimeWire(notificationBinding);

-        

-        for (InvocationChain ch : wire.getInvocationChains()) {

-            ch.setAllowsPassByReference(true);

-        }

-        

-        brokerManager.serviceProviderStarted(notificationType, this, remoteNtmUrl);

-        started = true;

-    }

-

-    public void stop() {

-    }

-    

-    public void deployConsumer() {

-        WriteableSubscribe ws = new WriteableSubscribe(myUrl, null);

-        List<URL> producerList = new ArrayList<URL>();

-        String sequenceType = ntm.newConsumer(notificationType, myUrl, remoteNtmUrl, producerList);

-        if (Constants.EndProducers.equals(sequenceType)) {

-            for (URL producerUrl : producerList) {

-                subscribeWithProducer(producerUrl, null, ws);

-            }

-        } else if (Constants.BrokerProducers.equals(sequenceType)) {

-            // Pick a broker producer, for now the first one

-            URL producerUrl = producerList.get(0);

-            subscribeWithProducer(producerUrl, null, ws);

-        }

-

-        servletHost.addServletMapping(myUrl.toString(), new NotificationServlet(this));

-    }

-    

-    protected void subscribeWithProducer(URL producerUrl, String brokerID, WriteableSubscribe ws) {

-        if (ws == null) {

-            ws = new WriteableSubscribe(myUrl, brokerID);

-        }

-        try {

-            IOUtils.sendHttpRequest(producerUrl, Constants.SUBSCRIBE_OP, ws, null);

-        } catch(Exception e) {

-            throw new RuntimeException(e);

-        }

-    }

-    

-    public void deployBroker(String brokerID, EndpointReference brokerProducerEPR, List<EndpointReference> producerList) {

-        if (brokerProducerEPR != null) {

-            subscribeWithProducer(brokerProducerEPR.getEndpointAddress().getAddress(), brokerID, null);

-        }

-        this.brokerID = brokerID;

-        if (producerList != null && !producerList.isEmpty()) {

-            WriteableConnectionOverride wco = new WriteableConnectionOverride(myUrl, brokerID);

-            for (EndpointReference producerEPR : producerList) {

-                try {

-                    IOUtils.sendHttpRequest(producerEPR.getEndpointAddress().getAddress(), Constants.CONNECTION_OVERRIDE_OP, wco, null);

-                } catch(Exception e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-        servletHost.addServletMapping(myUrl.toString(), new NotificationServlet(this));

-    }

-    

-    public void replaceBrokerConnection(EndpointReference chosenBrokerProducerEpr) {

-        if (brokerID == null) {

-            throw new RuntimeException("Missing broker id");

-        }

-        URL producerUrl = chosenBrokerProducerEpr.getEndpointAddress().getAddress();

-        subscribeWithProducer(producerUrl, brokerID, null);

-    }

-

-    public void handle(Map<String, String> headers, ServletInputStream istream, int contentLength, ServletOutputStream ostream) {

-        String opHeader = headers.get(IOUtils.Notification_Operation);

-        String incomingBrokerID = headers.get(Constants.Broker_ID);

-        if (opHeader == null) {

-            throw new RuntimeException("Missing operation header");

-        }

-        if (wire == null) {

-            throw new RuntimeException("Missing wire");

-        }

-        InvocationChain chain = null;

-        for (InvocationChain ch : wire.getInvocationChains()) {

-            // We may want to use more than just the op name

-            if(ch.getTargetOperation().getName().equals(opHeader)) {

-                chain = ch;

-                break;

-            }

-        }

-        if (chain == null) {

-            throw new RuntimeException("Can't find invocation chain match for [" + opHeader + "]");

-        }

-        byte[] payload = null;

-        try {

-            payload = IOUtils.readFully(istream, contentLength);

-        } catch(IOException e) {

-            throw new RuntimeException(e);

-        }

-        Object[] args = getArgsFromByteArray(payload, incomingBrokerID);

-        

-        invoke(chain, args);

-        

-        // Doing nothing to ostream is equivalent to returning null

-    }

-    

-    private Object[] getArgsFromByteArray(byte[] payload, String incomingBrokerID) {

-        try {

-            StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(payload));

-            OMElement element = builder.getDocumentElement();

-            return new Object[] { element };

-        } catch(Exception e) {

-            throw new RuntimeException(e);

-        }

-    }

-    

-    protected void invoke(InvocationChain chain, Object[] args) {

-        Message msg = new MessageImpl();

-        msg.setBody(args);

-        chain.getHeadInvoker().invoke(msg);

-    }

-    

-    class WriteableSubscribe implements Writeable {

-        

-        private Subscribe sub;

-        

-        public WriteableSubscribe(URL url, String brokerID) {

-            EndpointAddress epa = new EndpointAddress();

-            epa.setAddress(url);

-            EndpointReference epr = new EndpointReference();

-            epr.setEndpointAddress(epa);

-            if (brokerID != null) {

-                BrokerID cbi = new BrokerID();

-                cbi.setID(brokerID);

-                ReferenceProperties crp = new ReferenceProperties();

-                crp.addProperty(cbi);

-                epr.setReferenceProperties(crp);

-            }

-            ConsumerReference cr = new ConsumerReference();

-            cr.setReference(epr);

-            sub = new Subscribe();

-            sub.setConsumerReference(cr);

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, sub, os);

-        }

-    }

-    

-    class WriteableConnectionOverride implements Writeable {

-        

-        private ConnectionOverride connectionOverride;

-        

-        public WriteableConnectionOverride(URL brokerConsumerUrl, String brokerID) {

-            EndpointAddress epa = new EndpointAddress();

-            epa.setAddress(brokerConsumerUrl);

-            EndpointReference brokerConsumerEPR = new EndpointReference();

-            brokerConsumerEPR.setEndpointAddress(epa);

-            BrokerID cbi = new BrokerID();

-            cbi.setID(brokerID);

-            ReferenceProperties crp = new ReferenceProperties();

-            crp.addProperty(cbi);

-            brokerConsumerEPR.setReferenceProperties(crp);

-            BrokerConsumerReference brokerConsumerReference = new BrokerConsumerReference();

-            brokerConsumerReference.setReference(brokerConsumerEPR);

-            connectionOverride = new ConnectionOverride();

-            connectionOverride.setBrokerConsumerReference(brokerConsumerReference);

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, connectionOverride, os);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
deleted file mode 100644
index 101d05f9cb..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.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.notification;

-

-import java.net.URI;

-import java.net.URL;

-import java.util.List;

-

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface NotificationTypeManager {

-

-    String newConsumer(URI notificationType, URL consumerUrl, URL remoteNtmUrl, List<URL> producerList);

-    String newProducer(URI notificationType, URL producerUrl, URL remoteNtmUrl, List<URL> consumerList);

-    boolean newBroker(URI notificationType,

-                      URL consumerUrl,

-                      URL producerUrl,

-                      String brokerID,

-                      URL remoteNtmUrl,

-                      List<EndpointReference> consumerList,

-                      List<EndpointReference> producerList);

-    void newBrokerAck(URL remoteNtmUrl);

-    void removeBroker(EndpointReference brokerConsumerEpr, List<EndpointReference> neighborBrokerConsumerEprs, URL remoteNtmUrl);

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
deleted file mode 100644
index 527cfbd667..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.binding.notification;

-

-import java.io.InputStream;

-import java.io.OutputStream;

-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 javax.servlet.ServletInputStream;

-import javax.servlet.ServletOutputStream;

-

-import org.apache.tuscany.sca.binding.notification.encoding.Broker;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReference;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;

-import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReference;

-import org.apache.tuscany.sca.binding.notification.encoding.Brokers;

-import org.apache.tuscany.sca.binding.notification.encoding.Constants;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingException;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingObject;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;

-import org.apache.tuscany.sca.binding.notification.encoding.EncodingUtils;

-import org.apache.tuscany.sca.binding.notification.encoding.EndConsumers;

-import org.apache.tuscany.sca.binding.notification.encoding.EndProducers;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddress;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;

-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceWrapper;

-import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumers;

-import org.apache.tuscany.sca.binding.notification.encoding.Neighbors;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBroker;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAck;

-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponse;

-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumer;

-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponse;

-import org.apache.tuscany.sca.binding.notification.encoding.NewProducer;

-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponse;

-import org.apache.tuscany.sca.binding.notification.encoding.RemoveBroker;

-import org.apache.tuscany.sca.binding.notification.encoding.RemovedBroker;

-import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnection;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet;

-import org.apache.tuscany.sca.binding.notification.util.URIUtil;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.IOUtilsException;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.ReadableContinuation;

-import org.apache.tuscany.sca.binding.notification.util.IOUtils.Writeable;

-import org.apache.tuscany.sca.binding.notification.util.NotificationServlet.NotificationServletStreamHandler;

-import org.apache.tuscany.sca.host.http.ServletHost;

-

-/**

- * A notification type manager serves as a registry of producers and consumers, or brokers, for

- * any notification type. This class implements an interface that allows a reference provider

- * (a producer), a service provider (a consumer), or both (a broker, via the provider factory),

- * to access locally the ntm for its notification type, regardless of whether the ntm resides

- * locally or remotely.

- * At a given host there is only one reference provider and/or one service provider for any given

- * notification type. So, if the ntm for a notification type resides locally, then it is invoked

- * exclusively by either a reference provider (newProducer), a service provider (newConsumer), or

- * a provider factory (newBroker). And since these invocations occur when the providers are being

- * created then all three of consumerLists, producerLists and brokerLists must be null when these

- * invocations occur.

- * 

- * @version $Rev$ $Date$

- */

-public class NotificationTypeManagerImpl implements NotificationTypeManager {

-

-    private static final String ntmPathBase = "/ntm";

-

-    private ServletHost servletHost;

-    private EncodingRegistry encodingRegistry;

-    private Map<URI, NotificationTypeManagerHandler> ntmHandlers;

-    

-    public NotificationTypeManagerImpl() {

-    }

-

-    public void setServletHost(ServletHost servletHost) {

-        this.servletHost = servletHost;

-    }

-

-    public void setEncodingRegistry(EncodingRegistry encodingRegistry) {

-        this.encodingRegistry = encodingRegistry;

-    }

-

-    public void init() {

-        ntmHandlers = new HashMap<URI, NotificationTypeManagerHandler>();

-    }

-    

-    public String newConsumer(URI notificationType, URL consumerUrl, URL remoteNtmUrl, List<URL> producerListResult) {

-        if (ntmUrlIsRemote(consumerUrl, remoteNtmUrl)) {

-            try {

-                WriteableEPW wEPW = new WriteableEPW(new NewConsumer(), consumerUrl);

-                InputStreamDecoder isd = new InputStreamDecoder();

-                NewConsumerResponse ncr =

-                    (NewConsumerResponse)IOUtils.sendHttpRequest(remoteNtmUrl, Constants.NEW_CONSUMER_OP, wEPW, isd);

-                String sequenceType = ncr.getSequenceType();

-                if (Constants.EndProducers.equals(sequenceType) || Constants.BrokerProducers.equals(sequenceType)) {

-                    for (EndpointReference epr : ncr.getReferenceSequence()) {

-                        producerListResult.add(epr.getEndpointAddress().getAddress());

-                    }

-                }

-                return sequenceType;

-            } catch(Exception e) {

-                e.printStackTrace();

-                throw new RuntimeException(e);

-            }

-        } else {

-            NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);

-            if (ntmHandler != null) {

-                throw new RuntimeException("Trying to deploy local consumer with existing local producer, consumer or broker");

-            }

-            

-            createNtmHandler(consumerUrl.getAuthority(), notificationType, consumerUrl, null, null);

-            

-            return Constants.NoProducers;

-        }

-    }

-    

-    private void createNtmHandler(String ntmUriAuthority, URI notificationType, URL consumerUrl, URL producerUrl, BrokerStruct broker) {

-        String ntmUri = "http://" + ntmUriAuthority + ntmPathBase + URIUtil.getPath(notificationType);

-        NotificationTypeManagerHandler ntmh = new NotificationTypeManagerHandler(notificationType, consumerUrl, producerUrl, broker);

-        ntmHandlers.put(notificationType, ntmh);

-        servletHost.addServletMapping(ntmUri, new NotificationServlet(ntmh));

-    }

-    

-    public String newProducer(URI notificationType, URL producerUrl, URL remoteNtmUrl, List<URL> consumerListResult) {

-        if (ntmUrlIsRemote(producerUrl, remoteNtmUrl)) {

-            try {

-                WriteableEPW wEPW = new WriteableEPW(new NewProducer(), producerUrl);

-                InputStreamDecoder isd = new InputStreamDecoder();

-                NewProducerResponse npr =

-                    (NewProducerResponse)IOUtils.sendHttpRequest(remoteNtmUrl, Constants.NEW_PRODUCER_OP, wEPW, isd);

-                String sequenceType = npr.getSequenceType();

-                if (Constants.EndConsumers.equals(sequenceType) || Constants.BrokerConsumers.equals(sequenceType)) {

-                    for (EndpointReference epr : npr.getReferenceSequence()) {

-                        consumerListResult.add(epr.getEndpointAddress().getAddress());

-                    }

-                }

-                return sequenceType;

-            } catch(Exception e) {

-                e.printStackTrace();

-                throw new RuntimeException(e);

-            }

-        } else {

-            NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);

-            if (ntmHandler != null) {

-                throw new RuntimeException("Trying to deploy local producer with existing local producer, consumer or broker");

-            }

-            

-            createNtmHandler(producerUrl.getAuthority(), notificationType, null, producerUrl, null);

-            

-            return Constants.NoConsumers;

-        }

-    }

-    

-    public boolean newBroker(URI notificationType,

-                             URL consumerUrl,

-                             URL producerUrl,

-                             String brokerID,

-                             URL remoteNtmUrl,

-                             List<EndpointReference> consumerListResult,

-                             List<EndpointReference> producerListResult) {

-        String ntmUriAuthority = producerUrl.getAuthority();

-        if (!ntmUriAuthority.equals(consumerUrl.getAuthority())) {

-            throw new RuntimeException("Producer url and consumer url do not match");

-        }

-        if (ntmUrlIsRemote(producerUrl, remoteNtmUrl)) {

-            try {

-                WriteableNewBroker wnb = new WriteableNewBroker(consumerUrl, producerUrl, brokerID);

-                InputStreamDecoder isd = new InputStreamDecoder();

-                NewBrokerResponse nbr =

-                    (NewBrokerResponse)IOUtils.sendHttpRequest(remoteNtmUrl, Constants.NEW_BROKER_OP, wnb, isd);

-                if (nbr.isFirstBroker()) {

-                    if (nbr.getEndConsumers().getSequenceType().equals(Constants.EndConsumers)) {

-                        for (EndpointReference epr : nbr.getEndConsumers().getReferenceSequence()) {

-                            consumerListResult.add(epr);

-                        }

-                    }

-                    if (nbr.getEndProducers().getSequenceType().equals(Constants.EndProducers)) {

-                        for (EndpointReference epr : nbr.getEndProducers().getReferenceSequence()) {

-                            producerListResult.add(epr);

-                        }

-                    }

-                } else {

-                    for (Broker broker : nbr.getBrokers().getBrokerSequence()) {

-                        consumerListResult.add(broker.getBrokerConsumerReference().getReference());

-                        producerListResult.add(broker.getBrokerProducerReference().getReference());

-                    }

-                }

-                return nbr.isFirstBroker();

-            } catch(Exception e) {

-                e.printStackTrace();

-                throw new RuntimeException(e);

-            }

-        } else {

-            NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);

-            if (ntmHandler != null) {

-                throw new RuntimeException("Trying to deploy local broker with existing local producer, consumer or broker");

-            }

-            

-            BrokerStruct broker = new BrokerStruct(consumerUrl, producerUrl, brokerID);

-            createNtmHandler(ntmUriAuthority, notificationType, null, null, broker);

-            

-            return true;

-        }

-    }

-    

-    private boolean ntmUrlIsRemote(URL localUrl, URL ntmUrl) {

-        if (ntmUrl == null) {

-            return false;

-        }

-        if (localUrl.getPort() != ntmUrl.getPort()) {

-            return true;

-        }

-        String remoteNtmUrlAuthority = ntmUrl.getAuthority();

-        if (remoteNtmUrlAuthority.indexOf("localhost") >= 0) {

-            return false;

-        }

-        return !localUrl.getAuthority().equals(remoteNtmUrlAuthority);

-    }

-    

-    public void newBrokerAck(URL remoteNtmUrl) {

-        try {

-            IOUtils.sendHttpRequest(remoteNtmUrl, Constants.NEW_BROKER_ACK_OP, new WriteableNewBrokerAck(), null);

-        } catch(Exception e) {

-            e.printStackTrace();

-            throw new RuntimeException(e);

-        }

-    }

-    

-    public void removeBroker(EndpointReference brokerConsumerEpr, List<EndpointReference> neighborBrokerConsumerEprs, URL remoteNtmUrl) {

-        WriteableRemoveBroker wrb = new WriteableRemoveBroker(brokerConsumerEpr, neighborBrokerConsumerEprs);

-        

-        try {

-            IOUtils.sendHttpRequest(remoteNtmUrl, Constants.REMOVE_BROKER_OP, wrb, null);

-        } catch(Exception e) {

-            e.printStackTrace();

-            throw new RuntimeException(e);

-        }

-    }

-    

-    private class NotificationTypeManagerHandler implements NotificationServletStreamHandler {

-        

-        private URI notificationType;

-        List<URL> consumerList;

-        List<URL> producerList;

-        List<BrokerStruct> brokerList;

-        private NotificationTypeLock notificationTypeLock;

-        private BrokerStruct pendingBroker;

-        

-        public NotificationTypeManagerHandler(URI notificationType) {

-            this.notificationType = notificationType;

-            this.notificationTypeLock = new NotificationTypeLock();

-            this.pendingBroker = null;

-        }

-        

-        public NotificationTypeManagerHandler(URI notificationType, URL consumerUrl, URL producerUrl, BrokerStruct broker) {

-            this(notificationType);

-            if (consumerUrl != null) {

-                addConsumer(consumerUrl);

-            } else if (producerUrl != null) {

-                addProducer(producerUrl);

-            } else if (broker != null) {

-                addBroker(broker);

-            }

-        }

-        

-        private void addConsumer(URL consumerUrl) {

-            if (consumerList == null) {

-                consumerList = new ArrayList<URL>();

-            }

-            consumerList.add(consumerUrl);

-        }

-        

-        private void addProducer(URL producerUrl) {

-            if (producerList == null) {

-                producerList = new ArrayList<URL>();

-            }

-            producerList.add(producerUrl);

-        }

-        

-        private void addBroker(BrokerStruct broker) {

-            if (brokerList == null) {

-                brokerList = new ArrayList<BrokerStruct>();

-            }

-            brokerList.add(broker);

-        }

-        

-        public void handle(Map<String, String> headers, ServletInputStream istream, int contentLength, ServletOutputStream ostream) {

-            String opHeader = headers.get(IOUtils.Notification_Operation);

-            EncodingObject eo = null;

-            try {

-                eo = EncodingUtils.decodeFromStream(encodingRegistry, istream);

-            } catch(EncodingException e) {

-                throw new RuntimeException(e);

-            }

-            

-            if (Constants.NEW_CONSUMER_OP.equals(opHeader)) {

-                handleNewConsumer((NewConsumer)eo, ostream);

-            } else if(Constants.NEW_PRODUCER_OP.equals(opHeader)) {

-                handleNewProducer((NewProducer)eo, ostream);

-            } else if(Constants.NEW_BROKER_OP.equals(opHeader)) {

-                handleNewBroker((NewBroker)eo, ostream);

-            } else if (Constants.NEW_BROKER_ACK_OP.equals(opHeader)) {

-                handleNewBrokerAck();

-            } else if (Constants.REMOVE_BROKER_OP.equals(opHeader)) {

-                handleRemoveBroker((RemoveBroker)eo);

-            }

-        }

-        

-        private void handleNewConsumer(NewConsumer nc, ServletOutputStream ostream) {

-            synchronized(notificationTypeLock) {

-                if (notificationTypeLock.isLocked) {

-                    try { notificationTypeLock.wait(); } catch(InterruptedException e) {}

-                }

-                URL consumerUrl = nc.getReference().getEndpointAddress().getAddress();

-                if (brokerList == null) {

-                    addConsumer(consumerUrl);

-                }

-    

-                NewConsumerResponse ncr = new NewConsumerResponse();

-                if (producerList != null) {

-                    ncr.setSequenceType(Constants.EndProducers);

-                    for (URL producerUrl : producerList) {

-                        ncr.addReferenceToSequence(EncodingUtils.createEndpointReference(producerUrl, null));

-                    }

-                } else if(brokerList != null) {

-                    ncr.setSequenceType(Constants.BrokerProducers);

-                    for (BrokerStruct broker : brokerList) {

-                        ncr.addReferenceToSequence(EncodingUtils.createEndpointReference(broker.producerUrl, null));

-                    }

-                } else {

-                    ncr.setSequenceType(Constants.NoProducers);

-                }

-                try {

-                    EncodingUtils.encodeToStream(encodingRegistry, ncr, ostream);

-                } catch(IOUtilsException e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-        

-        private void handleNewProducer(NewProducer np, ServletOutputStream ostream) {

-            synchronized(notificationTypeLock) {

-                if (notificationTypeLock.isLocked) {

-                    try { notificationTypeLock.wait(); } catch(InterruptedException e) {}

-                }

-                URL producerUrl = np.getReference().getEndpointAddress().getAddress();

-                if (brokerList == null) {

-                    addProducer(producerUrl);

-                }

-    

-                NewProducerResponse npr = new NewProducerResponse();

-                if (consumerList != null) {

-                    npr.setSequenceType(Constants.EndConsumers);

-                    for (URL consumerUrl : consumerList) {

-                        npr.addReferenceToSequence(EncodingUtils.createEndpointReference(consumerUrl, null));

-                    }

-                } else if(brokerList != null) {

-                    npr.setSequenceType(Constants.BrokerConsumers);

-                    for (BrokerStruct broker : brokerList) {

-                        npr.addReferenceToSequence(EncodingUtils.createEndpointReference(broker.consumerUrl, null));

-                    }

-                } else {

-                    npr.setSequenceType(Constants.NoConsumers);

-                }

-                try {

-                    EncodingUtils.encodeToStream(encodingRegistry, npr, ostream);

-                } catch(IOUtilsException e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-        

-        private void handleNewBroker(NewBroker nb, ServletOutputStream ostream) {

-            synchronized(notificationTypeLock) {

-                if (notificationTypeLock.isLocked) {

-                    try { notificationTypeLock.wait(); } catch(InterruptedException e) {}

-                }

-               NewBrokerResponse nbr = new NewBrokerResponse();

-                if (consumerList != null || producerList != null || brokerList == null) {

-                    nbr.setFirstBroker(true);

-                    EndConsumers endConsumers = new EndConsumers();

-                    if (consumerList != null) {

-                        endConsumers.setSequenceType(Constants.EndConsumers);

-                        for (URL consumerUrl : consumerList) {

-                            endConsumers.addReferenceToSequence(EncodingUtils.createEndpointReference(consumerUrl, null));

-                        }

-                    } else {

-                        endConsumers.setSequenceType(Constants.NoConsumers);

-                    }

-                    nbr.setEndConsumers(endConsumers);

-                    EndProducers endProducers = new EndProducers();

-                    if (producerList != null) {

-                        endProducers.setSequenceType(Constants.EndProducers);

-                        for (URL producerUrl : producerList) {

-                            endProducers.addReferenceToSequence(EncodingUtils.createEndpointReference(producerUrl, null));

-                        }

-                    } else {

-                        endProducers.setSequenceType(Constants.NoProducers);

-                    }

-                    nbr.setEndProducers(endProducers);

-                } else {

-                    nbr.setFirstBroker(false);

-                    Brokers brokers = new Brokers();

-                    for (BrokerStruct brokerStruct : brokerList) {

-                        Broker brokerElt = new Broker();

-                        BrokerConsumerReference bcr = new BrokerConsumerReference();

-                        bcr.setReference(EncodingUtils.createEndpointReference(brokerStruct.consumerUrl, brokerStruct.brokerID));

-                        brokerElt.setBrokerConsumerReference(bcr);

-                            

-                        BrokerProducerReference bpr = new BrokerProducerReference();

-                        bpr.setReference(EncodingUtils.createEndpointReference(brokerStruct.producerUrl, brokerStruct.brokerID));

-                        brokerElt.setBrokerProducerReference(bpr);

-                        brokers.addBrokerToSequence(brokerElt);

-                    }

-                    nbr.setBrokers(brokers);

-                }

-                EndpointReference consumerEPR = nb.getBrokerConsumerReference().getReference();

-                URL consumerUrl = consumerEPR.getEndpointAddress().getAddress();

-                BrokerID consumerBrokerID = consumerEPR.getReferenceProperties().getProperty(BrokerID.class);

-                EndpointReference producerEPR = nb.getBrokerProducerReference().getReference(); 

-                URL producerUrl = producerEPR.getEndpointAddress().getAddress();

-                BrokerID producerBrokerID = producerEPR.getReferenceProperties().getProperty(BrokerID.class);

-                if (consumerBrokerID == null ||

-                        producerBrokerID == null ||

-                            !consumerBrokerID.getID().equals(producerBrokerID.getID())) {

-                    throw new RuntimeException("Producer and consumer broker ids do not match");

-                }

-                // only add broker if consumerList == null && producerList == null

-                // otherwise, make it a pending broker and wait for ack

-                // TODO block for a configurable amount of time

-                BrokerStruct broker = new BrokerStruct(consumerUrl, producerUrl, consumerBrokerID.getID());

-                if (consumerList == null && producerList == null) {

-                    addBroker(broker);

-                } else {

-                    pendingBroker = broker;

-                    notificationTypeLock.isLocked = true;

-                }

-                try {

-                    EncodingUtils.encodeToStream(encodingRegistry, nbr, ostream);

-                } catch(IOUtilsException e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-        

-        private void handleNewBrokerAck() {

-            synchronized(notificationTypeLock) {

-                if (!notificationTypeLock.isLocked) {

-                    notificationTypeLock.notifyAll();

-                    throw new RuntimeException("Notification type should be locked");

-                }

-                if (brokerList != null) {

-                    notificationTypeLock.isLocked = false;

-                    notificationTypeLock.notifyAll();

-                    throw new RuntimeException("Can't add pending broker to non-empty broker list");

-                }

-                if (pendingBroker == null) {

-                    notificationTypeLock.isLocked = false;

-                    notificationTypeLock.notifyAll();

-                    throw new RuntimeException("Missing pending broker");

-                }

-                addBroker(pendingBroker);

-                consumerList = null;

-                producerList = null;

-                pendingBroker = null;

-                notificationTypeLock.isLocked = false;

-                notificationTypeLock.notifyAll();

-            }

-        }

-        

-        private void handleRemoveBroker(RemoveBroker rb) {

-            synchronized(notificationTypeLock) {

-                if (notificationTypeLock.isLocked) {

-                    try { notificationTypeLock.wait(); } catch(InterruptedException e) {}

-                }

-                

-                if (brokerList == null) {

-                    throw new RuntimeException("No broker to remove for [" + notificationType + "]");

-                }

-                

-                NeighborBrokerConsumers nbcs = rb.getNeighborBrokerConsumers();

-                EndpointReference rbEpr = rb.getBrokerConsumerReference().getReference();

-                if (nbcs != null && nbcs.getReferenceSequence() != null) {

-                    List<Broker> neighborBrokers = new ArrayList<Broker>();

-                    for (EndpointReference neighborBrokerConsumerEpr : nbcs.getReferenceSequence()) {

-                        BrokerStruct neighborBrokerStruct = null;

-                        URL neighborBrokerConsumerEprUrl = neighborBrokerConsumerEpr.getEndpointAddress().getAddress();

-                        for (BrokerStruct brokerStruct : brokerList) {

-                            if (brokerStruct.consumerUrl.equals(neighborBrokerConsumerEprUrl)) {

-                                neighborBrokerStruct = brokerStruct;

-                                break;

-                            }

-                        }

-                        if (neighborBrokerStruct == null) {

-                            throw new RuntimeException("Can't find neighbor broker for consumer EPR [" +

-                                                       neighborBrokerConsumerEprUrl + "]");

-                        }

-                        BrokerConsumerReference bcr = new BrokerConsumerReference();

-                        bcr.setReference(EncodingUtils.createEndpointReference(neighborBrokerStruct.consumerUrl, neighborBrokerStruct.brokerID));

-                        BrokerProducerReference bpr = new BrokerProducerReference();

-                        bpr.setReference(EncodingUtils.createEndpointReference(neighborBrokerStruct.producerUrl, neighborBrokerStruct.brokerID));

-                        Broker neighborBroker = new Broker();

-                        neighborBroker.setBrokerConsumerReference(bcr);

-                        neighborBroker.setBrokerProducerReference(bpr);

-                        neighborBrokers.add(neighborBroker);

-                    }

-                    int lastIndex = neighborBrokers.size() - 1;

-                    for (int index = lastIndex; index >= 0; index--) {

-                        List<Broker> writeableNeighborBrokers = ((index > 0) ? neighborBrokers.subList(0, index) : null);

-                        WriteableReplaceBrokerConnection wrbc = new WriteableReplaceBrokerConnection(rbEpr, writeableNeighborBrokers);

-                        URL targetUrl =

-                            neighborBrokers.get(index).getBrokerProducerReference().getReference().getEndpointAddress().getAddress();

-                        try {

-                            IOUtils.sendHttpRequest(targetUrl, Constants.REPLACE_BROKER_CONNECTION_OP, wrbc, null);

-                        } catch(Exception e) {

-                            e.printStackTrace();

-                            throw new RuntimeException(e);

-                        }

-                    }

-                }

-                

-                BrokerStruct removedBrokerStruct = null;

-                URL rbEprUrl = rbEpr.getEndpointAddress().getAddress();

-                for (BrokerStruct brokerSruct : brokerList) {

-                    if (brokerSruct.consumerUrl.equals(rbEprUrl)) {

-                        removedBrokerStruct = brokerSruct;

-                        break;

-                    }

-                }

-                if (removedBrokerStruct == null) {

-                    throw new RuntimeException("Can't find broker to remove for EPR [" + rbEprUrl + "]");

-                }

-                if(!brokerList.remove(removedBrokerStruct)) {

-                    throw new RuntimeException("Broker was not removed");

-                }

-            }

-        }

-    }

-    

-    class NotificationTypeLock {

-        public boolean isLocked;

-    }

-    

-    class WriteableEPW implements Writeable {

-        private EndpointReferenceWrapper epw;

-        

-        public WriteableEPW(EndpointReferenceWrapper epw, URL url) {

-            EndpointAddress epa = new EndpointAddress();

-            epa.setAddress(url);

-            EndpointReference epr = new EndpointReference();

-            epr.setEndpointAddress(epa);

-            epw.setReference(epr);

-            this.epw = epw;

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, epw, os);

-        }

-    }

-    

-    class InputStreamDecoder implements ReadableContinuation {

-        

-        public Object read(InputStream istream) throws IOUtilsException {

-            try {

-                return EncodingUtils.decodeFromStream(encodingRegistry, istream);

-            } catch(EncodingException e) {

-                throw new IOUtilsException(e);

-            }

-        }

-    }

-    

-    class BrokerStruct {

-        public URL consumerUrl;

-        public URL producerUrl;

-        public String brokerID;

-        

-        public BrokerStruct(URL consumerUrl, URL producerUrl, String brokerID) {

-            this.consumerUrl = consumerUrl;

-            this.producerUrl = producerUrl;

-            this.brokerID = brokerID;

-        }

-    }

-    

-    class WriteableNewBroker implements Writeable {

-        private NewBroker newBroker;

-        

-        public WriteableNewBroker(URL consumerUrl, URL producerUrl, String brokerID) {

-            newBroker = new NewBroker();

-            BrokerConsumerReference bcr = new BrokerConsumerReference();

-            bcr.setReference(EncodingUtils.createEndpointReference(consumerUrl, brokerID));

-            newBroker.setBrokerConsumerReference(bcr);

-            

-            BrokerProducerReference bpr = new BrokerProducerReference();

-            bpr.setReference(EncodingUtils.createEndpointReference(producerUrl, brokerID));

-            newBroker.setBrokerProducerReference(bpr);

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, newBroker, os);

-        }

-    }

-

-    class WriteableNewBrokerAck implements Writeable {

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, new NewBrokerAck(), os);

-        }

-    }

-    

-    class WriteableRemoveBroker implements Writeable {

-        private RemoveBroker removeBroker;

-        

-        public WriteableRemoveBroker(EndpointReference brokerConsumerEpr, List<EndpointReference> neighborBrokerConsumerEprs) {

-            removeBroker = new RemoveBroker();

-            BrokerConsumerReference brokerConsumerReference = new BrokerConsumerReference();

-            brokerConsumerReference.setReference(brokerConsumerEpr);

-            removeBroker.setBrokerConsumerReference(brokerConsumerReference);

-            if (neighborBrokerConsumerEprs != null) {

-                NeighborBrokerConsumers neighborBrokerConsumers = new NeighborBrokerConsumers();

-                neighborBrokerConsumers.setReferenceSequence(neighborBrokerConsumerEprs);

-                neighborBrokerConsumers.setSequenceType(Constants.BrokerConsumers);

-                removeBroker.setNeighborBrokerConsumers(neighborBrokerConsumers);

-            }

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, removeBroker, os);

-        }

-    }

-    

-    class WriteableReplaceBrokerConnection implements Writeable {

-        private ReplaceBrokerConnection replaceBrokerConnection;

-        

-        public WriteableReplaceBrokerConnection(EndpointReference removedBrokerEpr, List<Broker> brokerSequence) {

-            replaceBrokerConnection = new ReplaceBrokerConnection();

-            RemovedBroker removedBroker = new RemovedBroker();

-            removedBroker.setReference(removedBrokerEpr);

-            replaceBrokerConnection.setRemovedBroker(removedBroker);

-            if (brokerSequence != null) {

-                Neighbors neighbors = new Neighbors();

-                neighbors.setBrokerSequence(brokerSequence);

-                replaceBrokerConnection.setNeighbors(neighbors);

-            }

-        }

-        

-        public void write(OutputStream os) throws IOUtilsException {

-            EncodingUtils.encodeToStream(encodingRegistry, replaceBrokerConnection, os);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
deleted file mode 100644
index e99845d886..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class AbstractBroker implements EncodingObject {

-

-    private BrokerProducerReference brokerProducerReference;

-    private BrokerConsumerReference brokerConsumerReference;

-    

-    public BrokerProducerReference getBrokerProducerReference() {

-        return this.brokerProducerReference;

-    }

-    

-    public void setBrokerProducerReference(BrokerProducerReference brokerProducerReference) {

-        this.brokerProducerReference = brokerProducerReference;

-    }

-    

-    public BrokerConsumerReference getBrokerConsumerReference() {

-        return this.brokerConsumerReference;

-    }

-    

-    public void setBrokerConsumerReference(BrokerConsumerReference brokerConsumerReference) {

-        this.brokerConsumerReference = brokerConsumerReference;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
deleted file mode 100644
index 76eb204f21..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public abstract class AbstractBrokerEnDeCoder<B extends AbstractBroker> extends AbstractEnDeCoder<B> {

-

-    public AbstractBrokerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(B encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            registry.encode(encodingObject.getBrokerConsumerReference(), writer);

-            registry.encode(encodingObject.getBrokerProducerReference(), writer);

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public B decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            B brokerElement = getEncodingObjectType().newInstance();

-            boolean haveBCR = false;

-            boolean haveBPR = false;

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        if (encodingObject instanceof BrokerConsumerReference && !haveBCR) {

-                            brokerElement.setBrokerConsumerReference((BrokerConsumerReference)encodingObject);

-                            haveBCR = true;

-                        } else if(encodingObject instanceof BrokerProducerReference && !haveBPR) {

-                            brokerElement.setBrokerProducerReference((BrokerProducerReference)encodingObject);

-                            haveBPR = true;

-                        } else {

-                            throw new EncodingException("Invalid encoding object");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        if (!haveBCR) {

-                            throw new EncodingException("Missing broker consumer reference");

-                        }

-                        if (!haveBPR) {

-                            throw new EncodingException("Missing broker producer reference");

-                        }

-                        return brokerElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
deleted file mode 100644
index 536801016c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public abstract class AbstractEnDeCoder<E extends EncodingObject> implements

-		EnDeCoder<E> {

-

-	protected EncodingRegistry registry;

-

-	protected AbstractEnDeCoder(EncodingRegistry registry) {

-

-		this.registry = registry;

-	}

-

-	public void start() {

-		Class<E> encodingType = getEncodingObjectType();

-		QName encodingQName = getEncodingObjectQName();

-

-		registry.registerEnDeCoder(encodingType, encodingQName, this);

-	}

-

-	public void stop() {

-		Class<E> encodingType = getEncodingObjectType();

-		QName encodingQName = getEncodingObjectQName();

-

-		registry.unregisterEnDeCoder(encodingType, encodingQName);

-	}

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
deleted file mode 100644
index 3b2aacef4c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class Broker extends AbstractBroker {

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
deleted file mode 100644
index 94357cd98d..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerConsumerReference extends EndpointReferenceWrapper {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
deleted file mode 100644
index 66f0a198e4..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerConsumerReferenceEnDeCoder extends EndpointReferenceWrapperEnDeCoder<BrokerConsumerReference> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.BrokerConsumerReference);

-

-    public BrokerConsumerReferenceEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<BrokerConsumerReference> getEncodingObjectType() {

-        return BrokerConsumerReference.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
deleted file mode 100644
index e6e6b05a42..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerEnDeCoder extends AbstractBrokerEnDeCoder<Broker> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.Broker);

-    

-    public BrokerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<Broker> getEncodingObjectType() {

-        

-        return Broker.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
deleted file mode 100644
index 7c53d529a8..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.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.notification.encoding;

-

-import java.util.UUID;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerID implements EncodingObject {

-

-    private String id;

-

-    public String getID() {

-        return id;

-    }

-    

-    public void setID(String id) {

-        this.id = id;

-    }

-    

-    public static String generate() {

-        return UUID.randomUUID().toString();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
deleted file mode 100644
index a500a2a854..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.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.notification.encoding;

-

-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.XMLStreamConstants;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerIDEnDeCoder extends AbstractEnDeCoder<BrokerID> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.BrokerID);

-

-    public BrokerIDEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(BrokerID encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            writer.writeCharacters(encodingObject.getID());

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public BrokerID decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            BrokerID brokerIDElement = new BrokerID();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        break;

-                    case XMLStreamConstants.CHARACTERS:

-                        if (reader.hasText()) {

-                            String id = reader.getText();

-                            brokerIDElement.setID(id);

-                        } else {

-                            throw new EncodingException("Broker ID missing value");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        return brokerIDElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<BrokerID> getEncodingObjectType() {

-        

-        return BrokerID.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
deleted file mode 100644
index a6a2b15a15..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerProducerReference extends EndpointReferenceWrapper {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
deleted file mode 100644
index 209416c203..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokerProducerReferenceEnDeCoder extends EndpointReferenceWrapperEnDeCoder<BrokerProducerReference> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.BrokerProducerReference);

-

-    public BrokerProducerReferenceEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<BrokerProducerReference> getEncodingObjectType() {

-        return BrokerProducerReference.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
deleted file mode 100644
index 24395ee0a6..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.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.notification.encoding;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * @version $Rev$ $Date$

- */

-public class Brokers implements EncodingObject {

-    

-    private List<Broker> brokerSequence;

-    

-    public List<Broker> getBrokerSequence() {

-        return brokerSequence;

-    }

-

-    public void addBrokerToSequence(Broker broker) {

-        if(this.brokerSequence == null) {

-            this.brokerSequence = new ArrayList<Broker>();

-        }

-        this.brokerSequence.add(broker);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
deleted file mode 100644
index 1dba2533d2..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class BrokersEnDeCoder extends AbstractEnDeCoder<Brokers> {

-

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.Brokers);

-    

-    public BrokersEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(Brokers encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            if (encodingObject.getBrokerSequence() != null) {

-                for (Broker broker : encodingObject.getBrokerSequence()) {

-                    registry.encode(broker, writer);

-                }

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public Brokers decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            Brokers brokersElement = new Brokers();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        brokersElement.addBrokerToSequence((Broker)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return brokersElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<Brokers> getEncodingObjectType() {

-        

-        return Brokers.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
deleted file mode 100644
index 5783d0de02..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConnectionOverride implements EncodingObject {

-

-    private BrokerConsumerReference brokerConsumerReference;

-    

-    public BrokerConsumerReference getBrokerConsumerReference() {

-        return this.brokerConsumerReference;

-    }

-    

-    public void setBrokerConsumerReference(BrokerConsumerReference brokerConsumerReference) {

-        this.brokerConsumerReference = brokerConsumerReference;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
deleted file mode 100644
index bec3e6ff29..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConnectionOverrideEnDeCoder extends AbstractEnDeCoder<ConnectionOverride> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.ConnectionOverride);

-    

-    public ConnectionOverrideEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ConnectionOverride encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            registry.encode(encodingObject.getBrokerConsumerReference(), writer);

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public ConnectionOverride decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ConnectionOverride connectionOverrideElement = new ConnectionOverride();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        connectionOverrideElement.setBrokerConsumerReference((BrokerConsumerReference)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return connectionOverrideElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<ConnectionOverride> getEncodingObjectType() {

-        

-        return ConnectionOverride.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
deleted file mode 100644
index 91ba05404a..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConnectionOverrideResponse implements EncodingObject {

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
deleted file mode 100644
index 9012aaeb25..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConnectionOverrideResponseEnDeCoder extends AbstractEnDeCoder<ConnectionOverrideResponse> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.ConnectionOverrideResponse);

-    

-    public ConnectionOverrideResponseEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ConnectionOverrideResponse encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public ConnectionOverrideResponse decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ConnectionOverrideResponse connectionOverrideResponseElement = new ConnectionOverrideResponse();

-            while (true) {

-                switch (reader.next()) {

-                    case END_ELEMENT:

-                        return connectionOverrideResponseElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<ConnectionOverrideResponse> getEncodingObjectType() {

-        

-        return ConnectionOverrideResponse.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
deleted file mode 100644
index ca64c15305..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface Constants {

-

-    String NOTIFICATION_NS = "http://docs.oasis-open.org/wsn/b-2";

-    String NOTIFICATION_PREFIX = "wsnt";

-    String ADDRESSING_NS = "http://schemas.xmlsoap.org/ws/2004/08/addressing";

-    String ADDRESSING_PREFIX = "wsa";

-    String Subscribe = "Subscribe";

-    String ConsumerReference = "ConsumerReference";

-    String Address = "Address";

-    String ReferenceProperties = "ReferenceProperties";

-    String EndpointReference = "EndpointReference";

-    String BrokerID = "BrokerID";

-    String NewConsumer = "NewConsumer";

-    String NewProducer = "NewProducer";

-    String NewConsumerResponse = "NewConsumerResponse";

-    String NewProducerResponse = "NewProducerResponse";

-    String ConsumerSequenceType = "ConsumerSequenceType";

-    String EndConsumers = "EndConsumers";

-    String BrokerConsumers = "BrokerConsumers";

-    String NoConsumers = "NoConsumers";

-    String ProducerSequenceType = "ProducerSequenceType";

-    String EndProducers = "EndProducers";

-    String BrokerProducers = "BrokerProducers";

-    String NoProducers = "NoProducers";

-    String Broker = "Broker";

-    String NewBroker = "NewBroker";

-    String NewBrokerAck = "NewBrokerAck";

-    String BrokerConsumerReference = "BrokerConsumerReference";

-    String BrokerProducerReference = "BrokerProducerReference";

-    String NewBrokerResponse = "NewBrokerResponse";

-    String FirstBroker = "FirstBroker";

-    String Brokers = "Brokers";

-    String ConnectionOverride = "ConnectionOverride";

-    String ConnectionOverrideResponse = "ConnectionOverrideResponse";

-    String NeighborBrokerConsumers = "NeighborBrokerConsumers";

-    String RemoveBroker = "RemoveBroker";

-    String RemovedBroker = "RemovedBroker";

-    String Neighbors = "Neighbors";

-    String ReplaceBrokerConnection = "ReplaceBrokerConnection";

-    

-    String SUBSCRIBE_OP = "subscribe";

-    String CONNECTION_OVERRIDE_OP = "connectionOverride";

-    String NEW_CONSUMER_OP = "newConsumer";

-    String NEW_PRODUCER_OP = "newProducer";

-    String NEW_BROKER_OP = "newBroker";

-    String NEW_BROKER_ACK_OP = "newBrokerAck";

-    String REMOVE_BROKER_OP = "removeBroker";

-    String REPLACE_BROKER_CONNECTION_OP = "replaceBrokerConnection";

-

-    String Broker_ID = "brokerID";

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
deleted file mode 100644
index 1c678a2b96..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConsumerReference extends EndpointReferenceWrapper {

-    

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
deleted file mode 100644
index 8c6f684425..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ConsumerReferenceEnDeCoder extends EndpointReferenceWrapperEnDeCoder<ConsumerReference> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.ConsumerReference);

-

-    public ConsumerReferenceEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<ConsumerReference> getEncodingObjectType() {

-        return ConsumerReference.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
deleted file mode 100644
index 5b28aedcf9..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.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.notification.encoding;

-

-import java.util.Map;

-import java.util.concurrent.ConcurrentHashMap;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class DefaultEncodingRegistry implements EncodingRegistry {

-

-    private final Map<Class<? extends EncodingObject>, EnDeCoder> encoderRegistry =

-        new ConcurrentHashMap<Class<? extends EncodingObject>, EnDeCoder>();

-

-    private final Map<QName, EnDeCoder> decoderRegistry = new ConcurrentHashMap<QName, EnDeCoder>();

-    

-    public DefaultEncodingRegistry() {

-    }

-    

-    public <E extends EncodingObject> void registerEnDeCoder(Class<E> encodingClass, QName qname, EnDeCoder<E> enDeCoder) {

-        

-        encoderRegistry.put(encodingClass, enDeCoder);

-        decoderRegistry.put(qname, enDeCoder);

-    }

-

-    public <E extends EncodingObject> void unregisterEnDeCoder(Class<E> encodingClass, QName qname) {

-        

-        encoderRegistry.remove(encodingClass);

-        decoderRegistry.remove(qname);

-    }

-

-    @SuppressWarnings("unchecked")

-    public void encode(EncodingObject encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        EnDeCoder encoder = encoderRegistry.get(encodingObject.getClass());

-        if (encoder == null) {

-            throw new EncodingException("No encoder defined for " + encodingObject.getClass());

-        }

-        encoder.encode(encodingObject, writer);

-    }

-

-    public EncodingObject decode(XMLStreamReader reader) throws EncodingException {

-        

-        QName qname = reader.getName();

-

-        EnDeCoder decoder = decoderRegistry.get(qname);

-        if (decoder == null) {

-            throw new EncodingException("No decoder defined for " + qname);

-        }

-        return decoder.decode(reader);

-    }

-    

-    public void stop() {

-    	encoderRegistry.clear();

-    	decoderRegistry.clear();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
deleted file mode 100644
index bf6094582e..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface EnDeCoder<E extends EncodingObject> {

-

-    /**

-     * Encodes an object to the specified stream writer.

-     * 

-     * @param encodingObject Object to be serialized.

-     * @param writer Stream writer to which the infoset is serialized.

-     * @throws EncodingException In case of any encoding error.

-     */

-    void encode(E encodingObject, XMLStreamWriter writer) throws EncodingException;

-

-    /**

-     * Decodes an XML stream to an object.

-     * 

-     * @param reader XML stream from where the encoded XML is read.

-     * @return Encoding object.

-     * @throws EncodingException In case of any encoding error.

-     */

-    E decode(XMLStreamReader reader) throws EncodingException;

-    

-    /**

-     * Gets the qualified name of the XML fragment for the Encoding

-     * object.

-     * 

-     * @return Qualified name of the XML fragment.

-     */

-    QName getEncodingObjectQName();

-

-    /**

-     * Returns the type of the encoding object.

-     * 

-     * @return Encoding object type.

-     */

-    Class<E> getEncodingObjectType();

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
deleted file mode 100644
index ee12161903..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-@SuppressWarnings("serial")

-public class EncodingException extends Exception {

-

-    /**

-     * 

-     */

-    private static final long serialVersionUID = 1L;

-

-    /**

-     * Initializes the exception message.

-     * 

-     * @param message Message for the exception.

-     */

-    public EncodingException(String message) {

-        super(message);

-    }

-

-    /**

-     * Initializes the root cause.

-     * 

-     * @param cause Root cause for the exception.

-     */

-    public EncodingException(Throwable cause) {

-        super(cause);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
deleted file mode 100644
index bf94da374c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface EncodingObject {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
deleted file mode 100644
index 92f10cd4b3..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface EncodingRegistry {

-

-    /**

-     * Registers an en/de coder.

-     * 

-     * @param <E> Encoding object type.

-     * @param encodingClass Encoding object class.

-     * @param qname Qualified name of the root element of the encoded XML.

-     * @param enDeCoder Encoding object enDeCoder.

-     */

-    <E extends EncodingObject> void registerEnDeCoder(Class<E> encodingClass, QName qname, EnDeCoder<E> enDeCoder);

-

-    <E extends EncodingObject> void unregisterEnDeCoder(Class<E> encodingClass, QName qname);

-    

-    /**

-     * Encodes an object.

-     * 

-     * @param encodingObject Encoding object to be encoded.

-     * @param writer Writer to which encoded information is written.

-     */

-    void encode(EncodingObject encodingObject, XMLStreamWriter writer) throws EncodingException;

-

-    /**

-     * Decodes an XML stream to an encoding object.

-     * 

-     * @param reader Reader from which encoded information is read.

-     * @return Encoding object from the encoded stream.

-     */

-    EncodingObject decode(XMLStreamReader reader) throws EncodingException;

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
deleted file mode 100644
index 264566aae4..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.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.notification.encoding;

-

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.net.URL;

-

-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.binding.notification.util.IOUtils.IOUtilsException;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EncodingUtils {

-

-    private static XMLOutputFactory xof = XMLOutputFactory.newInstance();

-    private static XMLInputFactory xif = XMLInputFactory.newInstance();

-

-    public static void encodeToStream(EncodingRegistry encodingRegistry,

-                                      EncodingObject eo,

-                                      OutputStream os) throws IOUtilsException {

-        try {

-            XMLStreamWriter writer = xof.createXMLStreamWriter(os);

-            encodingRegistry.encode(eo, writer);

-            writer.flush();

-            writer.close();

-        } catch(Exception e) {

-            throw new IOUtilsException(e);

-        }

-    }

-    

-    public static EncodingObject decodeFromStream(EncodingRegistry encodingRegistry,

-                                                  InputStream istream) throws EncodingException {

-        EncodingObject eo = null;

-        try {

-            XMLStreamReader reader = xif.createXMLStreamReader(istream);

-            reader.next();

-            eo = encodingRegistry.decode(reader);

-            reader.close();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-        

-        return eo;

-    }

-    

-    public static EndpointReference createEndpointReference(URL address, String brokerID) {

-        EndpointAddress epa = new EndpointAddress();

-        epa.setAddress(address);

-        EndpointReference epr = new EndpointReference();

-        epr.setEndpointAddress(epa);

-        if (brokerID != null) {

-            BrokerID bi = new BrokerID();

-            bi.setID(brokerID);

-            ReferenceProperties rp = new ReferenceProperties();

-            rp.addProperty(bi);

-            epr.setReferenceProperties(rp);

-        }

-        return epr;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
deleted file mode 100644
index 8066184da9..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndConsumers extends EndpointReferenceSequence {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
deleted file mode 100644
index 5e3afc8195..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndConsumersEnDeCoder extends EndpointReferenceSequenceEnDeCoder<EndConsumers> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.EndConsumers);

-

-    public EndConsumersEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<EndConsumers> getEncodingObjectType() {

-        return EndConsumers.class;

-    }

-

-    @Override

-    protected void encodeSequenceTypeAttribute(EndConsumers encodingObject, XMLStreamWriter writer) throws EncodingException {

-        try {

-            writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    @Override

-    protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {

-        return reader.getAttributeValue(null, Constants.ConsumerSequenceType);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
deleted file mode 100644
index b43ad5c214..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndProducers extends EndpointReferenceSequence {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
deleted file mode 100644
index 3840b1caf9..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndProducersEnDeCoder extends EndpointReferenceSequenceEnDeCoder<EndProducers> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.EndProducers);

-

-    public EndProducersEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<EndProducers> getEncodingObjectType() {

-        return EndProducers.class;

-    }

-

-    @Override

-    protected void encodeSequenceTypeAttribute(EndProducers encodingObject, XMLStreamWriter writer) throws EncodingException {

-        try {

-            writer.writeAttribute(Constants.ProducerSequenceType, encodingObject.getSequenceType());

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    @Override

-    protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {

-        return reader.getAttributeValue(null, Constants.ProducerSequenceType);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
deleted file mode 100644
index f2a36d89db..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.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.notification.encoding;

-

-import java.net.URL;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointAddress implements EncodingObject {

-

-    private URL address;

-

-    public URL getAddress() {

-        return address;

-    }

-    

-    public void setAddress(URL address) {

-        this.address = address;

-    }

-    

-    public void setAddress(String addressText) throws EncodingException {

-        try {

-            this.address = new URL(addressText);

-        } catch(Exception e) {

-            throw new EncodingException(e);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
deleted file mode 100644
index 8195c80c49..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.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.notification.encoding;

-

-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.XMLStreamConstants;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointAddressEnDeCoder extends AbstractEnDeCoder<EndpointAddress> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.ADDRESSING_NS, Constants.Address);

-

-    public EndpointAddressEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(EndpointAddress encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.ADDRESSING_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.ADDRESSING_PREFIX, QNAME.getNamespaceURI());

-            writer.writeCharacters(encodingObject.getAddress().toString());

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public EndpointAddress decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            EndpointAddress endpointAddressElement = new EndpointAddress();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        break;

-                    case XMLStreamConstants.CHARACTERS:

-                        if (reader.hasText()) {

-                            String address = reader.getText();

-                            endpointAddressElement.setAddress(address);

-                        } else {

-                            throw new EncodingException("Endpoint address is missing address");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        return endpointAddressElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<EndpointAddress> getEncodingObjectType() {

-        

-        return EndpointAddress.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
deleted file mode 100644
index beba8fdc9b..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointReference implements EncodingObject {

-

-    private EndpointAddress endpointAddress;

-    private ReferenceProperties referenceProperties;

-    

-    public EndpointAddress getEndpointAddress() {

-        return this.endpointAddress;

-    }

-    

-    public void setEndpointAddress(EndpointAddress endpointAddress) {

-        this.endpointAddress = endpointAddress;

-    }

-    

-    public ReferenceProperties getReferenceProperties() {

-        return this.referenceProperties;

-    }

-    

-    public void setReferenceProperties(ReferenceProperties referenceProperties) {

-        this.referenceProperties = referenceProperties;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
deleted file mode 100644
index cfc747f59e..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointReferenceEnDeCoder extends AbstractEnDeCoder<EndpointReference> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.ADDRESSING_NS, Constants.EndpointReference);

-

-    public EndpointReferenceEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(EndpointReference encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.ADDRESSING_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.ADDRESSING_PREFIX, QNAME.getNamespaceURI());

-            registry.encode(encodingObject.getEndpointAddress(), writer);

-            if (encodingObject.getReferenceProperties() != null) {

-                registry.encode(encodingObject.getReferenceProperties(), writer);

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public EndpointReference decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            EndpointReference endpointReferenceElement = new EndpointReference();

-            boolean haveEPA = false;

-            boolean haveRP = false;

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        if (encodingObject instanceof EndpointAddress && !haveEPA) {

-                            endpointReferenceElement.setEndpointAddress((EndpointAddress)encodingObject);

-                            haveEPA = true;

-                        } else if(encodingObject instanceof ReferenceProperties && !haveRP) {

-                            endpointReferenceElement.setReferenceProperties((ReferenceProperties)encodingObject);

-                            haveRP = true;

-                        } else {

-                            throw new EncodingException("Invalid encoding object");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        if (!haveEPA) {

-                            throw new EncodingException("Missing endpoint address");

-                        }

-                        return endpointReferenceElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<EndpointReference> getEncodingObjectType() {

-        

-        return EndpointReference.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
deleted file mode 100644
index a9c901a431..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.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.notification.encoding;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointReferenceSequence implements EncodingObject {

-    

-    private List<EndpointReference> referenceSequence;

-    private String sequenceType;

-    

-    public List<EndpointReference> getReferenceSequence() {

-        return referenceSequence;

-    }

-

-    public void addReferenceToSequence(EndpointReference address) {

-        if(this.referenceSequence == null) {

-            this.referenceSequence = new ArrayList<EndpointReference>();

-        }

-        this.referenceSequence.add(address);

-    }

-    

-    public void setReferenceSequence(List<EndpointReference> referenceSequence) {

-        this.referenceSequence = referenceSequence;

-    }

-    

-    public String getSequenceType() {

-        return this.sequenceType;

-    }

-    

-    public void setSequenceType(String sequenceType) {

-        this.sequenceType = sequenceType;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
deleted file mode 100644
index 864de25fd6..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public abstract class EndpointReferenceSequenceEnDeCoder<ERS extends EndpointReferenceSequence> extends AbstractEnDeCoder<ERS> {

-

-    public EndpointReferenceSequenceEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ERS encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            encodeSequenceTypeAttribute(encodingObject, writer);

-            if (encodingObject.getReferenceSequence() != null) {

-                for (EndpointReference endpointReference : encodingObject.getReferenceSequence()) {

-                    registry.encode(endpointReference, writer);

-                }

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    protected abstract void encodeSequenceTypeAttribute(ERS encodingObject, XMLStreamWriter writer) throws EncodingException;

-

-    public ERS decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ERS endpointReferenceSequenceElement = null;

-            try {

-                endpointReferenceSequenceElement = getEncodingObjectType().newInstance();

-            } catch(Exception e) {

-                throw new EncodingException(e);

-            }

-            String sequenceType = decodeSequenceTypeAttribute(reader);

-            endpointReferenceSequenceElement.setSequenceType(sequenceType);

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        endpointReferenceSequenceElement.addReferenceToSequence((EndpointReference)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return endpointReferenceSequenceElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-    

-    protected abstract String decodeSequenceTypeAttribute(XMLStreamReader reader);

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
deleted file mode 100644
index b3f2c060fb..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EndpointReferenceWrapper implements EncodingObject {

-

-    private EndpointReference reference;

-

-    public EndpointReference getReference() {

-        return reference;

-    }

-    

-    public void setReference(EndpointReference reference) {

-        this.reference = reference;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
deleted file mode 100644
index 979a6e8e34..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public abstract class EndpointReferenceWrapperEnDeCoder<ERW extends EndpointReferenceWrapper> extends AbstractEnDeCoder<ERW> {

-

-    public EndpointReferenceWrapperEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ERW encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            registry.encode(encodingObject.getReference(), writer);

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public ERW decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ERW endpointReferenceWrapperElement = null;

-            try {

-                endpointReferenceWrapperElement = getEncodingObjectType().newInstance();

-            } catch(Exception e) {

-                throw new EncodingException(e);

-            }

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        endpointReferenceWrapperElement.setReference((EndpointReference)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return endpointReferenceWrapperElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
deleted file mode 100644
index 902fd823cd..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NeighborBrokerConsumers extends EndpointReferenceSequence {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
deleted file mode 100644
index ad149e3e4f..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NeighborBrokerConsumersEnDeCoder extends EndpointReferenceSequenceEnDeCoder<NeighborBrokerConsumers> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NeighborBrokerConsumers);

-

-    public NeighborBrokerConsumersEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<NeighborBrokerConsumers> getEncodingObjectType() {

-        return NeighborBrokerConsumers.class;

-    }

-

-    @Override

-    protected void encodeSequenceTypeAttribute(NeighborBrokerConsumers encodingObject, XMLStreamWriter writer) throws EncodingException {

-        try {

-            writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    @Override

-    protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {

-        return reader.getAttributeValue(null, Constants.ConsumerSequenceType);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
deleted file mode 100644
index 42f9e74a27..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.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.notification.encoding;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * @version $Rev$ $Date$

- */

-public class Neighbors implements EncodingObject {

-    

-    private List<Broker> brokerSequence;

-    

-    public List<Broker> getBrokerSequence() {

-        return brokerSequence;

-    }

-

-    public void addBrokerToSequence(Broker broker) {

-        if(this.brokerSequence == null) {

-            this.brokerSequence = new ArrayList<Broker>();

-        }

-        this.brokerSequence.add(broker);

-    }

-    

-    public void setBrokerSequence(List<Broker> brokerSequence) {

-        this.brokerSequence = brokerSequence;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
deleted file mode 100644
index fa05e2d7bd..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NeighborsEnDeCoder extends AbstractEnDeCoder<Neighbors> {

-

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.Neighbors);

-    

-    public NeighborsEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(Neighbors encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            if (encodingObject.getBrokerSequence() != null) {

-                for (Broker broker : encodingObject.getBrokerSequence()) {

-                    registry.encode(broker, writer);

-                }

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public Neighbors decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            Neighbors neighborsElement = new Neighbors();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        neighborsElement.addBrokerToSequence((Broker)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return neighborsElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<Neighbors> getEncodingObjectType() {

-        

-        return Neighbors.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
deleted file mode 100644
index 92578af219..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBroker extends AbstractBroker {

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
deleted file mode 100644
index 48c34ba74f..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBrokerAck implements EncodingObject {

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
deleted file mode 100644
index c9a3f1da79..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBrokerAckEnDeCoder extends AbstractEnDeCoder<NewBrokerAck> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewBrokerAck);

-    

-    public NewBrokerAckEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(NewBrokerAck encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public NewBrokerAck decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            NewBrokerAck newBrokerAck = new NewBrokerAck();

-            while (true) {

-                switch (reader.next()) {

-                    case END_ELEMENT:

-                        return newBrokerAck;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<NewBrokerAck> getEncodingObjectType() {

-        

-        return NewBrokerAck.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
deleted file mode 100644
index 6e57ad41de..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBrokerEnDeCoder extends AbstractBrokerEnDeCoder<NewBroker> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewBroker);

-        

-    public NewBrokerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<NewBroker> getEncodingObjectType() {

-        

-        return NewBroker.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
deleted file mode 100644
index 6f34fc0b7c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBrokerResponse implements EncodingObject {

-

-    private EndProducers endProducers;

-    private EndConsumers endConsumers;

-    private Brokers brokers;

-    private boolean firstBroker;

-    

-    public EndProducers getEndProducers() {

-        return this.endProducers;

-    }

-    

-    public void setEndProducers(EndProducers endProducers) {

-        this.endProducers = endProducers;

-    }

-    

-    public EndConsumers getEndConsumers() {

-        return this.endConsumers;

-    }

-    

-    public void setEndConsumers(EndConsumers endConsumers) {

-        this.endConsumers = endConsumers;

-    }

-    

-    public Brokers getBrokers() {

-        return this.brokers;

-    }

-    

-    public void setBrokers(Brokers brokers) {

-        this.brokers = brokers;

-    }

-    

-    public boolean isFirstBroker() {

-        return this.firstBroker;

-    }

-    

-    public void setFirstBroker(boolean firstBroker) {

-        this.firstBroker = firstBroker;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
deleted file mode 100644
index 2ad969e1a6..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.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.binding.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewBrokerResponseEnDeCoder extends AbstractEnDeCoder<NewBrokerResponse> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewBrokerResponse);

-        

-    public NewBrokerResponseEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(NewBrokerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            QName qName = getEncodingObjectQName();

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, qName.getLocalPart(), qName.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, qName.getNamespaceURI());

-            writer.writeAttribute(Constants.FirstBroker, String.valueOf(encodingObject.isFirstBroker()));

-            if (encodingObject.isFirstBroker()) {

-                registry.encode(encodingObject.getEndConsumers(), writer);

-                registry.encode(encodingObject.getEndProducers(), writer);

-            } else {

-                registry.encode(encodingObject.getBrokers(), writer);

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public NewBrokerResponse decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            NewBrokerResponse newBrokerResponseElement = new NewBrokerResponse();

-            boolean firstBroker = Boolean.parseBoolean(reader.getAttributeValue(null, Constants.FirstBroker));

-            newBrokerResponseElement.setFirstBroker(firstBroker);

-            boolean haveEC = false;

-            boolean haveEP = false;

-            boolean haveB = false;

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        if (encodingObject instanceof EndProducers && !haveEP && firstBroker) {

-                            newBrokerResponseElement.setEndProducers((EndProducers)encodingObject);

-                            haveEP = true;

-                        } else if(encodingObject instanceof EndConsumers && !haveEC && firstBroker) {

-                            newBrokerResponseElement.setEndConsumers((EndConsumers)encodingObject);

-                            haveEC = true;

-                        } else if(encodingObject instanceof Brokers && !haveB && !firstBroker) {

-                            newBrokerResponseElement.setBrokers((Brokers)encodingObject);

-                            haveB = true;

-                        } else {

-                            throw new EncodingException("Invalid encoding object");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        if (!haveEP && firstBroker) {

-                            throw new EncodingException("Missing end producers");

-                        }

-                        if (!haveEC && firstBroker) {

-                            throw new EncodingException("Missing end consumers");

-                        }

-                        if (!haveB && !firstBroker) {

-                            throw new EncodingException("Missing brokers");

-                        }

-                        return newBrokerResponseElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<NewBrokerResponse> getEncodingObjectType() {

-        

-        return NewBrokerResponse.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
deleted file mode 100644
index a47e1f4e55..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewConsumer extends EndpointReferenceWrapper {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
deleted file mode 100644
index 8eac326019..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewConsumerEnDeCoder extends EndpointReferenceWrapperEnDeCoder<NewConsumer> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewConsumer);

-

-    public NewConsumerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<NewConsumer> getEncodingObjectType() {

-        return NewConsumer.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
deleted file mode 100644
index 60fb23be02..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewConsumerResponse extends EndpointReferenceSequence {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
deleted file mode 100644
index fbcd041621..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewConsumerResponseEnDeCoder extends EndpointReferenceSequenceEnDeCoder<NewConsumerResponse> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewConsumerResponse);

-

-    public NewConsumerResponseEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<NewConsumerResponse> getEncodingObjectType() {

-        return NewConsumerResponse.class;

-    }

-

-    @Override

-    protected void encodeSequenceTypeAttribute(NewConsumerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {

-        try {

-            writer.writeAttribute(Constants.ProducerSequenceType, encodingObject.getSequenceType());

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    @Override

-    protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {

-        return reader.getAttributeValue(null, Constants.ProducerSequenceType);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
deleted file mode 100644
index aa9180dcd7..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewProducer extends EndpointReferenceWrapper {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
deleted file mode 100644
index 38cf9e9467..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewProducerEnDeCoder extends EndpointReferenceWrapperEnDeCoder<NewProducer> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewProducer);

-

-    public NewProducerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<NewProducer> getEncodingObjectType() {

-        return NewProducer.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
deleted file mode 100644
index 49a4259333..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewProducerResponse extends EndpointReferenceSequence {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
deleted file mode 100644
index 74d10fe02d..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NewProducerResponseEnDeCoder extends EndpointReferenceSequenceEnDeCoder<NewProducerResponse> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.NewProducerResponse);

-

-    public NewProducerResponseEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<NewProducerResponse> getEncodingObjectType() {

-        return NewProducerResponse.class;

-    }

-

-	@Override

-    protected void encodeSequenceTypeAttribute(NewProducerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {

-        try {

-            writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-    

-    @Override

-    protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {

-        return reader.getAttributeValue(null, Constants.ConsumerSequenceType);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
deleted file mode 100644
index 2ee9320f20..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.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.notification.encoding;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ReferenceProperties implements EncodingObject {

-    

-    private List<EncodingObject> properties;

-    

-    public List<EncodingObject> getProperties() {

-        return properties;

-    }

-

-    public void addProperty(EncodingObject property) {

-        if(this.properties == null) {

-            this.properties = new ArrayList<EncodingObject>();

-        }

-        this.properties.add(property);

-    }

-    

-    @SuppressWarnings("unchecked")

-    public <E extends EncodingObject> E getProperty(Class<E> propertyType) {

-        if (this.properties == null) {

-            return null;

-        }

-        for (EncodingObject eo : properties) {

-            if (propertyType.isInstance(eo)) {

-                return (E)eo;

-            }

-        }

-        return null;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
deleted file mode 100644
index 9d06dfea97..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ReferencePropertiesEnDeCoder extends AbstractEnDeCoder<ReferenceProperties> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.ADDRESSING_NS, Constants.ReferenceProperties);

-

-    public ReferencePropertiesEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ReferenceProperties encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.ADDRESSING_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.ADDRESSING_PREFIX, QNAME.getNamespaceURI());

-            if (encodingObject.getProperties() != null) {

-                for (EncodingObject property : encodingObject.getProperties()) {

-                    registry.encode(property, writer);

-                }

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public ReferenceProperties decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ReferenceProperties referencePropertiesElement = new ReferenceProperties();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject property = registry.decode(reader);

-                        referencePropertiesElement.addProperty(property);

-                        break;

-                    case END_ELEMENT:

-                        return referencePropertiesElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<ReferenceProperties> getEncodingObjectType() {

-        

-        return ReferenceProperties.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
deleted file mode 100644
index 39050d158c..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class RemoveBroker implements EncodingObject {

-

-    private BrokerConsumerReference brokerConsumerReference;

-    private NeighborBrokerConsumers neighborBrokerConsumers;

-    

-    public BrokerConsumerReference getBrokerConsumerReference() {

-        return this.brokerConsumerReference;

-    }

-    

-    public void setBrokerConsumerReference(BrokerConsumerReference brokerConsumerReference) {

-        this.brokerConsumerReference = brokerConsumerReference;

-    }

-    

-    public NeighborBrokerConsumers getNeighborBrokerConsumers() {

-        return this.neighborBrokerConsumers;

-    }

-    

-    public void setNeighborBrokerConsumers(NeighborBrokerConsumers neighborBrokerConsumers) {

-        this.neighborBrokerConsumers = neighborBrokerConsumers;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
deleted file mode 100644
index 97834ea0a9..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class RemoveBrokerEnDeCoder extends AbstractEnDeCoder<RemoveBroker> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.RemoveBroker);

-

-    public RemoveBrokerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(RemoveBroker encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            registry.encode(encodingObject.getBrokerConsumerReference(), writer);

-            if (encodingObject.getNeighborBrokerConsumers() != null) {

-                registry.encode(encodingObject.getNeighborBrokerConsumers(), writer);

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public RemoveBroker decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            RemoveBroker removeBrokerElement = new RemoveBroker();

-            boolean haveBCR = false;

-            boolean haveNBC = false;

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        if (encodingObject instanceof BrokerConsumerReference && !haveBCR) {

-                            removeBrokerElement.setBrokerConsumerReference((BrokerConsumerReference)encodingObject);

-                            haveBCR = true;

-                        } else if(encodingObject instanceof NeighborBrokerConsumers && !haveNBC) {

-                            removeBrokerElement.setNeighborBrokerConsumers((NeighborBrokerConsumers)encodingObject);

-                            haveNBC = true;

-                        } else {

-                            throw new EncodingException("Invalid encoding object");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        if (!haveBCR) {

-                            throw new EncodingException("Missing broker consumer reference");

-                        }

-                        return removeBrokerElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<RemoveBroker> getEncodingObjectType() {

-        

-        return RemoveBroker.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
deleted file mode 100644
index 047c5e9a58..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class RemovedBroker extends EndpointReferenceWrapper {

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
deleted file mode 100644
index 25f92c38c2..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.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.notification.encoding;

-

-import javax.xml.namespace.QName;

-

-/**

- * @version $Rev$ $Date$

- */

-public class RemovedBrokerEnDeCoder extends EndpointReferenceWrapperEnDeCoder<RemovedBroker> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.RemovedBroker);

-

-    public RemovedBrokerEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        return QNAME;

-    }

-

-    

-	public Class<RemovedBroker> getEncodingObjectType() {

-        return RemovedBroker.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
deleted file mode 100644
index 8145c6b170..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ReplaceBrokerConnection implements EncodingObject {

-

-    private RemovedBroker removedBroker;

-    private Neighbors neighbors;

-    

-    public RemovedBroker getRemovedBroker() {

-        return this.removedBroker;

-    }

-    

-    public void setRemovedBroker(RemovedBroker removedBroker) {

-        this.removedBroker = removedBroker;

-    }

-    

-    public Neighbors getNeighbors() {

-        return this.neighbors;

-    }

-    

-    public void setNeighbors(Neighbors neighbors) {

-        this.neighbors = neighbors;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
deleted file mode 100644
index 000f6690c7..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ReplaceBrokerConnectionEnDeCoder extends AbstractEnDeCoder<ReplaceBrokerConnection> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.ReplaceBrokerConnection);

-

-    public ReplaceBrokerConnectionEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(ReplaceBrokerConnection encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            registry.encode(encodingObject.getRemovedBroker(), writer);

-            if (encodingObject.getNeighbors() != null) {

-                registry.encode(encodingObject.getNeighbors(), writer);

-            }

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public ReplaceBrokerConnection decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            ReplaceBrokerConnection replaceBrokerConnectionElement = new ReplaceBrokerConnection();

-            boolean haveRB = false;

-            boolean haveN = false;

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        if (encodingObject instanceof RemovedBroker && !haveRB) {

-                            replaceBrokerConnectionElement.setRemovedBroker((RemovedBroker)encodingObject);

-                            haveRB = true;

-                        } else if(encodingObject instanceof Neighbors && !haveN) {

-                            replaceBrokerConnectionElement.setNeighbors((Neighbors)encodingObject);

-                            haveN = true;

-                        } else {

-                            throw new EncodingException("Invalid encoding object");

-                        }

-                        break;

-                    case END_ELEMENT:

-                        if (!haveRB) {

-                            throw new EncodingException("Missing removed broker");

-                        }

-                        return replaceBrokerConnectionElement;

-                }

-            }

-        } catch (Exception ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<ReplaceBrokerConnection> getEncodingObjectType() {

-        

-        return ReplaceBrokerConnection.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
deleted file mode 100644
index aca5c70641..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.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.notification.encoding;

-

-/**

- * @version $Rev$ $Date$

- */

-public class Subscribe implements EncodingObject {

-

-    private ConsumerReference consumerReference;

-    

-    public ConsumerReference getConsumerReference() {

-        return consumerReference;

-    }

-    

-    public void setConsumerReference(ConsumerReference consumerReference) {

-        this.consumerReference = consumerReference;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
deleted file mode 100644
index 04ee132b3e..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.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.notification.encoding;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class SubscribeEnDeCoder extends AbstractEnDeCoder<Subscribe> {

-

-    // QName for the root element

-    public static final QName QNAME = new QName(Constants.NOTIFICATION_NS, Constants.Subscribe);

-    

-    public SubscribeEnDeCoder(EncodingRegistry registry) {

-        super(registry);

-    }

-

-    public void encode(Subscribe encodingObject, XMLStreamWriter writer) throws EncodingException {

-        

-        try {

-            writer.writeStartElement(Constants.NOTIFICATION_PREFIX, QNAME.getLocalPart(), QNAME.getNamespaceURI());

-            writer.writeNamespace(Constants.NOTIFICATION_PREFIX, QNAME.getNamespaceURI());

-            registry.encode(encodingObject.getConsumerReference(), writer);

-            writer.writeEndElement();

-        } catch(XMLStreamException e) {

-            throw new EncodingException(e);

-        }

-    }

-

-    public Subscribe decode(XMLStreamReader reader) throws EncodingException {

-        

-        try {

-            Subscribe subscribeElement = new Subscribe();

-            while (true) {

-                switch (reader.next()) {

-                    case START_ELEMENT:

-                        EncodingObject encodingObject = registry.decode(reader);

-                        subscribeElement.setConsumerReference((ConsumerReference)encodingObject);

-                        break;

-                    case END_ELEMENT:

-                        return subscribeElement;

-                }

-            }

-        } catch (XMLStreamException ex) {

-            throw new EncodingException(ex);

-        }

-    }

-

-    

-	public QName getEncodingObjectQName() {

-        

-        return QNAME;

-    }

-

-    

-	public Class<Subscribe> getEncodingObjectType() {

-        

-        return Subscribe.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
deleted file mode 100644
index daac727cb6..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.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.binding.notification.util;

-

-import java.io.ByteArrayOutputStream;

-import java.io.EOFException;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.net.HttpURLConnection;

-import java.net.URL;

-import java.util.HashMap;

-import java.util.Map;

-

-/**

- * @version $Rev$ $Date$

- */

-public class IOUtils {

-

-    // FIXME: For some reason, tomcat converts the header names to be lower case, see TUSCANY-1791

-    public static final String  Notification_Source    = "notification-source";

-    public static final String  Notification_Target    = "notification-target";

-    public static final String  Notification_Operation = "notification-operation";

-

-    public static final int DEF_BLOCK_SIZE = 512;

-

-    public static Object sendHttpRequest(URL targetURL,

-                                         String opName,

-                                         Writeable wbody,

-                                         ReadableContinuation rcont) throws Exception {

-        if (opName == null) {

-            opName = "";

-        }

-        Map<String, String> headers = new HashMap<String, String>();

-        headers.put(Notification_Operation, opName);

-        return sendHttpRequest(targetURL, headers, wbody, rcont);

-    }

-    

-    public static Object sendHttpRequest(URL targetURL,

-                                         Map<String, String> headers,

-                                         Writeable wbody,

-                                         ReadableContinuation rcont) throws Exception {

-        

-        String targetUri = targetURL.toString();

-        String sourceUri = "";

-        

-        final HttpURLConnection con = (HttpURLConnection) targetURL.openConnection();

-        con.setRequestMethod("POST");

-        //con.setRequestProperty("Content-Length", Integer.toString(sbody.getBytes().length));

-        con.setAllowUserInteraction(false);

-        con.setInstanceFollowRedirects(false);

-        if (targetUri != null) {

-            con.setRequestProperty(Notification_Target, targetUri);

-        }

-        

-        if (sourceUri != null) {

-            con.setRequestProperty(Notification_Source, sourceUri);

-        }

-        

-        for (String key : headers.keySet()) {

-            con.setRequestProperty(key, headers.get(key));

-        }

-        con.setDoOutput(true);

-        con.setDoInput(true);

-        con.connect();

-        Object response = null;

-        try {

-            if (wbody != null) {

-                OutputStream ost = con.getOutputStream();

-                wbody.write(ost);

-            } else {

-                throw new IOUtilsException("Missing writeable body");

-            }

-            final int rc = con.getResponseCode();

-            switch (rc) {

-                case HttpURLConnection.HTTP_OK:

-                    if (rcont != null) {

-                        InputStream ist = con.getInputStream();

-                        response = rcont.read(ist);

-                    }

-                    break;

-                case HttpURLConnection.HTTP_NO_CONTENT:

-                    break;

-                default:

-                    throw new RuntimeException("Unexpected response code: " + rc);

-            }

-        } finally {

-            con.disconnect();

-        }

-        return response;

-    }

-    

-    public interface Writeable {

-        void write(OutputStream os) throws IOUtilsException;

-    }

-    

-    public interface ReadableContinuation {

-        Object read(InputStream is) throws IOUtilsException;

-    }

-    

-    @SuppressWarnings("serial")

-    public static class IOUtilsException extends Exception {

-        

-        /**

-         * 

-         */

-        private static final long serialVersionUID = 1L;

-

-        public IOUtilsException(String message) {

-            super(message);

-        }

-

-        public IOUtilsException(Throwable cause) {

-            super(cause);

-        }

-    }

-    

-    public static byte [] readFully(final InputStream ist, int len) throws IOException {

-        ByteArrayOutputStream baost = new ByteArrayOutputStream();

-        copyStream(ist,baost,len);

-        return baost.toByteArray();

-    }

-

-    public static int copyStream(final InputStream ist, final OutputStream ost) throws IOException {

-        return copyStream(ist, ost, -1, 0);

-    }

-

-    public static int copyStream(final InputStream ist, final OutputStream ost, int length) throws IOException {

-        return copyStream(ist, ost, length, 0);

-    }

-

-    public static int copyStream(final InputStream ist, final OutputStream ost, final int length, int blockSize) throws IOException {

-

-        int cbCopied = 0;

-        if (blockSize <= 0) {

-            blockSize = DEF_BLOCK_SIZE;

-        }

-

-        final byte[] block = new byte[blockSize];

-        boolean done = length == 0;

-        while (!done) {

-            try {

-                // determine how many bytes to read

-                final int cbToRead = length == -1 ? block.length : (Math.min(length - cbCopied, block.length));

-                final int cbRead = ist.read(block, 0, cbToRead);

-                if (cbRead == -1) {

-                    done = true;

-                } else {

-                    ost.write(block, 0, cbRead);

-                    cbCopied += cbRead;

-                    done = cbCopied == length;

-                }

-            } catch (final EOFException e) {

-                done = true;

-            }

-        }

-        ost.flush();

-        return cbCopied;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
deleted file mode 100644
index f780514eda..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.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.notification.util;

-

-import java.io.IOException;

-import java.util.Enumeration;

-import java.util.HashMap;

-import java.util.Map;

-

-import javax.servlet.ServletInputStream;

-import javax.servlet.ServletOutputStream;

-import javax.servlet.http.HttpServlet;

-import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-

-/**

- * Receives notification in HTTP request and dispatches it down the wire

- *

- * @version $Rev$ $Date$

- */

-@SuppressWarnings("serial")

-public class NotificationServlet extends HttpServlet {

-    

-    /**

-     * 

-     */

-    private static final long serialVersionUID = 1L;

-    private NotificationServletHandler handler;

-    private NotificationServletStreamHandler servletStreamHandler;

-    

-    public NotificationServlet(NotificationServletHandler handler) {

-        this.handler = handler;

-        this.servletStreamHandler = null;

-    }

-

-    public NotificationServlet(NotificationServletStreamHandler servletStreamHandler) {

-        this.handler = null;

-        this.servletStreamHandler = servletStreamHandler;

-    }

-

-    @Override

-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {

-        HashMap<String, String> headers = new HashMap<String, String>();

-        Enumeration headerNames = request.getHeaderNames();

-        while (headerNames.hasMoreElements()) {

-            String headerName = (String)headerNames.nextElement();

-            headers.put(headerName, request.getHeader(headerName));

-        }

-        if (handler != null) {

-            byte[] requestBody = IOUtils.readFully(request.getInputStream(), request.getContentLength());

-            byte[] handlersResponse = handler.handle(headers, requestBody);

-            if (handlersResponse != null) {

-                response.getOutputStream().write(handlersResponse);

-                response.getOutputStream().flush();

-            }

-        } else {

-            try {

-                servletStreamHandler.handle(headers, request.getInputStream(), request.getContentLength(), response.getOutputStream());

-            } catch(RuntimeException e) {

-                e.printStackTrace();

-            }

-        }

-    }

-    

-    public interface NotificationServletHandler {

-        byte[] handle(Map<String, String> headers, byte[] payload);

-    }

-    

-    public interface NotificationServletStreamHandler {

-        void handle(Map<String, String> headers, ServletInputStream istream, int contentLength, ServletOutputStream ostream);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
deleted file mode 100644
index 42ccd5cdac..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.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.notification.util;

-

-import java.net.URI;

-

-/**

- * @version $Rev$ $Date$

- */

-public class URIUtil {

-

-    public static String getPath(URI uri) {

-        String path = null;

-        

-        if (uri.isOpaque()) {

-            path = "/" + uri.getSchemeSpecificPart();

-        } else if (uri.isAbsolute()) {

-            path = uri.getPath();

-        } else {

-            path = "/" + uri.getPath();

-        }

-        

-        return path;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 5e5ce97054..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/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 ExtensionActivator

-org.apache.tuscany.sca.binding.notification.NotificationBindingModuleActivator

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
deleted file mode 100644
index 3d328339a7..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.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.notification.encoding;

-

-import java.io.ByteArrayInputStream;

-import java.io.StringWriter;

-

-import junit.framework.TestCase;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.impl.builder.StAXOMBuilder;

-import org.junit.Assert;

-

-public class AxiomTestCase extends TestCase {

-

-    private static String wsnt = "http://docs.oasis-open.org/wsn/b-2";

-    private static String wsa = "http://schemas.xmlsoap.org/ws/2004/08/addressing";

-    private static String testUrl1 = "http://localhost:8081/test";

-    private static String testUrl2 = "http://localhost:8082/test";

-    private static String testNewProducerResponse =

-        "<wsnt:NewProducerResponse xmlns:wsnt=\"" + wsnt + "\" ConsumerSequenceType=\"EndConsumers\">" +

-            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-        "</wsnt:NewProducerResponse>";

-    

-    public void testAxiom() {

-        try {

-            StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(testNewProducerResponse.getBytes()));

-            OMElement element = builder.getDocumentElement();

-            Assert.assertNotNull(element);

-            

-            StringWriter sw = new StringWriter();

-            element.serialize(sw);

-            sw.flush();

-            Assert.assertEquals(sw.toString(),testNewProducerResponse);

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
deleted file mode 100644
index 3dcd2b9b00..0000000000
--- a/tags/java/sca/1.3/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.binding.notification.encoding;

-

-import java.io.StringReader;

-import java.io.StringWriter;

-import java.util.Iterator;

-

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class EncodingTestCase extends TestCase {

-    

-    private static String wsnt = "http://docs.oasis-open.org/wsn/b-2";

-    private static String wsa = "http://schemas.xmlsoap.org/ws/2004/08/addressing";

-    private static String testUrl = "http://localhost:8080/test";

-    private static String testUrl1 = "http://localhost:8081/test";

-    private static String testUrl2 = "http://localhost:8082/test";

-    private static String bid1 = "UUID1";

-    private static String bid2 = "UUID2";

-    private static String testSubscribe =

-        "<wsnt:Subscribe xmlns:wsnt=\"" + wsnt + "\">" +

-            "<wsnt:ConsumerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl + "</wsa:Address>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:ConsumerReference>" +

-        "</wsnt:Subscribe>";

-    private static String testNewConsumerResponse =

-        "<wsnt:NewConsumerResponse xmlns:wsnt=\"" + wsnt + "\" ProducerSequenceType=\"EndProducers\">" +

-            "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl + "</wsa:Address>" +

-            "</wsa:EndpointReference>" +

-        "</wsnt:NewConsumerResponse>";

-    private static String testNewProducerResponse =

-        "<wsnt:NewProducerResponse xmlns:wsnt=\"" + wsnt + "\" ConsumerSequenceType=\"EndConsumers\">" +

-            "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-            "</wsa:EndpointReference>" +

-            "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-            "</wsa:EndpointReference>" +

-        "</wsnt:NewProducerResponse>";

-    private static String testNoProducersResponse =

-        "<wsnt:NewConsumerResponse xmlns:wsnt=\"" + wsnt + "\" ProducerSequenceType=\"NoProducers\" />";

-    private static String testNewBroker =

-        "<wsnt:NewBroker xmlns:wsnt=\"" + wsnt + "\">" +

-            "<wsnt:BrokerConsumerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-                    "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                        "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid1 + "</wsnt:BrokerID>" +

-                    "</wsa:ReferenceProperties>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:BrokerConsumerReference>" +

-            "<wsnt:BrokerProducerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-                    "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                        "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid2 + "</wsnt:BrokerID>" +

-                    "</wsa:ReferenceProperties>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:BrokerProducerReference>" +

-        "</wsnt:NewBroker>";

-    private static String testNewBrokerResponse1 =

-        "<wsnt:NewBrokerResponse xmlns:wsnt=\"" + wsnt + "\" FirstBroker=\"true\">" +

-            "<wsnt:EndConsumers xmlns:wsnt=\"" + wsnt + "\" ConsumerSequenceType=\"EndConsumers\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-                "</wsa:EndpointReference>" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:EndConsumers>" +

-            "<wsnt:EndProducers xmlns:wsnt=\"" + wsnt + "\" ProducerSequenceType=\"NoProducers\" />" +

-        "</wsnt:NewBrokerResponse>";

-    private static String testNewBrokerResponse2 =

-        "<wsnt:NewBrokerResponse xmlns:wsnt=\"" + wsnt + "\" FirstBroker=\"false\">" +

-            "<wsnt:Brokers xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsnt:Broker xmlns:wsnt=\"" + wsnt + "\">" +

-                    "<wsnt:BrokerConsumerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                        "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-                            "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                                "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid1 + "</wsnt:BrokerID>" +

-                            "</wsa:ReferenceProperties>" +

-                        "</wsa:EndpointReference>" +

-                    "</wsnt:BrokerConsumerReference>" +

-                    "<wsnt:BrokerProducerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                        "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-                            "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                                "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid2 + "</wsnt:BrokerID>" +

-                            "</wsa:ReferenceProperties>" +

-                        "</wsa:EndpointReference>" +

-                    "</wsnt:BrokerProducerReference>" +

-                "</wsnt:Broker>" +

-            "</wsnt:Brokers>" +

-        "</wsnt:NewBrokerResponse>";

-    private static String testRemoveBroker =

-        "<wsnt:RemoveBroker xmlns:wsnt=\"" + wsnt + "\">" +

-            "<wsnt:BrokerConsumerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl + "</wsa:Address>" +

-                    "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                        "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid1 + "</wsnt:BrokerID>" +

-                    "</wsa:ReferenceProperties>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:BrokerConsumerReference>" +

-            "<wsnt:NeighborBrokerConsumers xmlns:wsnt=\"" + wsnt + "\" ConsumerSequenceType=\"BrokerConsumers\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-                "</wsa:EndpointReference>" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:NeighborBrokerConsumers>" +

-        "</wsnt:RemoveBroker>";

-    private static String testReplaceBrokerConnection =

-        "<wsnt:ReplaceBrokerConnection xmlns:wsnt=\"" + wsnt + "\">" +

-            "<wsnt:RemovedBroker xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                    "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl + "</wsa:Address>" +

-                    "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                        "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid1 + "</wsnt:BrokerID>" +

-                    "</wsa:ReferenceProperties>" +

-                "</wsa:EndpointReference>" +

-            "</wsnt:RemovedBroker>" +

-            "<wsnt:Neighbors xmlns:wsnt=\"" + wsnt + "\">" +

-                "<wsnt:Broker xmlns:wsnt=\"" + wsnt + "\">" +

-                    "<wsnt:BrokerConsumerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                        "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl1 + "</wsa:Address>" +

-                            "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                                "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid1 + "</wsnt:BrokerID>" +

-                            "</wsa:ReferenceProperties>" +

-                        "</wsa:EndpointReference>" +

-                    "</wsnt:BrokerConsumerReference>" +

-                    "<wsnt:BrokerProducerReference xmlns:wsnt=\"" + wsnt + "\">" +

-                        "<wsa:EndpointReference xmlns:wsa=\"" + wsa + "\">" +

-                            "<wsa:Address xmlns:wsa=\"" + wsa + "\">" + testUrl2 + "</wsa:Address>" +

-                            "<wsa:ReferenceProperties xmlns:wsa=\"" + wsa + "\">" +

-                                "<wsnt:BrokerID xmlns:wsnt=\"" + wsnt + "\">" + bid2 + "</wsnt:BrokerID>" +

-                            "</wsa:ReferenceProperties>" +

-                        "</wsa:EndpointReference>" +

-                    "</wsnt:BrokerProducerReference>" +

-                "</wsnt:Broker>" +

-            "</wsnt:Neighbors>" +

-        "</wsnt:ReplaceBrokerConnection>";

-    

-    public void testSubscribe() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        SubscribeEnDeCoder sed = new SubscribeEnDeCoder(der);

-        sed.start();

-        ConsumerReferenceEnDeCoder cred = new ConsumerReferenceEnDeCoder(der);

-        cred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testSubscribe));

-        reader.next();

-        Subscribe subscribe = (Subscribe)der.decode(reader);

-        Assert.assertEquals(subscribe.getConsumerReference().getReference().getEndpointAddress().getAddress().toString(), testUrl);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(subscribe, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testSubscribe);

-    }

-    

-    public void testNewConsumerResponse() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewConsumerResponseEnDeCoder ncred = new NewConsumerResponseEnDeCoder(der);

-        ncred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNewConsumerResponse));

-        reader.next();

-        NewConsumerResponse newConsumerResponse = (NewConsumerResponse)der.decode(reader);

-        Assert.assertEquals(newConsumerResponse.getSequenceType(), "EndProducers");

-        Assert.assertEquals(newConsumerResponse.getReferenceSequence().iterator().next().getEndpointAddress().getAddress().toString(),

-                            testUrl);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newConsumerResponse, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNewConsumerResponse);

-    }

-    

-    public void testNoProducersResponse() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewConsumerResponseEnDeCoder ncred = new NewConsumerResponseEnDeCoder(der);

-        ncred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNoProducersResponse));

-        reader.next();

-        NewConsumerResponse newConsumerResponse = (NewConsumerResponse)der.decode(reader);

-        Assert.assertEquals(newConsumerResponse.getSequenceType(), "NoProducers");

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newConsumerResponse, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNoProducersResponse);

-    }

-    

-    public void testNewProducerResponse() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewProducerResponseEnDeCoder npred = new NewProducerResponseEnDeCoder(der);

-        npred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNewProducerResponse));

-        reader.next();

-        NewProducerResponse newProducerResponse = (NewProducerResponse)der.decode(reader);

-        Assert.assertEquals(newProducerResponse.getSequenceType(), "EndConsumers");

-        Iterator<EndpointReference> it = newProducerResponse.getReferenceSequence().iterator();

-        it.next();

-        Assert.assertEquals(it.next().getEndpointAddress().getAddress().toString(), testUrl2);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newProducerResponse, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNewProducerResponse);

-    }

-

-    public void testNewBroker() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewBrokerEnDeCoder nbed = new NewBrokerEnDeCoder(der);

-        nbed.start();

-        BrokerConsumerReferenceEnDeCoder bcred = new BrokerConsumerReferenceEnDeCoder(der);

-        bcred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        ReferencePropertiesEnDeCoder rped = new ReferencePropertiesEnDeCoder(der); 

-        rped.start();

-        BrokerIDEnDeCoder bied = new BrokerIDEnDeCoder(der);

-        bied.start();

-        BrokerProducerReferenceEnDeCoder bpred = new BrokerProducerReferenceEnDeCoder(der);

-        bpred.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNewBroker));

-        reader.next();

-        NewBroker newBroker = (NewBroker)der.decode(reader);

-        Assert.assertEquals(newBroker.getBrokerConsumerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl1);

-        Assert.assertEquals(newBroker.getBrokerProducerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl2);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newBroker, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNewBroker);

-    }

-

-    public void testNewBrokerRespnse1() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewBrokerResponseEnDeCoder nbred = new NewBrokerResponseEnDeCoder(der);

-        nbred.start();

-        EndProducersEnDeCoder epred = new EndProducersEnDeCoder(der);

-        epred.start();

-        EndConsumersEnDeCoder ecred = new EndConsumersEnDeCoder(der);

-        ecred.start();

-        EndpointReferenceEnDeCoder ered = new EndpointReferenceEnDeCoder(der);

-        ered.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNewBrokerResponse1));

-        reader.next();

-        NewBrokerResponse newBrokerResponse = (NewBrokerResponse)der.decode(reader);

-        Assert.assertFalse(!newBrokerResponse.isFirstBroker());

-        Assert.assertEquals(newBrokerResponse.getEndProducers().getSequenceType(), "NoProducers");

-        Assert.assertEquals(newBrokerResponse.getEndConsumers().getSequenceType(), "EndConsumers");

-        Assert.assertEquals(newBrokerResponse.getEndConsumers().getReferenceSequence().get(0).getEndpointAddress().getAddress().toString(),

-                            testUrl1);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newBrokerResponse, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNewBrokerResponse1);

-    }

-

-    public void testNewBrokerRespnse2() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        NewBrokerResponseEnDeCoder nbred = new NewBrokerResponseEnDeCoder(der);

-        nbred.start();

-        BrokersEnDeCoder bsed = new BrokersEnDeCoder(der);

-        bsed.start();

-        BrokerEnDeCoder bed = new BrokerEnDeCoder(der);

-        bed.start();

-        BrokerConsumerReferenceEnDeCoder bcred = new BrokerConsumerReferenceEnDeCoder(der);

-        bcred.start();

-        BrokerProducerReferenceEnDeCoder bpred = new BrokerProducerReferenceEnDeCoder(der);

-        bpred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        ReferencePropertiesEnDeCoder rped = new ReferencePropertiesEnDeCoder(der); 

-        rped.start();

-        BrokerIDEnDeCoder bied = new BrokerIDEnDeCoder(der);

-        bied.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testNewBrokerResponse2));

-        reader.next();

-        NewBrokerResponse newBrokerResponse = (NewBrokerResponse)der.decode(reader);

-        Assert.assertFalse(newBrokerResponse.isFirstBroker());

-        Assert.assertEquals(newBrokerResponse.getBrokers().getBrokerSequence().get(0)

-                            .getBrokerConsumerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl1);

-        Assert.assertEquals(newBrokerResponse.getBrokers().getBrokerSequence().get(0)

-                            .getBrokerProducerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl2);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(newBrokerResponse, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testNewBrokerResponse2);

-    }

-

-    public void testRemoveBroker() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        RemoveBrokerEnDeCoder rbed = new RemoveBrokerEnDeCoder(der);

-        rbed.start();

-        BrokerConsumerReferenceEnDeCoder bcred = new BrokerConsumerReferenceEnDeCoder(der);

-        bcred.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        ReferencePropertiesEnDeCoder rped = new ReferencePropertiesEnDeCoder(der); 

-        rped.start();

-        BrokerIDEnDeCoder bied = new BrokerIDEnDeCoder(der);

-        bied.start();

-        NeighborBrokerConsumersEnDeCoder nbced = new NeighborBrokerConsumersEnDeCoder(der);

-        nbced.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testRemoveBroker));

-        reader.next();

-        RemoveBroker removeBroker = (RemoveBroker)der.decode(reader);

-        Assert.assertEquals(removeBroker.getBrokerConsumerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl);

-        NeighborBrokerConsumers neighborBrokerConsumers = removeBroker.getNeighborBrokerConsumers();

-        Assert.assertEquals(neighborBrokerConsumers.getSequenceType(), "BrokerConsumers");

-        Iterator<EndpointReference> it = neighborBrokerConsumers.getReferenceSequence().iterator();

-        it.next();

-        Assert.assertEquals(it.next().getEndpointAddress().getAddress().toString(), testUrl2);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(removeBroker, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testRemoveBroker);

-    }

-

-    public void testReplaceBrokerConnection() throws Exception {

-        DefaultEncodingRegistry der = new DefaultEncodingRegistry();

-        ReplaceBrokerConnectionEnDeCoder rbced = new ReplaceBrokerConnectionEnDeCoder(der);

-        rbced.start();

-        RemovedBrokerEnDeCoder rbed = new RemovedBrokerEnDeCoder(der);

-        rbed.start();

-        EndpointReferenceEnDeCoder epred = new EndpointReferenceEnDeCoder(der);

-        epred.start();

-        EndpointAddressEnDeCoder eaed = new EndpointAddressEnDeCoder(der);

-        eaed.start();

-        ReferencePropertiesEnDeCoder rped = new ReferencePropertiesEnDeCoder(der); 

-        rped.start();

-        BrokerIDEnDeCoder bied = new BrokerIDEnDeCoder(der);

-        bied.start();

-        BrokerEnDeCoder bed = new BrokerEnDeCoder(der);

-        bed.start();

-        BrokerConsumerReferenceEnDeCoder bcred = new BrokerConsumerReferenceEnDeCoder(der);

-        bcred.start();

-        BrokerProducerReferenceEnDeCoder bpred = new BrokerProducerReferenceEnDeCoder(der);

-        bpred.start();

-        NeighborsEnDeCoder nced = new NeighborsEnDeCoder(der);

-        nced.start();

-        

-        XMLInputFactory xif = XMLInputFactory.newInstance();

-        XMLStreamReader reader = xif.createXMLStreamReader(new StringReader(testReplaceBrokerConnection));

-        reader.next();

-        ReplaceBrokerConnection replaceBrokerConnection = (ReplaceBrokerConnection)der.decode(reader);

-        Assert.assertEquals(replaceBrokerConnection.getRemovedBroker().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl);

-        Neighbors neighbors = replaceBrokerConnection.getNeighbors();

-        Assert.assertEquals(neighbors.getBrokerSequence().get(0)

-                            .getBrokerConsumerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl1);

-        Assert.assertEquals(neighbors.getBrokerSequence().get(0)

-                            .getBrokerProducerReference().getReference().getEndpointAddress().getAddress().toString(),

-                            testUrl2);

-        

-        XMLOutputFactory xof = XMLOutputFactory.newInstance();

-        StringWriter testWriter = new StringWriter();

-        XMLStreamWriter writer = xof.createXMLStreamWriter(testWriter);

-        der.encode(replaceBrokerConnection, writer);

-        writer.flush();

-        String encoded = testWriter.toString();

-        Assert.assertEquals(encoded, testReplaceBrokerConnection);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/binding-rmi/LICENSE b/tags/java/sca/1.3/modules/binding-rmi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/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/tags/java/sca/1.3/modules/binding-rmi/NOTICE b/tags/java/sca/1.3/modules/binding-rmi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/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/tags/java/sca/1.3/modules/binding-rmi/pom.xml b/tags/java/sca/1.3/modules/binding-rmi/pom.xml
deleted file mode 100644
index 85f13cfbc7..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-rmi</artifactId>
-    <name>Apache Tuscany SCA RMI Binding Extension</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extension-helper</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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.rmi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.rmi*</Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
deleted file mode 100644
index 906e0df652..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.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.rmi;
-
-import org.apache.tuscany.sca.extension.helper.utils.AbstractBinding;
-
-/**
- * Represents a binding to an RMI service.
- *
- * @version $Rev$ $Date$
- */
-public class RMIBinding extends AbstractBinding {
-
-    private String host;
-    private String port;
-    private String serviceName;
-
-    /**
-     * @return the host name of the RMI Service
-     */
-    public String getHost() {
-        return host;
-    }
-
-    /**
-     * @param rmiHostName the hostname of the RMI Service
-     */
-    public void setHost(String rmiHostName) {
-        this.host = rmiHostName;
-    }
-
-    /**
-     * @return the port number for the RMI Service
-     */
-    public String getPort() {
-        return port;
-    }
-
-    /**
-     * @param rmiPort the port number for the RMI Service
-     */
-    public void setPort(String rmiPort) {
-        this.port = rmiPort;
-    }
-
-    /**
-     * @return returns the RMI Service Name
-     */
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    /**
-     * Sets the service name for the RMI Server
-     * 
-     * @param rmiServiceName the name of the RMI service
-     */
-    public void setServiceName(String rmiServiceName) {
-        this.serviceName = rmiServiceName;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java b/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java
deleted file mode 100644
index 1be70f57f7..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.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.rmi;
-
-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.rmi.ExtensibleRMIHost;
-import org.apache.tuscany.sca.host.rmi.RMIHost;
-import org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Binding Activator for the RMI Binding.
- *
- * @version $Rev$ $Date$
- */
-public class RMIBindingActivator implements BindingActivator<RMIBinding> {
-
-    private RMIHost rmiHost;
-
-    public RMIBindingActivator(RMIHostExtensionPoint rmiHosts) {
-        this.rmiHost = new ExtensibleRMIHost(rmiHosts);
-    }
-
-    public Class<RMIBinding> getBindingClass() {
-        return RMIBinding.class;
-    }
-
-    public InvokerFactory createInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, RMIBinding binding) {
-        return new RMIReferenceInvokerFactory(rc, rcr, binding, rmiHost);
-    }
-
-    public ComponentLifecycle createService(RuntimeComponent rc, RuntimeComponentService rcs, Binding b, RMIBinding binding) {
-        return new RMIService(rc, rcs, binding, rmiHost);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java b/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java
deleted file mode 100644
index 069ed4a070..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.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.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-
-import org.apache.tuscany.sca.host.rmi.RMIHost;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-
-/**
- * Invoker for RMI References.
- *
- * @version $Rev$ $Date$
- */
-public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics {
-
-    private RMIHost rmiHost;
-    private String host;
-    private String port;
-    private String svcName;
-    private Method remoteMethod;
-    private Remote proxy;
-
-    public RMIReferenceInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) {
-        this.rmiHost = rmiHost;
-        this.remoteMethod = remoteMethod;
-        this.host = host;
-        this.port = port;
-        this.svcName = svcName;
-    }
-
-    public Message invoke(Message msg) {
-        try {
-
-            Object[] args = msg.getBody();
-            Object resp = invokeTarget(args);
-            msg.setBody(resp);
-    
-        } catch (InvocationTargetException e) {
-            msg.setFaultBody(e.getCause());
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-
-        return msg;
-    }
-
-    public Object invokeTarget(final Object payload) throws InvocationTargetException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException {
-        if (proxy == null) {
-            proxy = rmiHost.findService(host, port, svcName);
-            // proxy = Naming.lookup(serviceURI);
-        }
-
-        remoteMethod = proxy.getClass().getMethod(remoteMethod.getName(), remoteMethod.getParameterTypes());
-
-        if (payload != null && !payload.getClass().isArray()) {
-            return remoteMethod.invoke(proxy, payload);
-        } else {
-            return remoteMethod.invoke(proxy, (Object[])payload);
-        }
-    }
-
-    public boolean allowsPassByReference() {
-        // RMI always pass by value
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java b/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java
deleted file mode 100644
index c67bd910ba..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.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.rmi;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.host.rmi.RMIHost;
-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.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * InvokerFactory that creates RMIReferenceInvoker instances for the
- * RMIBinding.
- *
- * @version $Rev$ $Date$
- */
-public class RMIReferenceInvokerFactory implements InvokerFactory {
-
-    RuntimeComponentReference reference;
-    RMIHost rmiHost;
-    RMIBinding binding;
-
-    public RMIReferenceInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, RMIBinding binding, RMIHost rmiHost) {
-        this.reference = rcr;
-        this.rmiHost = rmiHost;
-        this.binding = binding;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        try {
-
-            Class<?> iface = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass();
-            Method remoteMethod = JavaInterfaceUtil.findMethod(iface, operation);
-
-            return new RMIReferenceInvoker(rmiHost, binding.getHost(), binding.getPort(), binding.getServiceName(), remoteMethod);
-
-        } catch (NoSuchMethodException e) {
-            throw new ServiceRuntimeException(operation.toString(), e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java b/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java
deleted file mode 100644
index 4d5278b49c..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.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.rmi;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-import java.rmi.server.UnicastRemoteObject;
-
-import net.sf.cglib.asm.ClassWriter;
-import net.sf.cglib.asm.Constants;
-import net.sf.cglib.asm.Type;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-import org.apache.tuscany.sca.extension.helper.ComponentLifecycle;
-import org.apache.tuscany.sca.host.rmi.RMIHost;
-import org.apache.tuscany.sca.host.rmi.RMIHostException;
-import org.apache.tuscany.sca.interfacedef.Interface;
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Implementation of a Service for the RMIBinding.
- *
- * @version $Rev$ $Date$
- */
-public class RMIService implements ComponentLifecycle {
-
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private RMIBinding binding;
-    private RMIHost rmiHost;
-    private RuntimeWire wire;
-
-    public RMIService(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) {
-        this.component = rc;
-        this.service = rcs;
-        this.binding = binding;
-        this.rmiHost = rmiHost;
-    }
-
-    public void start() {
-        // URI uri = URI.create(component.getURI() + "/" + binding.getName());
-        // binding.setURI(uri.toString());
-
-        wire = service.getRuntimeWire(binding);
-        Interface serviceInterface = service.getInterfaceContract().getInterface();
-
-        Remote rmiProxy = createRmiService(serviceInterface);
-
-        try {
-
-            rmiHost.registerService(binding.getServiceName(), getPort(binding.getPort()), rmiProxy);
-
-        } catch (RMIHostException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void stop() {
-    }
-
-    protected int getPort(String port) {
-        int portNumber = RMIHost.RMI_DEFAULT_PORT;
-        if (port != null && port.length() > 0) {
-            portNumber = Integer.decode(port);
-        }
-        return portNumber;
-    }
-
-    protected Remote createRmiService(final Interface serviceInterface) {
-        Enhancer enhancer = new Enhancer();
-        enhancer.setSuperclass(UnicastRemoteObject.class);
-        enhancer.setCallback(new MethodInterceptor() {
-            public Object intercept(Object arg0, Method method, Object[] args, MethodProxy arg3) throws Throwable {
-                try {
-                    return invokeTarget(JavaInterfaceUtil.findOperation(method, serviceInterface.getOperations()), args);
-                } catch (InvocationTargetException e) {
-                    Throwable cause = e.getCause();
-                    for (Class<?> declaredType : method.getExceptionTypes()) {
-                        if (declaredType.isInstance(cause)) {
-                            throw e;
-                        }
-                    }
-                    throw cause;
-                }
-            }
-        });
-        Class targetJavaInterface = getTargetJavaClass(serviceInterface);
-        if (!Remote.class.isAssignableFrom(targetJavaInterface)) {
-            RMIServiceClassLoader classloader = new RMIServiceClassLoader(getClass().getClassLoader());
-            final byte[] byteCode = generateRemoteInterface(targetJavaInterface);
-            targetJavaInterface = classloader.defineClass(byteCode);
-            enhancer.setClassLoader(classloader);
-        }
-        enhancer.setInterfaces(new Class[] {targetJavaInterface});
-        return (Remote)enhancer.create();
-    }
-
-    protected Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException {
-        return wire.invoke(op, args);
-    }
-
-    /**
-     * if the interface of the component whose serviceBindings must be exposed as RMI Service, does not
-     * implement java.rmi.Remote, then generate such an interface. This method will stop with just 
-     * generating the bytecode. Defining the class from the byte code must be the responsibility of the 
-     * caller of this method, since it requires a ClassLoader to be created to define and load this interface.
-     */
-    protected byte[] generateRemoteInterface(Class serviceInterface) {
-        String interfazeName = serviceInterface.getCanonicalName();
-        ClassWriter cw = new ClassWriter(false);
-
-        String simpleName = serviceInterface.getSimpleName();
-        cw.visit(Constants.V1_5, Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT + Constants.ACC_INTERFACE, interfazeName
-            .replace('.', '/'), "java/lang/Object", new String[] {"java/rmi/Remote"}, simpleName + ".java");
-
-        StringBuffer argsAndReturn = null;
-        Method[] methods = serviceInterface.getMethods();
-        for (Method method : methods) {
-            argsAndReturn = new StringBuffer("(");
-            Class[] paramTypes = method.getParameterTypes();
-            Class returnType = method.getReturnType();
-
-            for (Class paramType : paramTypes) {
-                argsAndReturn.append(Type.getType(paramType));
-            }
-            argsAndReturn.append(")");
-            argsAndReturn.append(Type.getType(returnType));
-
-            cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT,
-                           method.getName(),
-                           argsAndReturn.toString(),
-                           new String[] {"java/rmi/RemoteException"},
-                           null);
-        }
-        cw.visitEnd();
-        return cw.toByteArray();
-    }
-
-    protected 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();
-    }
-
-    protected class RMIServiceClassLoader extends ClassLoader {
-        public RMIServiceClassLoader(ClassLoader parent) {
-            super(parent);
-        }
-
-        public Class defineClass(byte[] byteArray) {
-            return defineClass(null, byteArray, 0, byteArray.length);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/tags/java/sca/1.3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
deleted file mode 100644
index 582f321be9..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
+++ /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

-org.apache.tuscany.sca.binding.rmi.RMIBindingActivator

diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloException.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloException.java
deleted file mode 100644
index cbc860ecc6..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloException.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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HelloException extends Exception {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 2570611055132507470L;
-
-    /**
-     * 
-     */
-    public HelloException() {
-    }
-
-    /**
-     * @param message
-     */
-    public HelloException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public HelloException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public HelloException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0a1f4283db..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldImpl.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.osoa.sca.annotations.Service;
-
-
-/**
- * This class implements the HelloWorld service.
- *
- * @version $Rev$ $Date$
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
-    public String sayHello(String name) {
-        return "Hello from the RMI Service to - " + name;
-    }
-    
-    public String sayHi(String name, String greeter) throws HelloException {
-        if (name == null || greeter == null) {
-            throw new HelloException("Invalid name or greeter: name=" + name + " greeter=" + greeter);
-        }
-        return "Hi from " + greeter + " in RMI Service to - " + name;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.java
deleted file mode 100644
index 5b20d17c83..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiImpl.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;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- *
- * @version $Rev$ $Date$
- */
-@Service(HelloWorldRmiService.class)
-public class HelloWorldRmiImpl implements HelloWorldRmiService {
-    private HelloWorldService extService;
-
-    public HelloWorldService getExtService() {
-        return extService;
-    }
-
-    @Reference
-    public void setExtService(HelloWorldService extService) {
-        this.extService = extService;
-    }
-
-    public String sayRmiHello(String name) {
-        return extService.sayHello(name) + " thro the RMI Reference";
-    }
-    
-    public String sayRmiHi(String name, String greeter) throws HelloException {
-        return extService.sayHi(name, greeter) + " thro the RMI Reference";
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.java
deleted file mode 100644
index 461c176e1e..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldRmiService.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;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorldRmiService {
-
-    String sayRmiHello(String name);
-    String sayRmiHi(String name, String greeter) throws HelloException;
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 3b705d2c97..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/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;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorldService {
-
-    String sayHello(String name);
-    String sayHi(String name, String greeter) throws HelloException;
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/tags/java/sca/1.3/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
deleted file mode 100644
index c8a13573d1..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.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.rmi;
-
-import helloworld.HelloException;
-import helloworld.HelloWorldRmiService;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests for the RMIBinding.
- *
- * @version $Rev$ $Date$
- */
-public class BindingTestCase {
-    private static HelloWorldRmiService helloWorldRmiService;
-    private static SCADomain domain;
-
-    @Test
-    public void testRmiService() {
-        String msg = helloWorldRmiService.sayRmiHello("Tuscany World!");
-        System.out.println(msg);
-        Assert.assertEquals("Hello from the RMI Service to - Tuscany World! thro the RMI Reference", msg);
-
-        try {
-            msg = helloWorldRmiService.sayRmiHi("Tuscany World!", "Apache World");
-            System.out.println(msg);
-            Assert.assertEquals("Hi from Apache World in RMI Service to - Tuscany World! thro the RMI Reference", msg);
-        } catch (HelloException e) {
-            Assert.fail(e.getMessage());
-        }
-        try {
-            msg = helloWorldRmiService.sayRmiHi(null, "Apache World");
-            Assert.fail("HelloException should have been thrown");
-        } catch (HelloException e) {
-
-        }
-    }
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            domain = SCADomain.newInstance("RMIBindingTest.composite");
-            helloWorldRmiService = domain.getService(HelloWorldRmiService.class, "HelloWorldRmiServiceComponent");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType b/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
deleted file mode 100644
index 224a68f88d..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldImpl.componentType
+++ /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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="HelloWorldService">
-        <interface.java interface="helloworld.HelloWorldService"/>
-    </service>
-</componentType>
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType b/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
deleted file mode 100644
index a83e7e6d1d..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/HelloWorldRmiImpl.componentType
+++ /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.    
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <service name="HelloWorldRmiService">
-        <interface.java interface="helloworld.HelloWorldRmiService"/>
-    </service>
-	<reference name="extService">
-		<interface.java interface="helloworld.HelloWorldService"/>
-	</reference>
-</componentType>
diff --git a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/RMIBindingTest.composite b/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/RMIBindingTest.composite
deleted file mode 100644
index d29fe85586..0000000000
--- a/tags/java/sca/1.3/modules/binding-rmi/src/test/resources/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 host="localhost" port="8099" serviceName="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 host="localhost" port="8099" serviceName="HelloWorldRemoteService"   />
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/binding-rss-rome/LICENSE b/tags/java/sca/1.3/modules/binding-rss-rome/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/NOTICE b/tags/java/sca/1.3/modules/binding-rss-rome/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss-rome/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/tags/java/sca/1.3/modules/binding-rss-rome/pom.xml b/tags/java/sca/1.3/modules/binding-rss-rome/pom.xml
deleted file mode 100644
index 6707dcb539..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss-rome/pom.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-httpclient</groupId>
-           <artifactId>commons-httpclient</artifactId>
-           <version>3.0.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.4</version> 
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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</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>
-
-
-    <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.rss.rome</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.rss*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
deleted file mode 100644
index bb8dab391b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
deleted file mode 100644
index 2213b50b53..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
deleted file mode 100644
index 0912878938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
deleted file mode 100644
index e3a177198c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
deleted file mode 100644
index 7eb5aeb3df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
deleted file mode 100644
index b9cababcab..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-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.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);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
deleted file mode 100644
index 8a30e9d3fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
deleted file mode 100644
index 4e5429ac83..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index e60dc2855a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
deleted file mode 100644
index 19370285f5..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.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;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Consumer {
-
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/feed/Consumer.composite");
-
-        CustomerClient testService = scaDomain.getService(CustomerClient.class, "CustomerClient");
-        testService.testCustomerCollection();
-
-        scaDomain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
deleted file mode 100644
index af87155f45..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
deleted file mode 100644
index e71156c379..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
deleted file mode 100644
index d45be65e20..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
deleted file mode 100644
index ae7b72834e..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.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 java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Provider {
-
-    public static void main(String[] args) {
-
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/feed/Provider.composite");
-        System.out.println("Provider.composite ready...");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        scaDomain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
deleted file mode 100644
index 43cd5e00b9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/tags/java/sca/1.3/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
deleted file mode 100644
index 5ffcb50eb8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/LICENSE b/tags/java/sca/1.3/modules/binding-rss/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/NOTICE b/tags/java/sca/1.3/modules/binding-rss/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss/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/tags/java/sca/1.3/modules/binding-rss/pom.xml b/tags/java/sca/1.3/modules/binding-rss/pom.xml
deleted file mode 100644
index 12095ce14f..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.rss</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.rss*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
deleted file mode 100644
index 2b4989264c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
deleted file mode 100644
index 3e691e636e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
deleted file mode 100644
index a4e6a8283d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
deleted file mode 100644
index ae9cca1638..0000000000
--- a/tags/java/sca/1.3/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.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.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;
-    }
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-}
diff --git a/tags/java/sca/1.3/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/tags/java/sca/1.3/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
deleted file mode 100644
index 73c47a3f41..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 2d0597ff01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/LICENSE b/tags/java/sca/1.3/modules/binding-sca-axis2/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/NOTICE b/tags/java/sca/1.3/modules/binding-sca-axis2/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/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/tags/java/sca/1.3/modules/binding-sca-axis2/pom.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/pom.xml
deleted file mode 100644
index ee0d664ac7..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/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-modules</artifactId>

-        <version>1.3</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>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</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>org.easymock</groupId>

-            <artifactId>easymock</artifactId>

-            <version>2.2</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>            

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency> 

-               

-        <dependency>

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

-            <artifactId>tuscany-endpoint</artifactId>

-            <version>1.3</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.sca.axis2</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.binding.sca.axis2*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
deleted file mode 100644
index e4bb708a01..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
deleted file mode 100644
index 47359c3484..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.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.sca.axis2.impl;
-
-import java.util.List;
-import java.util.Map;
-
-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 Map<ClassLoader, 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/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
deleted file mode 100644
index 93ad1d30e5..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.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.sca.axis2.impl;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-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.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;
-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.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,
-                                            Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
-
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        ServletHost servletHost = servletHosts.getServletHosts().get(0);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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,
-                                                                         servletHost,
-                                                                         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/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
deleted file mode 100644
index 0ecbf60395..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.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.sca.axis2.impl;
-
-import java.util.List;
-import java.util.Map;
-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.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
-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.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,
-                                          Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
-
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        ServletHost servletHost = servletHosts.getServletHosts().get(0);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
deleted file mode 100644
index 42f7676ecb..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.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.sca.axis2.impl;

-

-import java.util.List;

-import java.util.Map;

-

-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,

-                                   Map<ClassLoader, 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/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 1b369cde06..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
deleted file mode 100644
index 40d64be9b1..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.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.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class AsynchTestCase {

-    

-    public static TestNode nodeA;

-    public static TestNode nodeB;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            nodeA = new TestNode("nodeG");

-            nodeB = new TestNode("nodeH");

-

-            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();

-        nodeB.stop();

-    }    

-    

-    @Test

-    public void testHelloWorldAsynch() throws Exception {        

-        HelloWorldClient helloWorldClientB;

-        helloWorldClientB = nodeA.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
deleted file mode 100644
index b345e563e3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
deleted file mode 100644
index 472e85116e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
deleted file mode 100644
index 76dbc5a5c7..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.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.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class CallbackTestCase {

-    

-    public static TestNode nodeA;

-    public static TestNode nodeB;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            nodeA = new TestNode("nodeE");

-            nodeB = new TestNode("nodeF");

-

-            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();

-        nodeB.stop();

-    } 

-    

-    //@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 = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");

-        Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));  

-    }     

-    

-    @Test

-    public void testHelloWorldCallbackRemote() throws Exception {  

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");

-        Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));

-    }    

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
deleted file mode 100644
index 2deb62e6c4..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.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.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-public class PromotionTestCase {

-    

-    public static TestNode nodeA;

-    public static TestNode nodeB;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            nodeA = new TestNode("nodeC");

-            nodeB = new TestNode("nodeD");

-

-            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();

-        nodeB.stop();

-    }     

-    

-    @Test

-    public void testHelloWorldPromotion() throws Exception {  

-        HelloWorldClient helloWorldClientA;

-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");

-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");

-

-    }      

-  

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
deleted file mode 100644
index 2d2a23d7df..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.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.binding.sca.axis2;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-import org.osoa.sca.ServiceUnavailableException;

-

-public class SimpleTestCase {

-    

-    public static TestNode nodeA;

-    public static TestNode nodeB;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up nodes");

-

-        try {

-            // create and start domains

-            nodeA = new TestNode("nodeA");

-            nodeB = new TestNode("nodeB");

-

-            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();

-        nodeB.stop();

-    }    

-    

-    @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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
deleted file mode 100644
index 770468f147..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.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.sca.axis2;

-

-import java.net.URL;

-import java.util.logging.Logger;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.AssemblyFactory;

-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.SCABinding;

-import org.apache.tuscany.sca.assembly.SCABindingFactory;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;

-import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;

-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.RuntimeComponentContext;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.osoa.sca.ServiceReference;

-import org.osoa.sca.ServiceRuntimeException;

-

-/**

- * The very minimum node implementation to get these tests going without creating a dependency on 

- * any runtime/hosting implementation

- * 

- * @version $Rev: 552343 $ $Date: 2007-09-20 14:53:40 +0100 (Thu, 20 Sep 2007) $

- */

-public class TestNode  {

-    

-    private static final Logger logger = Logger.getLogger(TestNode.class.getName());    

-    

-    private String nodeName;

-    private ReallySmallRuntime nodeRuntime;

-    

-    private ClassLoader cl = TestNode.class.getClassLoader();

-    

-    private Composite nodeComposite = null;

-    private Composite appComposite = null;

-    

-    public TestNode(String nodeName)

-      throws Exception {

-        this.nodeName = nodeName;

-              

-        try {

-

-            // create and start domainA

-            nodeRuntime = new ReallySmallRuntime(cl);

-            nodeRuntime.start();

-                        

-            // Create an in-memory domain level composite

-            AssemblyFactory assemblyFactory = nodeRuntime.getAssemblyFactory();

-            nodeComposite = assemblyFactory.createComposite();

-            nodeComposite.setName(new QName(Constants.SCA10_NS, "domain"));

-            nodeComposite.setURI("http://localhost");

-            

-            // add the top level composite into the composite activator

-            nodeRuntime.getCompositeActivator().setDomainComposite(nodeComposite);                     

-

-            // add a contribution to the domain

-            ContributionService contributionService = nodeRuntime.getContributionService();          

-

-            // find the current directory as a URL. This is where our contribution 

-            // will come from

-            URL contributionURL = Thread.currentThread().getContextClassLoader().getResource(nodeName + "/");

-

-            // Contribute the SCA application

-            Contribution contribution = contributionService.contribute("http://calculator", contributionURL, null, false);

-            appComposite = contribution.getDeployables().get(0);

-

-            // Add the deployable composite to the domain

-            nodeComposite.getIncludes().add(appComposite);

-            nodeRuntime.buildComposite(appComposite);

-            nodeRuntime.getCompositeActivator().activate(appComposite);

-            

-

-        } catch (Exception ex) {

-            System.err.println("Exception when creating node " + ex.getMessage());

-            ex.printStackTrace(System.err);

-            throw ex;

-        }         

-    }

-    

-    public void start() {

-        

-        try {

-            nodeRuntime.getCompositeActivator().start(appComposite);

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-        }         

-        

-    }

-    

-    public void stop() {

-        try {

-            nodeRuntime.stop();

-        } catch (Exception ex) {

-            System.err.println("Exception when creating domain " + ex.getMessage());

-            ex.printStackTrace(System.err);

-        }

-    } 

-    

-    public <B> B getService(Class<B> businessInterface, String serviceName) {

-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);

-        if (serviceReference == null) {

-            throw new ServiceRuntimeException("Service not found: " + serviceName);

-        }

-        return serviceReference.getService();

-    }

-

-    private <B> ServiceReference<B> createServiceReference(Class<B> businessInterface, String targetURI) {

-        try {

-            AssemblyFactory assemblyFactory = nodeRuntime.getAssemblyFactory();

-            Composite composite = assemblyFactory.createComposite();

-            composite.setName(new QName(Constants.SCA10_TUSCANY_NS, "default"));

-            RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent();

-            component.setName("default");

-            component.setURI("default");

-            nodeRuntime.getCompositeActivator().configureComponentContext(component);

-            composite.getComponents().add(component);

-            RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference();

-            reference.setName("default");

-            ModelFactoryExtensionPoint factories =

-                nodeRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);

-            JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class);

-            InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();

-            interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));

-            reference.setInterfaceContract(interfaceContract);

-            component.getReferences().add(reference);

-            reference.setComponent(component);

-            SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);

-            SCABinding binding = scaBindingFactory.createSCABinding();

-            binding.setURI(targetURI);

-            reference.getBindings().add(binding);       

-            return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, nodeRuntime

-                .getProxyFactory(), nodeRuntime.getCompositeActivator());

-        } catch (Exception e) {

-            throw new ServiceRuntimeException(e);

-        }

-    }

-

-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {

-

-        // Extract the component name

-        String componentName;

-        String serviceName;

-        int i = name.indexOf('/');

-        if (i != -1) {

-            componentName = name.substring(0, i);

-            serviceName = name.substring(i + 1);

-

-        } else {

-            componentName = name;

-            serviceName = null;

-        }

-

-        // Lookup the component in the domain

-        

-        Component component = null;

-        

-        for (Composite composite: nodeComposite.getIncludes()) {

-            for (Component componentLoop: composite.getComponents()) {

-                if (componentLoop.getName().equals(componentName)) {

-                    component = componentLoop;

-                    break;

-                }

-            }

-        }        

-        if (component == null) {

-            // The component is not local in the partition, try to create a remote service ref

-            return createServiceReference(businessInterface, name);

-        }

-        RuntimeComponentContext componentContext = null;

-

-        // If the component is a composite, then we need to find the

-        // non-composite component that provides the requested service

-        if (component.getImplementation() instanceof Composite) {

-            for (ComponentService componentService : component.getServices()) {

-                if (serviceName == null || serviceName.equals(componentService.getName())) {

-                    CompositeService compositeService = (CompositeService)componentService.getService();

-                    if (compositeService != null) {

-                        if (serviceName != null) {

-                            serviceName = "$promoted$." + component.getName() + "." + serviceName;

-                        }

-                        componentContext =

-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();

-                        return componentContext.createSelfReference(businessInterface, compositeService

-                            .getPromotedService());

-                    }

-                    break;

-                }

-            }

-            // No matching service is found

-            throw new ServiceRuntimeException("Composite service not found: " + name);

-        } else {

-            componentContext = ((RuntimeComponent)component).getComponentContext();

-            if (serviceName != null) {

-                return componentContext.createSelfReference(businessInterface, serviceName);

-            } else {

-                return componentContext.createSelfReference(businessInterface);

-            }

-        }

-    }

-   

-}

-

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
deleted file mode 100644
index 1a2788ac74..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-@Remotable

-public interface HelloWorldCallbackRemote {

-    

-    String getGreetingsCallbackRemote(String s);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
deleted file mode 100644
index a83fcb3069..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.Remotable;

-

-@Remotable

-@Callback(HelloWorldCallbackRemote.class)

-public interface HelloWorldServiceCallbackOnewayRemote {

-    

-    @OneWay

-    void getGreetingsRemote(String s);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
deleted file mode 100644
index c41548ec51..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Remotable;

-

-@Remotable

-@Callback(HelloWorldCallbackRemote.class)

-public interface HelloWorldServiceCallbackRemote {

-    

-    String getGreetingsRemote(String s);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
deleted file mode 100644
index 62d61e4fff..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-@Remotable

-public interface HelloWorldServiceRemote {

-    

-    String getGreetingsRemote(String s);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
deleted file mode 100644
index 2dcc8cc64b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-@Remotable

-public interface HelloWorldServiceRemote2 {

-    

-    String getGreetingsRemote2(String s);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 8e7d2f8023..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
deleted file mode 100644
index 7d07c4ff43..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
deleted file mode 100644
index 7098f10622..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-

-public class HelloWorldClientLocalImpl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceLocal helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsLocal(s);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
deleted file mode 100644
index 07ae00bd31..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-

-public class HelloWorldClientRemote2Impl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceRemote2 helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsRemote2(s);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
deleted file mode 100644
index 36854cb7b8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-

-public class HelloWorldClientRemoteImpl implements HelloWorldClient {

-

-    @Reference

-    public HelloWorldServiceRemote helloWorldService;

-    

-    public String getGreetings(String s) {

-        return helloWorldService.getGreetingsRemote(s);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
deleted file mode 100644
index fd3e3a1158..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-

-

-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {

-

-    @Callback

-    protected HelloWorldCallbackRemote theCallback;

-

-    public void getGreetingsRemote(String s) {

-        theCallback.getGreetingsCallbackRemote(s);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
deleted file mode 100644
index 3400e97447..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-

-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {

-    

-    @Callback

-    protected HelloWorldCallbackRemote theCallback;

-

-    public String getGreetingsRemote(String s) {

-        return "Hello " + theCallback.getGreetingsCallbackRemote(s);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
deleted file mode 100644
index 5f8ccf9466..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index 5e4fd566c3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
deleted file mode 100644
index 093258051e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
deleted file mode 100644
index 8cf7230ed5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
deleted file mode 100644
index 066727f76d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
deleted file mode 100644
index 485e0815d2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
deleted file mode 100644
index a5a4f04cb5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
deleted file mode 100644
index bf30bdf42d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
deleted file mode 100644
index b519793290..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
deleted file mode 100644
index 20a6c54e6e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
deleted file mode 100644
index a76008d0c5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
deleted file mode 100644
index 0c22af22ab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
deleted file mode 100644
index d6b9e82250..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/binding-sca-xml/LICENSE b/tags/java/sca/1.3/modules/binding-sca-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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/tags/java/sca/1.3/modules/binding-sca-xml/NOTICE b/tags/java/sca/1.3/modules/binding-sca-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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/tags/java/sca/1.3/modules/binding-sca-xml/pom.xml b/tags/java/sca/1.3/modules/binding-sca-xml/pom.xml
deleted file mode 100644
index c3c3ab9872..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-sca-xml</artifactId>
-    <name>Apache Tuscany SCA Default Binding XML Model</name>
-
-    <dependencies>
-
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>      
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </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.sca.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.sca.xml*</Export-Package>
-                        <Import-Package>org.apache.tuscany.sca.binding.sca.impl,*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/tags/java/sca/1.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
deleted file mode 100644
index a3e582c82e..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.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.sca.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.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-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.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.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * A processor to read the XML that describes the SCA binding.
- *
- * @version $Rev$ $Date$
- */
-
-public class SCABindingProcessor implements StAXArtifactProcessor<SCABinding>, Constants{
-    
-    private PolicyFactory policyFactory;       
-    private SCABindingFactory scaBindingFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private IntentAttachPointTypeFactory  intentAttachPointTypeFactory;
-    private Monitor monitor;
-
-    protected static final String BINDING_SCA = "binding.sca";
-    protected static final QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA);
-
-    public SCABindingProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        this.monitor = monitor;
-    }
-
-    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();
-        IntentAttachPointType bindingType = intentAttachPointTypeFactory.createBindingType();
-        bindingType.setName(getArtifactType());
-        bindingType.setUnresolved(true);
-        ((PolicySetAttachPoint)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/tags/java/sca/1.3/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index bc9f9b7d62..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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.SCABindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.sca,model=org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl
diff --git a/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
deleted file mode 100644
index a7c7c15eaa..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.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.apace.tuscany.sca.binding.sca.xml;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-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.SCABinding;
-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.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.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @Override
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        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);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
-        
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-        
-        SCABinding referenceSCABinding = (SCABinding) componentType.getReferences().get(0).getBindings().get(0);
-        assertNotNull(referenceSCABinding);
-        
-        SCABinding serviceSCABinding   = (SCABinding) componentType.getServices().get(0).getBindings().get(0);
-        assertNotNull(serviceSCABinding);     
-
-        //new PrintUtil(System.out).print(componentType);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-        
-        SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
-        SCABinding serviceSCABinding   = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0);
-        
-        Assert.assertNotNull(referenceSCABinding);
-        Assert.assertNotNull(serviceSCABinding);        
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
deleted file mode 100644
index 77c4105575..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.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.apace.tuscany.sca.binding.sca.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.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-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 StAXArtifactProcessor<Object> staxProcessor;
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    public void testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"><service name=\"CalculatorService\"><binding.sca /></service><reference name=\"addService\"><binding.sca /></reference></componentType>",
-                     bos.toString());
-    }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        assertEquals("<?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\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /></service><component name=\"CalculatorServiceComponent\"><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\"><service><binding.sca /></service></component><component name=\"SubtractServiceComponent\" /><component name=\"MultiplyServiceComponent\" /><component name=\"DivideServiceComponent\" /></composite>",
-            bos.toString() );
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca-xml/src/test/resources/Calculator.composite b/tags/java/sca/1.3/modules/binding-sca-xml/src/test/resources/Calculator.composite
deleted file mode 100644
index 9028662d05..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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>
-        <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/tags/java/sca/1.3/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/tags/java/sca/1.3/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
deleted file mode 100644
index f02e7d6fc0..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca-xml/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 class="calculator.CalculatorService" />
-        <binding.sca/>
-  </service>
-
-  <reference name="addService">
-        <interface.java class="calculator.AddService" />
-        <binding.sca/>
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-sca/LICENSE b/tags/java/sca/1.3/modules/binding-sca/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/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/tags/java/sca/1.3/modules/binding-sca/NOTICE b/tags/java/sca/1.3/modules/binding-sca/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/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/tags/java/sca/1.3/modules/binding-sca/pom.xml b/tags/java/sca/1.3/modules/binding-sca/pom.xml
deleted file mode 100644
index aaaa0f4bf3..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-sca</artifactId>
-    <name>Apache Tuscany SCA Default Binding Model</name>
-
-    <dependencies>
-      
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>       
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </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.sca</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.sca*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
deleted file mode 100644
index 167c93e86d..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.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.sca;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.SCABinding;

-

-

-/**

- * Represents an SCA binding used in the distributed runtime.

- * At the moment just provides us with a sensibly named type 

- * against which the distributed sca binding providers can be registered

- * 

- * @version $Rev: 556322 $ $Date: 2007-07-14 19:53:15 +0100 (Sat, 14 Jul 2007) $

- */

-public interface DistributedSCABinding extends Binding {

-    

-    SCABinding getSCABinding();

-    void setSCABinding(SCABinding scaBinding);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
deleted file mode 100644
index bd24d4b14c..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.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;
-
-import java.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-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 related to security
- *
- * @version $Rev$ $Date$
- */
-public class SCABindingDefinitionsProvider implements SCADefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/binding/sca/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-    
-    public SCABindingDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        // Allow privileged access to load resource. Requires RuntimePermssion in security policy.
-        final URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return 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/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
deleted file mode 100644
index c30d65076a..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.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.binding.sca.impl;

-

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;

-

-/**

- * The Distributed SCA binding wrapper for the SCA binding model object. This is currently

- * just used to locate the remote binding extension and pass the SCA binding to the remote

- * extension. It isn't used in the model itself

- * 

- * @version $Rev: 564307 $ $Date: 2007-08-09 18:48:29 +0100 (Thu, 09 Aug 2007) $

- */

-public class DistributedSCABindingImpl implements DistributedSCABinding {

-    

-    private SCABinding scaBinding;

-    

-    /**

-     * Getter for the wrapped sca binding model object

-     * 

-     * @return the sca binding model element

-     */

-    public SCABinding getSCABinding(){

-        return scaBinding;

-    }

-    

-    /**

-     * Setter for the wrapped sca binding model element

-     * 

-     * @param scaBinding the sca binding model element

-     */

-    public void setSCABinding(SCABinding scaBinding){

-        this.scaBinding = scaBinding;

-    }

-

-    

-    // Operation implementations provided to make this class a 

-    // valid Binding

-    

-    /**

-     * Returns the binding URI.

-     * 

-     * @return the binding URI

-     */

-    public String getURI(){

-        return null;

-    }

-

-    /**

-     * 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(){

-        return null;

-    }

-

-    /**

-     * Sets the binding name.

-     * 

-     * @param name the binding name

-     */

-    public void setName(String name){

-    }

-    

-    /**

-     * Returns true if the model element is unresolved.

-     * 

-     * @return true if the model element is unresolved.

-     */

-    public boolean isUnresolved(){

-        return false;

-    }

-

-    /**

-     * Sets whether the model element is unresolved.

-     * 

-     * @param unresolved whether the model element is unresolved

-     */

-    public void setUnresolved(boolean unresolved){

-    }

-    

-    /**

-     * Clone the binding

-     */

-    public Object clone() throws CloneNotSupportedException {

-        return super.clone();

-    }     

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
deleted file mode 100644
index 5c1cefb808..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.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.sca.impl;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-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;
-
-/**
- * The local SCA Binding provider implementation. It is not currently used. 
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCABindingProvider implements ReferenceBindingProvider {
-    
-    private RuntimeComponentReference reference;
-    
-    public RuntimeSCABindingProvider(RuntimeComponent component, RuntimeComponentReference reference, SCABinding binding) {
-        this.reference = reference;
-    }
-    
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return null;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
deleted file mode 100644
index 5dda74f72e..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.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.sca.impl;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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;
-
-/**
- * The factory for creating SCA Binding providers
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCABindingProviderFactory implements BindingProviderFactory<SCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-     
-    } 
-    
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   SCABinding binding) {
-              
-        return  new RuntimeSCAReferenceBindingProvider(extensionPoints, component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               SCABinding binding) {
-        return new RuntimeSCAServiceBindingProvider(extensionPoints, component, service, binding);
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
deleted file mode 100644
index dc61dbded7..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.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.sca.impl;
-
-import java.net.URI;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-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.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-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;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceUnavailableException;
-
-/** 
- * The sca reference binding provider mediates between the twin requirements of 
- * local sca bindings and remote sca bindings. In the local case is does 
- * very little. When the sca binding model is set as being remote (because a 
- * reference target can't be resolved in the current model) this binding will 
- * try and create a remote connection to it
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private static final Logger logger = Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName());
-
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private SCABinding binding;
-    private boolean started = false;
-
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory = null;
-    private ReferenceBindingProvider distributedProvider = null;
-
-    public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,
-                                              RuntimeComponent component,
-                                              RuntimeComponentReference reference,
-                                              SCABinding binding) {
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-
-        // look to see if a distributed SCA binding implementation has
-        // been included on the classpath. This will be needed by the 
-        // provider itself to do it's thing
-        ProviderFactoryExtensionPoint factoryExtensionPoint =
-            extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        distributedProviderFactory =
-            (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                .getProviderFactory(DistributedSCABinding.class);
-
-    }
-
-    public boolean isTargetRemote() {
-        boolean targetIsRemote = false;
-
-        // first look at the target service and see if this has been resolved
-        OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
-
-        // The decision is based on the results of the wiring process in the assembly model
-        // The SCA binding is used to represent unresolved reference targets, i.e. those
-        // reference targets that need resolving at run time. We can tell by lookin if the 
-        // service to which this binding refers is resolved or not. 
-        //
-        // TODO - When a callback is in operation. A callback reference bindings sometimes has to 
-        //        act as though there is a local wire and sometimes as if there is a remote wire
-        //        what are the implications of this here?
-
-        if (optimizableBinding.getTargetComponentService() != null) {
-            if (optimizableBinding.getTargetComponentService().isUnresolved() == true) {
-                targetIsRemote = true;
-            } else {
-                targetIsRemote = false;
-            }
-        } else {
-            // the case where the wire is specified by URI, e.g. callbacks or user specified bindings, and
-            // look at the provided URI to decide whether it is a local or remote case
-            try {
-                URI uri = new URI(binding.getURI());
-                if (uri.isAbsolute()) {
-                    targetIsRemote = true;
-                } else {
-                    targetIsRemote = false;
-                }
-            } catch (Exception ex) {
-                targetIsRemote = false;
-            }
-        }
-        return targetIsRemote;
-    }
-
-    private ReferenceBindingProvider getDistributedProvider() {
-
-        if (isTargetRemote()) {
-            // initialize the remote provider if it hasn't been done already
-            if (distributedProvider == null) {
-                if (!reference.getInterfaceContract().getInterface().isRemotable()) {
-                    throw new IllegalStateException("Reference interface not remotable for component: " + component
-                        .getName()
-                        + " and reference: "
-                        + reference.getName());
-                }
-
-                if (distributedProviderFactory == null) {
-                    throw new IllegalStateException("No distributed SCA binding available for component: " + component
-                        .getName()
-                        + " and reference: "
-                        + reference.getName());
-                }
-
-                // create the remote provider
-                DistributedSCABinding distributedBinding = new DistributedSCABindingImpl();
-                distributedBinding.setSCABinding(binding);
-
-                distributedProvider =
-                    distributedProviderFactory.createReferenceBindingProvider(component, reference, distributedBinding);
-            }
-        }
-
-        return distributedProvider;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().getBindingInterfaceContract();
-        } else {
-            if (reference.getReference() != null) {
-                return reference.getReference().getInterfaceContract();
-            } else {
-                return reference.getInterfaceContract();
-            }
-        }
-    }
-
-    public boolean supportsOneWayInvocation() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().supportsOneWayInvocation();
-        } else {
-            return false;
-        }
-    }
-
-    private Invoker getInvoker(RuntimeWire wire, Operation operation) {
-        EndpointReference target = wire.getTarget();
-        if (target != null) {
-            RuntimeComponentService service = (RuntimeComponentService)target.getContract();
-            if (service != null) { // not a callback wire
-                SCABinding scaBinding = service.getBinding(SCABinding.class);
-                InvocationChain chain =
-                    service.getInvocationChain(scaBinding, wire.getSource().getInterfaceContract(), operation);
-                return chain == null ? null : new SCABindingInvoker(chain);
-            }
-        }
-        return null;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        if (isTargetRemote()) {
-            return getDistributedProvider().createInvoker(operation);
-        } else {
-            RuntimeWire wire = reference.getRuntimeWire(binding);
-            Invoker invoker = getInvoker(wire, operation);
-            if (invoker == null) {
-                throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + component.getName()
-                    + " reference "
-                    + reference.getName()
-                    + " (bindingURI="
-                    + binding.getURI()
-                    + " operation="
-                    + operation.getName()
-                    + ")" );
-            }
-            return invoker;
-        }
-    }
-
-    public void start() {
-        if (started) {
-            return;
-        } else {
-            started = true;
-        }
-
-        if (getDistributedProvider() != null) {
-            distributedProvider.start();
-        }
-    }
-
-    public void stop() {
-        if (!started) {
-            return;
-        } else {
-            started = false;
-        }
-
-        if (getDistributedProvider() != null) {
-            distributedProvider.stop();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
deleted file mode 100644
index a0a3857ff7..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.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.sca.impl;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The sca service binding provider mediates between the twin requirements of 
- * local sca bindings and remote sca bindings. In the local case is does 
- * very little. When the sca binding model is set as being remote this binding will 
- * try and create a remote service endpoint for remote references to connect to 
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
-  
-    private RuntimeComponentService service;
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
-    private ServiceBindingProvider distributedProvider;
-    private DistributedSCABinding distributedBinding;
-    
-    public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
-                                            RuntimeComponent component,
-                                            RuntimeComponentService service,
-                                            SCABinding binding) {
-        this.service = service;
-        // if there is potentially a wire to this service that crosses the node boundary 
-        if (service.getInterfaceContract().getInterface().isRemotable()) {  
-            
-            // look to see if a distributed SCA binding implementation has
-            // been included on the classpath. This will be needed by the 
-            // provider itself to do it's thing
-            ProviderFactoryExtensionPoint factoryExtensionPoint =
-                extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-            distributedProviderFactory =
-                (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                    .getProviderFactory(DistributedSCABinding.class);      
-            
-            // Check the things that will generally be required to set up a 
-            // distributed sca domain reference provider. I.e. make sure that we have a
-            // - distributed implementation of the sca binding available
-            // - remotable interface on the service
-            if (distributedProviderFactory != null) {
-                
-                URI serviceURI = null;
-                try {
-                    serviceURI = new URI(binding.getURI());
-                } catch(Exception ex) {
-                    
-                }
-                
-                if ((serviceURI != null) && (serviceURI.isAbsolute())) {          
-                    
-                    //  create a nested provider to handle the remote case
-                    distributedBinding = new DistributedSCABindingImpl();
-                    distributedBinding.setSCABinding(binding);
-                    
-                    distributedProvider = 
-                        distributedProviderFactory.createServiceBindingProvider(component, service, distributedBinding);
-                    
-                
-                } else {
-                     /* do nothing at the moment as only apps using the node implementation
-                      * will currently have the distributed domain set. 
-                      * 
-                    throw new IllegalStateException("No distributed domain available for component: "+
-                            component.getName() +
-                            " and service: " + 
-                            service.getName());
-                    */
-                }
-            } else {
-                /* do nothing at the moment as all services with remotable interfaces
-                 * are marked as remote
-                throw new IllegalStateException("No distributed SCA binding available for component: "+
-                        component.getName() +
-                        " and service: " + 
-                        service.getName());
-                */
-            }
-        } 
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        if (distributedProvider != null) {
-            return distributedProvider.getBindingInterfaceContract();
-        } else {
-            if (service.getService() != null) {
-                return service.getService().getInterfaceContract();
-            } else {
-                return service.getInterfaceContract();
-            }
-        }
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-    
-    public void start() {
-        if (distributedProvider != null) {
-            distributedProvider.start();
-        }
-    }
-
-    public void stop() {
-        if (distributedProvider != null) {
-            distributedProvider.stop();
-        }
-        
-        if (distributedBinding != null) {
-            // reset the binding URI to null so that if the composite containing the component
-            // with the service/binding is restarted the binding will have the correct URI set
-            SCABinding scaBinding = distributedBinding.getSCABinding();
-            try {
-                URI tempURI = new URI(scaBinding.getURI());
-                if (!tempURI.isAbsolute()){
-                    scaBinding.setURI(null);
-                }
-            } catch (Exception ex){
-                scaBinding.setURI(null);
-            } 
-        }
-        
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
deleted file mode 100644
index ea758823a9..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.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.sca.impl;
-
-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 SCABindingFactoryImpl implements SCABindingFactory {
-    
-    public SCABindingFactoryImpl (){
-        
-    }
-
-    public SCABinding createSCABinding() {
-        return new SCABindingImpl();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
deleted file mode 100644
index c93ddd9503..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.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.sca.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.Extensible;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
-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;
-
-/**
- * The assembly mode object for an SCA binding.
- * 
- * @version $Rev$ $Date$
- */
-public class SCABindingImpl implements SCABinding, Extensible, PolicySetAttachPoint, OptimizableBinding, AutomaticBinding {
-    private String name;
-    private String uri;
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    
-    private Component targetComponent;
-    private ComponentService targetComponentService;
-    private Binding targetBinding;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    private boolean isAutomatic = false;
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    /**
-     * Constructs a new SCA binding.
-     */
-    protected SCABindingImpl() {
-    }
-    
-    // SCA Binding operations
-    
-    /**
-     * Setters for the binding name. Defaults to the
-     * name of the service or reference with which the binding is
-     * associated
-     * 
-     * @return the binding name
-     */
-    public String getName() {
-        return name;
-    }
-    
-    /**
-     * Setter for the binding name
-     * 
-     * @param name the binding name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Getters for the binding URI. The computed URI for the 
-     * service that the reference is targeting or which the service represents
-     * depending on whether the biding is associated with a reference or
-     * service
-     * 
-     * @return the binding URI
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Setter for the binding URI
-     * 
-     * @param uri the binding URI
-     */
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    /**
-     * Returns a list of extension objects contained in this model object.
-     * 
-     * @return a list of extension objects container in this model object
-     */
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-    
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    public boolean isUnresolved() {
-        if (targetComponentService == null){
-            return true;
-        } else {
-            return targetComponentService.isUnresolved();
-        }
-    }
-    
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */    
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    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;
-    }
-    
-    // Wireable binding operations
-
-    /**
-     * @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 void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-
-    public void setIsAutomatic(boolean isAutomatic){
-        this.isAutomatic = isAutomatic;
-    }
-    
-    public boolean getIsAutomatic(){
-        return this.isAutomatic;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
deleted file mode 100644
index 52c0f64fe5..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.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.sca.impl;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-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.DataExchangeSemantics;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SCABindingInvoker implements Interceptor, DataExchangeSemantics {
-    private InvocationChain chain;
-    
-    /**
-     * Construct a SCABindingInvoker that delegates to the service invocaiton chain
-     * @param chain
-     */
-    public SCABindingInvoker(InvocationChain chain) {
-        super();
-        this.chain = chain;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
-     */
-    public Invoker getNext() {
-        return chain.getHeadInvoker();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker)
-     */
-    public void setNext(Invoker next) {
-        // NOOP
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        return getNext().invoke(msg);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.DataExchangeSemantics#allowsPassByReference()
-     */
-    public boolean allowsPassByReference() {
-        return chain.allowsPassByReference();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
deleted file mode 100644
index 4efa03a933..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ /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.binding.sca.impl.SCABindingFactoryImpl

diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 5c6b8e21fc..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/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.impl.RuntimeSCABindingProviderFactory;model=org.apache.tuscany.sca.assembly.SCABinding

diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/tags/java/sca/1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 22c9a64b05..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/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.sca.SCABindingDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/tags/java/sca/1.3/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
deleted file mode 100644
index 8bac9e01c9..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ /dev/null
@@ -1,26 +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:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
- </sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/tags/java/sca/1.3/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
deleted file mode 100644
index ff396566d6..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.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.apace.tuscany.sca.binding.sca;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-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.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
-import org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl;
-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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * SCABindingTestCase
- *
- * @version $Rev$ $Date$
- */
-public class SCABindingTestCase {
-	
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor; 
-    private CompositeModelResolver resolver; 
-    private CompositeBuilder compositeBuilder;
-
-    @Before
-    public void init() throws Exception { 
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        resolver = new CompositeModelResolver(null, null);
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
-        
-    }
-    
-    @Test
-    public void testSCABindingFactory() {
-        SCABindingFactory factory = new SCABindingFactoryImpl();
-        Assert.assertNotNull(factory.createSCABinding());
-    }
-    
-    @Test 
-    public void testBuildModel() {
-    	try{
-	        InputStream is = getClass().getResourceAsStream("/Calculator.composite");      
-	        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-	        Composite composite = (Composite)staxProcessor.read(reader);
-	        
-	        is.close();
-	        Assert.assertNotNull(composite);
-	        
-	        resolver.addModel(composite);
-	       
-	        staxProcessor.resolve(composite, resolver);
-	        
-	        compositeBuilder.build(composite);
-	        
-	        SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
-	        SCABinding serviceSCABinding   = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0);
-	        
-	        Assert.assertNotNull(referenceSCABinding);
-	        Assert.assertNotNull(serviceSCABinding);
-    	} catch (Exception ex) {
-    		Assert.fail(ex.getMessage());
-    	}
-    	
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-sca/src/test/resources/Calculator.composite b/tags/java/sca/1.3/modules/binding-sca/src/test/resources/Calculator.composite
deleted file mode 100644
index 37b26f3d68..0000000000
--- a/tags/java/sca/1.3/modules/binding-sca/src/test/resources/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"

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

-    targetNamespace="http://calc"

-    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"/>

-        <service name="AddService">

-            <interface.java interface="calculator.AddService"/>

-        </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>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/LICENSE b/tags/java/sca/1.3/modules/binding-ws-axis2/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-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/tags/java/sca/1.3/modules/binding-ws-axis2/NOTICE b/tags/java/sca/1.3/modules/binding-ws-axis2/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/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/tags/java/sca/1.3/modules/binding-ws-axis2/pom.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/pom.xml
deleted file mode 100644
index a6ce83a0ea..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-ws-axis2</artifactId>
-    <name>Apache Tuscany SCA Axis2-based WS Binding Extension</name>
-
-    <repositories>
-        <repository>
-            <id>apache.ws</id>
-            <name>Apache WebServices Repository</name>
-            <url>http://ws.zones.apache.org/repository/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-launcher</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-java2wsdl</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-launcher</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xom</groupId>
-                    <artifactId>xom</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-adb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-codegen</artifactId>
-            <version>1.3</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>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.woden</groupId>
-            <artifactId>woden</artifactId>
-            <version>1.0-incubating-M7b</version>
-            <scope>runtime</scope>
-        </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>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version><!-- to keep compatible with older servlet containers -->
-            <scope>provided</scope>
-            <exclusions>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-            </exclusions>            
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>2.0.2</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.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>2.2</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-mtompolicy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.santuario</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>1.5.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.3.03</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-core</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-                <!-- Exclude XmlSchema 1.3.1 -->
-                <exclusion>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-policy</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>                
-                <!-- Exclude XmlSchema 1.3.1 -->
-                <exclusion>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-trust</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>   
-                <exclusion>
-                    <groupId>wsdl4j</groupId>
-                    <artifactId>wsdl4j</artifactId>
-                </exclusion>                                
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion> 
-               <exclusion>
-                    <groupId>backport-util-concurrent</groupId>
-                    <artifactId>backport-util-concurrent</artifactId>
-                </exclusion>  
-                <!-- Exclude XmlSchema 1.3.1 -->
-                <exclusion>
-                    <groupId>org.apache.ws.commons.schema</groupId>
-                    <artifactId>XmlSchema</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>3.0</version>
-        </dependency>         
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-        </dependency>  
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</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.ws.axis2</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws.axis2*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
deleted file mode 100644
index b01707d93e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.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.ws.axis2;
-
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPBody;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.client.OperationClient;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-
-/**
- * Axis2BindingInvoker uses an Axis2 OperationClient to invoke a remote web service
- *
- * @version $Rev$ $Date$
- */
-public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
-
-    private Axis2ServiceClient serviceClient;
-    private QName wsdlOperationName;
-    private Options options;
-    private SOAPFactory soapFactory;
-
-    public static final QName QNAME_WSA_FROM =
-        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM,
-                  AddressingConstants.WSA_DEFAULT_PREFIX);
-
-    public static final String TUSCANY_PREFIX = "tuscany";
-    public static final QName CALLBACK_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
-    public static final QName CONVERSATION_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
-    
-    private List<PolicyHandler> policyHandlerList = null;
-
-    public Axis2BindingInvoker(Axis2ServiceClient serviceClient,
-                               QName wsdlOperationName,
-                               Options options,
-                               SOAPFactory soapFactory,
-                               List<PolicyHandler> policyHandlerList) {
-        this.serviceClient = serviceClient;
-        this.wsdlOperationName = wsdlOperationName;
-        this.options = options;
-        this.soapFactory = soapFactory;
-        this.policyHandlerList = policyHandlerList;
-    }
-
-    private static final QName EXCEPTION = new QName("", "Exception");
-    
-    public Message invoke(Message msg) {
-        try {
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.beforeInvoke(msg);
-            }
-            
-            Object resp = invokeTarget(msg);
-            
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.afterInvoke(msg);
-            }
-            msg.setBody(resp);
-        } catch (AxisFault e) {
-            if (e.getDetail() != null ) {
-                FaultException f = new FaultException(e.getMessage(), e.getDetail(), e);
-                f.setFaultName(e.getDetail().getQName());
-                msg.setFaultBody(f);
-            } else {
-                msg.setFaultBody(e);
-            }
-        } catch (Throwable e) {
-            msg.setFaultBody(e);
-        }
-
-        return msg;
-    }
-
-    protected Object invokeTarget(Message msg) throws AxisFault {
-        final OperationClient operationClient = createOperationClient(msg);
-
-        // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
-        requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
-        requestMC.getOptions().setTimeOutInMilliSeconds(240000L);
-
-        // Allow privileged access to read properties. Requires PropertiesPermission read in
-        // security policy.
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws AxisFault {
-                    operationClient.execute(true);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            operationClient.complete(requestMC);
-            throw (AxisFault)e.getException();
-        }
-
-        MessageContext responseMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
-
-        OMElement response = responseMC.getEnvelope().getBody().getFirstElement();
-
-        // FIXME: [rfeng] We have to pay performance penalty to build the complete OM as the operationClient.complete() will
-        // release the underlying HTTP connection. 
-        // Force the response to be populated, see https://issues.apache.org/jira/browse/TUSCANY-1541
-        if (response != null) {
-            response.build();
-        }
-
-        operationClient.complete(requestMC);
-
-        return response;
-    }
-
-    @SuppressWarnings("deprecation")
-    protected OperationClient createOperationClient(Message msg) throws AxisFault {
-        SOAPEnvelope env = soapFactory.getDefaultEnvelope();
-        Object[] args = (Object[])msg.getBody();
-        if (args != null && args.length > 0) {
-            SOAPBody body = env.getBody();
-            for (Object bc : args) {
-                if (bc instanceof OMElement) {
-                    body.addChild((OMElement)bc);
-                } else {
-                    throw new IllegalArgumentException(
-                                                       "Can't handle mixed payloads between OMElements and other types.");
-                }
-            }
-        }
-        final MessageContext requestMC = new MessageContext();
-        requestMC.setEnvelope(env);
-
-        // Axis2 operationClients can not be shared so create a new one for each request
-        final OperationClient operationClient = serviceClient.getServiceClient().createClient(wsdlOperationName);
-        operationClient.setOptions(options);
-
-        ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
-
-        // set callback endpoint and callback ID for WS-Addressing header
-        EndpointReference fromEPR = null;
-        org.apache.tuscany.sca.runtime.EndpointReference callbackEPR = parameters.getCallbackReference();
-        if (callbackEPR != null) {
-            fromEPR = new EndpointReference(callbackEPR.getBinding().getURI());
-        }
-        Object callbackID = parameters.getCallbackID();
-        if (callbackID != null) {
-            if (fromEPR == null) {
-                fromEPR = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
-            }
-            //FIXME: serialize callback ID to XML in case it is not a string
-            fromEPR.addReferenceParameter(CALLBACK_ID_REFPARM_QN, callbackID.toString());
-        }
-
-        // set conversation ID for WS-Addressing header
-        Object conversationId = parameters.getConversationID();
-        if (conversationId != null) {
-            if (fromEPR == null) {
-                fromEPR = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
-            }
-            //FIXME: serialize conversation ID to XML in case it is not a string
-            fromEPR.addReferenceParameter(CONVERSATION_ID_REFPARM_QN, conversationId.toString());
-        }
-
-        // add WS-Addressing header
-        //FIXME: is there any way to use the Axis2 addressing support for this?
-        if (fromEPR != null) {
-            SOAPEnvelope sev = requestMC.getEnvelope();
-            SOAPHeader sh = sev.getHeader();
-            OMElement epr =
-                EndpointReferenceHelper.toOM(sev.getOMFactory(),
-                                             fromEPR,
-                                             QNAME_WSA_FROM,
-                                             AddressingConstants.Final.WSA_NAMESPACE);
-            sh.addChild(epr);
-            requestMC.setFrom(fromEPR);
-        }
-
-        // if target endpoint was not specified when this invoker was created, 
-        // use dynamically specified target endpoint passed in on this call
-        if (options.getTo() == null) {
-            org.apache.tuscany.sca.runtime.EndpointReference ep = msg.getTo();
-            if (ep != null) {
-                requestMC.setTo(new EndpointReference(ep.getURI()));
-            } else {
-                throw new RuntimeException("Unable to determine destination endpoint");
-            }
-        } else {
-            requestMC.setTo(new EndpointReference(options.getTo().getAddress())); 
-        }
-        
-        // Allow privileged access to read properties. Requires PropertiesPermission read in
-        // security policy.
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws AxisFault {
-                    operationClient.addMessageContext(requestMC);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (AxisFault)e.getException();
-        }
-        return operationClient;
-    }
-    
-    public boolean allowsPassByReference() {
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
deleted file mode 100644
index 83df3481ce..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.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.ws.axis2;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.invocation.MessageFactory;
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Axis2BindingProviderFactory
- *
- * @version $Rev$ $Date$
- */
-
-public class Axis2BindingProviderFactory implements BindingProviderFactory<WebServiceBinding> {
-
-    private ModelFactoryExtensionPoint modelFactories;
-    private ServletHost servletHost;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
-    private DataBindingExtensionPoint dataBindings;
-
-    public Axis2BindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        List<ServletHost> hosts = servletHosts.getServletHosts();
-        if (hosts.isEmpty()) {
-            throw new ServiceRuntimeException("No Servlet host is avaible for HTTP web services");
-        } else {
-            this.servletHost = hosts.get(0);
-        }
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        policyHandlerClassnames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
-        dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   WebServiceBinding binding) {
-        return new Axis2ReferenceBindingProvider(component, reference, binding,
-                                                 servletHost, modelFactories,
-                                                 policyHandlerClassnames, dataBindings);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               WebServiceBinding binding) {
-        return new Axis2ServiceBindingProvider(component, service, binding,
-                                               servletHost, modelFactories,
-                                               policyHandlerClassnames, dataBindings);
-    }
-    
-    public Class<WebServiceBinding> getModelType() {
-        return WebServiceBinding.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
deleted file mode 100644
index 7ea5d65ce9..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.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.ws.axis2;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.OperationClient;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * Axis2OneWayBindingInvoker uses an Axis2 OperationClient to invoke a OneWay remote web service.
- *
- * @version $Rev$ $Date$
- */
-public class Axis2OneWayBindingInvoker extends Axis2BindingInvoker {
-
-    public Axis2OneWayBindingInvoker(Axis2ServiceClient serviceClient,
-                                     QName wsdlOperationName,
-                                     Options options,
-                                     SOAPFactory soapFactory,
-                                     List<PolicyHandler> policyHandlerList) {
-
-        super(serviceClient, wsdlOperationName, options, soapFactory, policyHandlerList);
-    }
-
-    @Override
-    protected Object invokeTarget(Message msg) throws AxisFault {
-        OperationClient operationClient = createOperationClient(msg);
-
-        // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
-        //requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
-        Options opt = requestMC.getOptions();
-        opt.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
-        opt.setUseSeparateListener(true);
-        opt.setProperty(HTTPConstants.AUTO_RELEASE_CONNECTION,Boolean.TRUE);        
-
-        operationClient.execute(false);
-
-        // REVIEW it seems ok to return null
-        return null;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
deleted file mode 100644
index d4e3f47e6d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.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.ws.axis2;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-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.invocation.MessageFactory;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private WebServiceBinding wsBinding;
-    private Axis2ServiceClient axisClient;
-
-    public Axis2ReferenceBindingProvider(RuntimeComponent component,
-                                         RuntimeComponentReference reference,
-                                         WebServiceBinding wsBinding,
-                                         ServletHost servletHost,
-                                         ModelFactoryExtensionPoint modelFactories,
-                                         Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,
-                                         DataBindingExtensionPoint dataBindings) {
-
-        MessageFactory messageFactory = modelFactories.getFactory(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(OMElement.class.getName());
-        }
-
-        axisClient = new Axis2ServiceClient(component, reference, wsBinding, servletHost, messageFactory, policyHandlerClassnames);
-    }
-
-    public void start() {
-        axisClient.start();
-    }
-
-    public void stop() {
-        axisClient.stop();
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return axisClient.createInvoker(operation);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
deleted file mode 100644
index e35972ea00..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.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.ws.axis2;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class Axis2ServiceBindingProvider implements ServiceBindingProvider {
-
-    private WebServiceBinding wsBinding;
-    private Axis2ServiceProvider axisProvider;
-
-    public Axis2ServiceBindingProvider(RuntimeComponent component,
-                                       RuntimeComponentService service,
-                                       WebServiceBinding wsBinding,
-                                       ServletHost servletHost,
-                                       ModelFactoryExtensionPoint modelFactories,
-                                       Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames,
-                                       DataBindingExtensionPoint dataBindings) {
-
-        MessageFactory messageFactory = modelFactories.getFactory(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() + "/" + service.getName());
-        }
-        
-        // Set to use the Axiom data binding
-        InterfaceContract contract = wsBinding.getBindingInterfaceContract();
-        contract.getInterface().resetDataBinding(OMElement.class.getName());
-
-        axisProvider = new Axis2ServiceProvider(component, service, wsBinding, servletHost, messageFactory, policyHandlerClassnames);
-    }
-
-    public void start() {
-        axisProvider.start();                                          
-    }
-
-    public void stop() {
-        axisProvider.stop();
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return wsBinding.getBindingInterfaceContract();
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
deleted file mode 100644
index f972b412b0..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.axis2;
-
-import static org.apache.tuscany.sca.binding.ws.axis2.AxisPolicyHelper.SOAP12_INTENT;
-import static org.apache.tuscany.sca.binding.ws.axis2.AxisPolicyHelper.isIntentRequired;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisEndpoint;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.util.threadpool.ThreadPool;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-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.security.ws.Axis2ConfigParamPolicy;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
-import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class Axis2ServiceClient {
-
-    private RuntimeComponent component;
-    private AbstractContract contract;
-    private WebServiceBinding wsBinding;
-    private ServiceClient serviceClient;
-    Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
-    private List<PolicyHandler> policyHandlerList = new ArrayList<PolicyHandler>();
-
-    public Axis2ServiceClient(RuntimeComponent component,
-                              AbstractContract contract,
-                              WebServiceBinding wsBinding,
-                              ServletHost servletHost,
-                              MessageFactory messageFactory,
-                              Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
-
-        this.component = component;
-        this.contract = contract;
-        this.wsBinding = wsBinding;
-        this.policyHandlerClassnames = policyHandlerClassnames;
-    }
-
-    protected void start() {
-        if (serviceClient == null) {
-            this.serviceClient = createServiceClient();
-        }
-    }
-
-    public ServiceClient getServiceClient() {
-        return serviceClient;
-    }
-    
-    protected void configurePolicy(ConfigurationContext context, PolicySet ps) throws AxisFault {
-        if (ps == null) {
-            return;
-        }
-        for (Object policy : ps.getPolicies()) {
-            if (policy instanceof Axis2ConfigParamPolicy) {
-                Axis2ConfigParamPolicy axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
-                for (Map.Entry<String, OMElement> param : axis2ConfigParamPolicy.getParamElements().entrySet()) {
-                    Parameter configParam = new Parameter(param.getKey(), param.getValue().getFirstElement());
-                    configParam.setParameterElement(param.getValue());
-                    context.getAxisConfiguration().addParameter(configParam);
-                }
-            }
-        }
-    }
-
-    /**
-     * Create an Axis2 ServiceClient
-     */
-    protected ServiceClient createServiceClient() {
-        try {
-            final boolean isRampartRequired = AxisPolicyHelper.isRampartRequired(wsBinding);
-            ConfigurationContext configContext;
-            
-            try {
-                // TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
-                // Allow privileged access to read properties. Requires PropertyPermission read in
-                // security policy.
-                TuscanyAxisConfigurator tuscanyAxisConfigurator =
-                    AccessController.doPrivileged(new PrivilegedExceptionAction<TuscanyAxisConfigurator>() {
-                        public TuscanyAxisConfigurator run() throws AxisFault {
-                            return new TuscanyAxisConfigurator(isRampartRequired);
-                        }
-                    });
-                configContext = tuscanyAxisConfigurator.getConfigurationContext();
-                // deployRampartModule();
-                // configureSecurity();
-            } catch (PrivilegedActionException e) {
-                throw new ServiceRuntimeException(e.getException());
-            }
-
-            createPolicyHandlers();
-            setupPolicyHandlers(policyHandlerList, configContext);
-
-            Definition definition = wsBinding.getWSDLDocument();
-            QName serviceQName = wsBinding.getService().getQName();
-            Port port = wsBinding.getPort();
-            if (port == null) {
-                // service has multiple ports, select one port to use
-                Collection<Port> ports = wsBinding.getService().getPorts().values();
-                for (Port p : ports) {
-                    // look for a SOAP 1.1 port first
-                    if (p.getExtensibilityElements().get(0) instanceof SOAPAddress) {
-                        port = p;
-                        break;
-                    }
-                }
-                if (port == null) {
-                    // no SOAP 1.1 port available, so look for a SOAP 1.2 port
-                    for (Port p : ports) {
-                        if (p.getExtensibilityElements().get(0) instanceof SOAP12Address) {
-                            port = p;
-                            break;
-                        }
-                    }
-                }
-            }
-            AxisService axisService =
-                createClientSideAxisService(definition, serviceQName, port.getName(), new Options());
-
-            HttpClient httpClient = (HttpClient)configContext.getProperty(HTTPConstants.CACHED_HTTP_CLIENT);
-            if (httpClient == null) {
-                MultiThreadedHttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager();
-                HttpConnectionManagerParams connectionManagerParams = new HttpConnectionManagerParams();
-                connectionManagerParams.setDefaultMaxConnectionsPerHost(2);
-                connectionManagerParams.setTcpNoDelay(true);
-                connectionManagerParams.setStaleCheckingEnabled(true);
-                connectionManagerParams.setLinger(0);
-                connectionManager.setParams(connectionManagerParams);
-                httpClient = new HttpClient(connectionManager);
-                configContext.setThreadPool(new ThreadPool(1, 5));
-                configContext.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
-                configContext.setProperty(HTTPConstants.CACHED_HTTP_CLIENT, httpClient);
-            }
-
-            return new ServiceClient(configContext, axisService);
-
-        } catch (AxisFault e) {
-            throw new RuntimeException(e); // TODO: better exception
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * URI resolver implementation for XML schema
-     */
-    public static class URIResolverImpl implements URIResolver {
-        private Definition definition;
-
-        public URIResolverImpl(Definition definition) {
-            this.definition = definition;
-        }
-
-        public org.xml.sax.InputSource resolveEntity(java.lang.String targetNamespace,
-                                                     java.lang.String schemaLocation,
-                                                     java.lang.String baseUri) {
-            try {
-                if (baseUri == null) {
-                    baseUri = definition.getDocumentBaseURI();
-                }
-                URL url = new URL(new URL(baseUri), schemaLocation);
-                return XMLDocumentHelper.getInputSource(url);
-            } catch (IOException e) {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Workaround for https://issues.apache.org/jira/browse/AXIS2-3205
-     * @param definition
-     * @param serviceName
-     * @return
-     */
-    private static Definition getDefinition(Definition definition, QName serviceName) {
-
-        if (serviceName == null) {
-            return definition;
-        }
-
-        if (definition == null) {
-            return null;
-        }
-        Object service = definition.getServices().get(serviceName);
-        if (service != null) {
-            return definition;
-        }
-        for (Object i : definition.getImports().values()) {
-            List<Import> imports = (List<Import>)i;
-            for (Import imp : imports) {
-                Definition d = getDefinition(imp.getDefinition(), serviceName);
-                if (d != null) {
-                    return d;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * This method is copied from AxisService.createClientSideAxisService to
-     * work around http://issues.apache.org/jira/browse/WSCOMMONS-228
-     * 
-     * @param wsdlDefinition
-     * @param wsdlServiceName
-     * @param portName
-     * @param options
-     * @return
-     * @throws AxisFault
-     */
-    @Deprecated
-    public static AxisService createClientSideAxisService(Definition definition,
-                                                          QName serviceName,
-                                                          String portName,
-                                                          Options options) throws AxisFault {
-        Definition def = getDefinition(definition, serviceName);
-        final WSDL11ToAxisServiceBuilder serviceBuilder = new WSDL11ToAxisServiceBuilder(def, serviceName, portName);
-        serviceBuilder.setServerSide(false);
-        // [rfeng] Add a custom resolver to work around WSCOMMONS-228
-        serviceBuilder.setCustomResolver(new URIResolverImpl(def));
-        serviceBuilder.setBaseUri(def.getDocumentBaseURI());
-        // [rfeng]
-        // Allow access to read properties. Requires PropertiesPermission in security policy.
-        AxisService axisService;         
-        try {        
-            axisService = AccessController.doPrivileged(new PrivilegedExceptionAction<AxisService>() {
-                public AxisService run() throws AxisFault {
-                    return serviceBuilder.populateService();
-                }
-            });
-            } catch ( PrivilegedActionException e ) {
-               throw (AxisFault) e.getException();
-            }
-
-        AxisEndpoint axisEndpoint = (AxisEndpoint)axisService.getEndpoints().get(axisService.getEndpointName());
-        options.setTo(new EndpointReference(axisEndpoint.getEndpointURL()));
-        if (axisEndpoint != null) {
-            options.setSoapVersionURI((String)axisEndpoint.getBinding().getProperty(WSDL2Constants.ATTR_WSOAP_VERSION));
-        }
-        return axisService;
-    }
-
-    /*
-    private static <T extends ExtensibilityElement> T getExtensibilityElement(List elements, Class<T> type) {
-        for (Object e : elements) {
-            if (type.isInstance(e)) {
-                return type.cast(e);
-            }
-        }
-        return null;
-    }
-    */
-
-    protected void stop() {
-        if (serviceClient != null) {
-            // close all connections that we have initiated, so that the jetty server
-            // can be restarted without seeing ConnectExceptions
-            HttpClient httpClient =
-                (HttpClient)serviceClient.getServiceContext().getConfigurationContext()
-                    .getProperty(HTTPConstants.CACHED_HTTP_CLIENT);
-            if (httpClient != null)
-                ((MultiThreadedHttpConnectionManager)httpClient.getHttpConnectionManager()).shutdown();
-
-            serviceClient = null;
-        }
-    }
-
-    /**
-     * Create and configure an Axis2BindingInvoker for each operation
-     */
-    protected Invoker createInvoker(Operation operation) {
-        Options options = new Options();
-        EndpointReference epTo = getWSATOEPR(wsBinding);
-        if (epTo != null) {
-            options.setTo(epTo);
-        }
-        options.setProperty(HTTPConstants.CHUNKED, Boolean.FALSE);
-
-        String operationName = operation.getName();
-
-        String soapAction = getSOAPAction(operationName);
-        if (soapAction != null && soapAction.length() > 1) {
-            options.setAction(soapAction);
-        }
-
-        options.setTimeOutInMilliSeconds(30 * 1000); // 30 seconds
-
-        // Allow privileged access to read properties. Requires PropertiesPermission read in
-        // security policy.
-        SOAPFactory soapFactory = AccessController.doPrivileged(new PrivilegedAction<SOAPFactory>() {
-            public SOAPFactory run() {
-                if (requiresSOAP12())
-                    return OMAbstractFactory.getSOAP12Factory();
-                else
-                    return OMAbstractFactory.getSOAP11Factory();
-
-            }
-        });
-        QName wsdlOperationQName = new QName(operationName);
-        if (requiresMTOM())
-        {
-        	options.setProperty(org.apache.axis2.Constants.Configuration.ENABLE_MTOM, org.apache.axis2.Constants.VALUE_TRUE);
-        }
-        Axis2BindingInvoker invoker;
-        if (operation.isNonBlocking()) {
-            invoker = new Axis2OneWayBindingInvoker(this, wsdlOperationQName, options, soapFactory, policyHandlerList);
-        } else {
-            invoker = new Axis2BindingInvoker(this, wsdlOperationQName, options, soapFactory, policyHandlerList);
-        }
-        
-        return invoker;
-    }
-
-    private boolean requiresSOAP12() {
-        return isIntentRequired(wsBinding, SOAP12_INTENT);
-    }
-
-    private boolean requiresMTOM() {
-        return isIntentRequired(wsBinding, AxisPolicyHelper.MTOM_INTENT);
-    }
-
-    protected EndpointReference getWSATOEPR(WebServiceBinding binding) {
-        EndpointReference epr = getEPR(binding);
-        if (epr == null) {
-            epr = getPortLocationEPR(binding);
-        } else if (epr.getAddress() == null || epr.getAddress().length() < 1) {
-            EndpointReference bindingEPR = getPortLocationEPR(binding);
-            if (bindingEPR != null) {
-                epr.setAddress(bindingEPR.getAddress());
-            }
-        }
-        return epr;
-    }
-
-    protected EndpointReference getPortLocationEPR(WebServiceBinding binding) {
-        String ep = null;
-        if (binding.getPort() != null) {
-            List<?> wsdlPortExtensions = binding.getPort().getExtensibilityElements();
-            for (final Object extension : wsdlPortExtensions) {
-                if (extension instanceof SOAPAddress) {
-                    ep = ((SOAPAddress)extension).getLocationURI();
-                    break;
-                }
-                if (extension instanceof SOAP12Address) {
-                    SOAP12Address address = (SOAP12Address)extension;
-                    ep = address.getLocationURI();
-                    break;
-                }
-            }
-        }
-        if(ep == null || ep.equals("")) {
-            ep = binding.getURI();
-        }
-        return ep == null || "".equals(ep) ? null : new EndpointReference(ep);
-    }
-
-    protected org.apache.axis2.addressing.EndpointReference getEPR(WebServiceBinding wsBinding) {
-        if (wsBinding.getEndPointReference() == null) {
-            return null;
-        }
-        try {
-
-            XMLStreamReader parser =
-                XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(wsBinding.getEndPointReference()));
-            StAXOMBuilder builder = new StAXOMBuilder(parser);
-            OMElement omElement = builder.getDocumentElement();
-            org.apache.axis2.addressing.EndpointReference epr = EndpointReferenceHelper.fromOM(omElement);
-            return epr;
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        } catch (FactoryConfigurationError e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    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();
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private void createPolicyHandlers() throws IllegalAccessException, InstantiationException, ClassNotFoundException {
-        if (wsBinding instanceof PolicySetAttachPoint) {
-            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
-            PolicyHandler policyHandler = null;
-            for (PolicySet policySet : policiedBinding.getPolicySets()) {
-                policyHandler = PolicyHandlerUtils.findPolicyHandler(policySet, policyHandlerClassnames);
-                if (policyHandler != null) {
-                    policyHandler.setApplicablePolicySet(policySet);
-                    policyHandlerList.add(policyHandler);
-                }
-            }
-        }
-    }
-
-    private void setupPolicyHandlers(List<PolicyHandler> policyHandlers, ConfigurationContext configContext) {
-        for (PolicyHandler aHandler : policyHandlers) {
-            aHandler.setUp(configContext);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
deleted file mode 100644
index 3b188b0176..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.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.ws.axis2;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.receivers.AbstractInMessageReceiver;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-public class Axis2ServiceInMessageReceiver extends AbstractInMessageReceiver {
-
-    protected Operation operation;
-
-    private Axis2ServiceProvider provider;
-    
-    private List<PolicyHandler> policyHandlerList = null;
-
-    public Axis2ServiceInMessageReceiver(Axis2ServiceProvider provider, Operation operation, List<PolicyHandler> policyHandlerList) {
-        this.provider = provider;
-        this.operation = operation;
-        this.policyHandlerList = policyHandlerList;
-    }
-
-    public Axis2ServiceInMessageReceiver() {
-    }
-
-    @Override
-    public void invokeBusinessLogic(MessageContext inMC) throws AxisFault {
-        try {
-            OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
-            Object[] args = new Object[] {requestOM};
-            
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.beforeInvoke(operation, args, inMC);
-            }
-            
-            provider.invokeTarget(operation, args, inMC);
-            
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.afterInvoke(operation, args, inMC);
-            }
-
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof Exception) {
-                throw AxisFault.makeFault((Exception)t);
-            }
-            throw new RuntimeException(e);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw AxisFault.makeFault(e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
deleted file mode 100644
index 20930666b1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.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.ws.axis2;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class Axis2ServiceInOutSyncMessageReceiver extends AbstractInOutSyncMessageReceiver {
-    private static final Logger logger = Logger.getLogger(Axis2ServiceInOutSyncMessageReceiver.class.getName());
-	
-    protected Operation operation;
-    private List<PolicyHandler> policyHandlerList = null;
-
-    private Axis2ServiceProvider provider;
-
-    public Axis2ServiceInOutSyncMessageReceiver(Axis2ServiceProvider provider, Operation operation, List<PolicyHandler> policyHandlerList) {
-        this.provider = provider;
-        this.operation = operation;
-        this.policyHandlerList = policyHandlerList;
-    }
-
-    public Axis2ServiceInOutSyncMessageReceiver() {
-    }
-
-    @Override
-    public void invokeBusinessLogic(MessageContext inMC, MessageContext outMC) throws AxisFault {
-        try {
-            OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
-            Object[] args = null;
-            	
-            if (requestOM != null) {
-            	args = new Object[] {requestOM};
-            }
-            
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.beforeInvoke(operation, args, inMC);
-            }
-            
-            OMElement responseOM = (OMElement)provider.invokeTarget(operation, args, inMC);
-            
-            for ( PolicyHandler policyHandler : policyHandlerList ) {
-                policyHandler.afterInvoke(operation, args, inMC, responseOM);
-            }
-
-            SOAPEnvelope soapEnvelope = getSOAPFactory(inMC).getDefaultEnvelope();
-            if (null != responseOM ) {
-                soapEnvelope.getBody().addChild(responseOM);
-            }
-            outMC.setEnvelope(soapEnvelope);
-            outMC.getOperationContext().setProperty(Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
-
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof FaultException && ((FaultException)t).getFaultInfo() instanceof OMElement) {
-                OMElement faultDetail = (OMElement)((FaultException)t).getFaultInfo();
-                inMC.setProperty(Constants.FAULT_NAME, faultDetail.getQName().getLocalPart());
-                AxisFault f = new AxisFault(null, e.getMessage(), "faultNode", "faultRole", faultDetail);
-                throw f;
-            }
-            if (t instanceof Exception) {
-                throw AxisFault.makeFault((Exception)t);
-            }
-            logger.log(Level.SEVERE, e.getMessage(), t);
-            throw new ServiceRuntimeException(e);
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, e.getMessage(), e);
-            throw AxisFault.makeFault(e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
deleted file mode 100644
index 263b96d20f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.axis2;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-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 java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Port;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisEndpoint;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.description.WSDLToAxisServiceBuilder;
-import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.axis2.transport.jms.JMSListener;
-import org.apache.axis2.transport.jms.JMSSender;
-import org.apache.axis2.transport.jms.JMSUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceClient.URIResolverImpl;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.invocation.Message;
-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.security.ws.Axis2ConfigParamPolicy;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-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.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaExternal;
-import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.handler.WSHandlerConstants;
-import org.apache.ws.security.handler.WSHandlerResult;
-import org.osoa.sca.ServiceRuntimeException;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class Axis2ServiceProvider {
-    public static final String IMPORT_TAG = "import";
-    public static final String INCLUDE_TAG = "include";
-    
-    private static final Logger logger = Logger.getLogger(Axis2ServiceProvider.class.getName());    
-
-    private RuntimeComponent component;
-    private AbstractContract contract;
-    private WebServiceBinding wsBinding;
-    private ServletHost servletHost;
-    private MessageFactory messageFactory;
-    private ConfigurationContext configContext;
-    private JMSSender jmsSender;
-    private JMSListener jmsListener;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
-    private List<PolicyHandler> policyHandlerList = new ArrayList<PolicyHandler>();
-    private Map<String, Port> urlMap = new HashMap<String, Port>();
-
-    public static final QName QNAME_WSA_ADDRESS =
-        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_ADDRESS);
-    public static final QName QNAME_WSA_FROM =
-        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM);
-    public static final QName QNAME_WSA_REFERENCE_PARAMETERS =
-        new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.EPR_REFERENCE_PARAMETERS);
-
-    private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://www.osoa.org/xmlns/sca/1.0", "transport.jms");
-    private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
-
-    //Schema element names
-    public static final String ELEM_SCHEMA = "schema";
-
-    //Schema URI
-    public static final String NS_URI_XSD_1999 = "http://www.w3.org/1999/XMLSchema";
-    public static final String NS_URI_XSD_2000 = "http://www.w3.org/2000/10/XMLSchema";
-    public static final String NS_URI_XSD_2001 = "http://www.w3.org/2001/XMLSchema";
-
-    //Schema QNames
-    public static final QName Q_ELEM_XSD_1999 = new QName(NS_URI_XSD_1999, ELEM_SCHEMA);
-    public static final QName Q_ELEM_XSD_2000 = new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
-    public static final QName Q_ELEM_XSD_2001 = new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
-    public static final List<QName> XSD_QNAME_LIST =
-        Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
-
-    public Axis2ServiceProvider(RuntimeComponent component,
-                                AbstractContract contract,
-                                WebServiceBinding wsBinding,
-                                ServletHost servletHost,
-                                MessageFactory messageFactory,
-                                Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
-
-        this.component = component; 
-        this.contract = contract; 
-        this.wsBinding = wsBinding;
-        this.servletHost = servletHost;
-        this.messageFactory = messageFactory;
-        this.policyHandlerClassnames = policyHandlerClassnames;
-
-        final boolean isRampartRequired = AxisPolicyHelper.isRampartRequired(wsBinding);
-        try {
-            // TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
-            // Allow privileged access to read properties. Requires PropertyPermission read in
-            // security policy.
-            TuscanyAxisConfigurator tuscanyAxisConfigurator =
-                AccessController.doPrivileged(new PrivilegedExceptionAction<TuscanyAxisConfigurator>() {
-                    public TuscanyAxisConfigurator run() throws AxisFault {
-                        return new TuscanyAxisConfigurator(isRampartRequired);
-                    }
-                });
-            configContext = tuscanyAxisConfigurator.getConfigurationContext();
-            // deployRampartModule();
-            // configureSecurity();
-        } catch (PrivilegedActionException e) {
-            throw new ServiceRuntimeException(e.getException());
-        } catch (AxisFault e) {
-            throw new ServiceRuntimeException(e); // TODO: better exception
-        } 
-
-        configContext.setContextRoot(servletHost.getContextPath());
-
-        // Update port addresses with runtime information, and create a
-        // map from endpoint URIs to WSDL ports that eliminates duplicate
-        // ports for the same endpoint.
-        for (Object port : wsBinding.getService().getPorts().values()) {
-            String portAddress = getPortAddress((Port)port);
-            String endpointURI = computeEndpointURI(portAddress, servletHost);
-            setPortAddress((Port)port, endpointURI);
-            urlMap.put(endpointURI, (Port)port);
-        }
-    }
-
-    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;
-    }
-
-    static void setPortAddress(Port port, String locationURI) {
-        Object ext = port.getExtensibilityElements().get(0);
-        if (ext instanceof SOAPAddress) {
-            ((SOAPAddress)ext).setLocationURI(locationURI);
-        }
-        if (ext instanceof SOAP12Address) {
-            ((SOAP12Address)ext).setLocationURI(locationURI);
-        }
-    }
-
-    private String computeEndpointURI(String uri, ServletHost servletHost) {
-
-        if (uri == null) {
-            return null;
-        }
-
-        // pull out the binding intents to see what sort of transport is required
-        PolicySet transportJmsPolicySet = AxisPolicyHelper.getPolicySet(wsBinding, TRANSPORT_JMS_QUALIFIED_INTENT);
-        if (transportJmsPolicySet != null){
-            if (!uri.startsWith("jms:/")) {
-                uri = "jms:" + uri;
-            }
-            
-            // construct the rest of the URI based on the policy. All the details are put
-            // into the URI here rather than being place directly into the Axis configuration 
-            // as the Axis JMS sender relies on parsing the target URI      
-            Axis2ConfigParamPolicy axis2ConfigParamPolicy = null;
-            for ( Object policy : transportJmsPolicySet.getPolicies() ) {
-                if ( policy instanceof Axis2ConfigParamPolicy ) {
-                    axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
-                    Iterator paramIterator = axis2ConfigParamPolicy.getParamElements().get(DEFAULT_QUEUE_CONNECTION_FACTORY).getChildElements();
-                    
-                    if (paramIterator.hasNext()){
-                        StringBuffer uriParams = new StringBuffer("?");
-                       
-                        while (paramIterator.hasNext()){
-                            OMElement parameter = (OMElement)paramIterator.next();
-                            uriParams.append(parameter.getAttributeValue(new QName("","name")));
-                            uriParams.append("=");
-                            uriParams.append(parameter.getText());
-                            
-                            if (paramIterator.hasNext()){
-                                uriParams.append("&");
-                            }
-                        }
-                        
-                        uri = uri + uriParams;
-                    }
-                }
-            }                     
-        } else {
-            if (!uri.startsWith("jms:")) {
-                uri = servletHost.getURLMapping(uri).toString();
-            }
-        }
-
-        return uri;
-    }
-
-    public void start() {
-
-        try {
-            createPolicyHandlers();
-            for (Map.Entry<String, Port> entry : urlMap.entrySet()) {
-                AxisService axisService = createAxisService(entry.getKey(), entry.getValue());
-                configContext.getAxisConfiguration().addService(axisService);
-            }
-            setupPolicyHandlers(policyHandlerList, configContext);
-          
-            Axis2ServiceServlet servlet = null;
-            for (String endpointURL : urlMap.keySet()) {
-                if (endpointURL.startsWith("http://") || endpointURL.startsWith("/")) {
-                    if (servlet == null) {
-                        servlet = new Axis2ServiceServlet();
-                        servlet.init(configContext);
-                    }
-                    //[nash] configContext.setContextRoot(endpointURL);
-                    servletHost.addServletMapping(endpointURL, servlet);
-                } else if (endpointURL.startsWith("jms")) {
-                    logger.log(Level.INFO,"Axis2 JMS URL=" + endpointURL);
-                    
-                    jmsListener = new JMSListener();
-                    jmsSender = new JMSSender();
-                    ListenerManager listenerManager = configContext.getListenerManager();
-                    TransportInDescription trsIn = configContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_JMS);
-                                    
-                    // get JMS transport parameters from the computed URL
-                    Map<String, String> jmsProps = JMSUtils.getProperties(endpointURL);
-
-                    // collect the parameters used to configure the JMS transport
-                    OMFactory fac = OMAbstractFactory.getOMFactory();
-                    OMElement parms = fac.createOMElement(DEFAULT_QUEUE_CONNECTION_FACTORY, null);                    
-
-                    for ( String key : jmsProps.keySet() ) {
-                        OMElement param = fac.createOMElement("parameter", null);
-                        param.addAttribute( "name", key, null );
-                        param.addChild(fac.createOMText(param, jmsProps.get(key)));
-                        parms.addChild(param);
-                    }
-                    
-                    Parameter queueConnectionFactory = new Parameter(DEFAULT_QUEUE_CONNECTION_FACTORY, parms);
-                    trsIn.addParameter( queueConnectionFactory );
-                    
-                    trsIn.setReceiver(jmsListener);
-
-                    configContext.getAxisConfiguration().addTransportIn( trsIn );
-                    TransportOutDescription trsOut = configContext.getAxisConfiguration().getTransportOut(Constants.TRANSPORT_JMS);
-                    //configContext.getAxisConfiguration().addTransportOut( trsOut );
-                    trsOut.setSender(jmsSender);
-
-                    if (listenerManager == null) {
-                        listenerManager = new ListenerManager();
-                        listenerManager.init(configContext);
-                    }
-                    listenerManager.addListener(trsIn, true);
-                    jmsSender.init(configContext, trsOut);
-                    jmsListener.init(configContext, trsIn);
-                    jmsListener.start();
-                }
-            }
-        } catch (AxisFault e) {
-            throw new RuntimeException(e);
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void stop() {
-        if ( jmsListener != null ) {
-            jmsListener.stop();
-            jmsListener.destroy();
-        }
-        else {
-            for (String endpointURL : urlMap.keySet()) {
-                servletHost.removeServletMapping(endpointURL);
-            }
-        }
-
-        if ( jmsSender != null )
-            jmsSender.stop();
-
-        try {
-            for (String endpointURL : urlMap.keySet()) {
-                // get the path to the service
-                URI uriPath = new URI(endpointURL);
-                String stringURIPath = uriPath.getPath();
-            
-                /* [nash] Need a leading slash for WSDL imports to work with ?wsdl
-                // remove any "/" from the start of the path
-                if (stringURIPath.startsWith("/")) {
-                    stringURIPath = stringURIPath.substring(1, stringURIPath.length());
-                }
-                */
-            
-                configContext.getAxisConfiguration().removeService(stringURIPath);
-            }
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        } catch (AxisFault e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private AxisService createAxisService(String endpointURL, Port port) throws AxisFault {
-        AxisService axisService;
-        if (wsBinding.getWSDLDocument() != null) {
-            axisService = createWSDLAxisService(endpointURL, port);
-        } else {
-            axisService = createJavaAxisService(endpointURL);
-        }
-        initAxisOperations(axisService);
-        return axisService;
-    }
-
-    /**
-     * Create an AxisService from the interface class from the SCA service interface
-     */
-    protected AxisService createJavaAxisService(String endpointURL) throws AxisFault {
-        AxisService axisService = new AxisService();
-        String path = URI.create(endpointURL).getPath();
-        axisService.setName(path);
-        axisService.setServiceDescription("Tuscany configured AxisService for service: " + endpointURL);
-        axisService.setClientSide(false);
-        Parameter classParam =
-            new Parameter(Constants.SERVICE_CLASS, ((JavaInterface)contract.getInterfaceContract().getInterface())
-                .getJavaClass().getName());
-        axisService.addParameter(classParam);
-        try {
-            Utils.fillAxisService(axisService, configContext.getAxisConfiguration(), null, null);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return axisService;
-    }
-    
-    /**
-     * Workaround for https://issues.apache.org/jira/browse/AXIS2-3205
-     * @param definition
-     * @param serviceName
-     * @return
-     */
-    private static Definition getDefinition(Definition definition, QName serviceName) {
-        
-        if (serviceName == null){
-            return definition;
-        }
-        
-        if (definition == null) {
-            return null;
-        }
-        Object service = definition.getServices().get(serviceName);
-        if (service != null) {
-            return definition;
-        }
-        for (Object i : definition.getImports().values()) {
-            List<Import> imports = (List<Import>)i;
-            for (Import imp : imports) {
-                Definition d = getDefinition(imp.getDefinition(), serviceName);
-                if (d != null) {
-                    return d;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Create an AxisService from the WSDL doc used by ws binding
-     */
-    protected AxisService createWSDLAxisService(String endpointURL, Port port) throws AxisFault {
-
-        Definition definition = wsBinding.getWSDLDocument();
-        QName serviceQName = wsBinding.getService().getQName();
-        Definition def = getDefinition(definition, serviceQName);
-
-        final WSDLToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(def, serviceQName, port.getName());
-        builder.setServerSide(true);
-        // [rfeng] Add a custom resolver to work around WSCOMMONS-228
-        builder.setCustomResolver(new URIResolverImpl(def));
-        builder.setBaseUri(def.getDocumentBaseURI());
-        // [rfeng]        
-        // AxisService axisService = builder.populateService();
-        // Allow privileged access to read properties. Requires PropertiesPermission read in
-        // security policy.
-        AxisService axisService;
-        try {
-            axisService = AccessController.doPrivileged(new PrivilegedExceptionAction<AxisService>() {
-                public AxisService run() throws AxisFault {
-                    return builder.populateService();
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (AxisFault)e.getException();
-        }
-
-        String name = URI.create(endpointURL).getPath();
-        //[nash] HTTP endpoints need a leading slash for WSDL imports to work with ?wsdl
-        if (endpointURL.startsWith("jms")) {
-            name = name.startsWith("/") ? name.substring(1) : name;
-        }
-        axisService.setName(name);
-        axisService.setEndpointURL(endpointURL);
-        axisService.setDocumentation("Tuscany configured AxisService for service: " + endpointURL);
-        for ( Iterator i = axisService.getEndpoints().values().iterator(); i.hasNext(); ) {
-            AxisEndpoint ae = (AxisEndpoint)i.next();
-            if (endpointURL.startsWith("jms") ) {
-                Parameter qcf = new Parameter(JMSConstants.CONFAC_PARAM, null);
-                qcf.setValue(DEFAULT_QUEUE_CONNECTION_FACTORY);
-                axisService.addParameter(qcf);
-                break;
-            }
-        }
-
-        // Add schema information to the AxisService (needed for "?xsd=" support)
-        addSchemas(wsBinding.getWSDLDefinition(), axisService);
-
-        // Use the existing WSDL
-        Parameter wsdlParam = new Parameter(WSDLConstants.WSDL_4_J_DEFINITION, null);
-        wsdlParam.setValue(definition);
-        axisService.addParameter(wsdlParam);
-        Parameter userWSDL = new Parameter("useOriginalwsdl", "true");
-        axisService.addParameter(userWSDL);
-
-        // Modify schema imports and includes to add "servicename?xsd=" prefix.
-        // Axis2 does this for schema extensibility elements, but Tuscany has
-        // overriden the WSDl4J deserializer to create UnknownExtensibilityElement
-        // elements in place of these.
-        modifySchemaImportsAndIncludes(definition, name);
-
-        // Axis2 1.3 has a bug with returning incorrect values for the port
-        // addresses.  To work around this, compute the values here.
-        Parameter modifyAddr = new Parameter("modifyUserWSDLPortAddress", "false");
-        axisService.addParameter(modifyAddr);
-
-        return axisService;
-    }
-
-    private void addSchemas(WSDLDefinition wsdlDef, AxisService axisService) {
-        for (XSDefinition xsDef : wsdlDef.getXmlSchemas()) {
-            if (xsDef.getSchema() != null) {
-                axisService.addSchema(xsDef.getSchema());
-                updateSchemaRefs(xsDef.getSchema(), axisService.getName());
-            }
-        }
-        for (WSDLDefinition impDef : wsdlDef.getImportedDefinitions()) {
-            addSchemas(impDef, axisService);
-        }
-    }
-
-    private void updateSchemaRefs(XmlSchema parentSchema, String name) {
-        for (Iterator iter = parentSchema.getIncludes().getIterator(); iter.hasNext();) {
-            Object obj = iter.next();
-            if (obj instanceof XmlSchemaExternal) {
-                XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
-                String location = extSchema.getSchemaLocation();
-                if (location.indexOf(":/") < 0 & location.indexOf("?xsd=") < 0) {
-                    extSchema.setSchemaLocation(name + "?xsd=" + location);
-                }
-                updateSchemaRefs(extSchema.getSchema(), name);
-            }
-        }
-    }
-
-    private void modifySchemaImportsAndIncludes(Definition definition, String name){
-        // adjust the schema locations in types section
-        Types types = definition.getTypes();
-        if (types != null) {
-            for (Iterator iter = types.getExtensibilityElements().iterator(); iter.hasNext();) {
-                Object ext = iter.next();
-                if (ext instanceof UnknownExtensibilityElement &&
-                    XSD_QNAME_LIST.contains(((UnknownExtensibilityElement)ext).getElementType())) {
-                    changeLocations(((UnknownExtensibilityElement)ext).getElement(), name);
-                }
-            }
-        }
-        for (Iterator iter = definition.getImports().values().iterator(); iter.hasNext();) {
-            Vector values = (Vector)iter.next();
-            for (Iterator valuesIter = values.iterator(); valuesIter.hasNext();) {
-                Import wsdlImport = (Import)valuesIter.next();
-                modifySchemaImportsAndIncludes(wsdlImport.getDefinition(), name);
-            }
-        }
-    }
-
-    private void changeLocations(Element element, String name) {
-        NodeList nodeList = element.getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++) {
-            String tagName = nodeList.item(i).getLocalName();
-            if (IMPORT_TAG.equals(tagName) || INCLUDE_TAG.equals(tagName)) {
-                processImport(nodeList.item(i), name);
-            }
-        }
-    }
-
-    private void processImport(Node importNode, String name) {
-        NamedNodeMap nodeMap = importNode.getAttributes();
-        for (int i = 0; i < nodeMap.getLength(); i++) {
-            Node attribute = nodeMap.item(i);
-            if (attribute.getNodeName().equals("schemaLocation")) {
-                String location = attribute.getNodeValue();
-                if (location.indexOf(":/") < 0 & location.indexOf("?xsd=") < 0) {
-                    attribute.setNodeValue(name + "?xsd=" + location);
-                }
-            }
-        }
-    }
-
-    protected void initAxisOperations(AxisService axisService) {
-        for (Iterator<?> i = axisService.getOperations(); i.hasNext();) {
-            AxisOperation axisOp = (AxisOperation)i.next();
-            Operation op = getOperation(axisOp);
-            if (op != null) {
-
-                if (op.isNonBlocking()) {
-                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_ONLY);
-                } else {
-                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_OUT);
-                }
-
-                MessageReceiver msgrec = null;
-                if (op.isNonBlocking()) {
-                    msgrec = new Axis2ServiceInMessageReceiver(this, op, policyHandlerList);
-                } else {
-                    msgrec = new Axis2ServiceInOutSyncMessageReceiver(this, op, policyHandlerList);
-                }
-                axisOp.setMessageReceiver(msgrec);
-            }
-        }
-    }
-
-    protected Operation getOperation(AxisOperation axisOp) {
-        String operationName = axisOp.getName().getLocalPart();
-        Interface iface = wsBinding.getBindingInterfaceContract().getInterface();
-        for (Operation op : iface.getOperations()) {
-            if (op.getName().equalsIgnoreCase(operationName)) {
-                return op;
-            }
-        }
-        return null;
-    }
-
-    // methods for Axis2 message receivers
-
-    public Object invokeTarget(Operation op, Object[] args, MessageContext inMC) throws InvocationTargetException {
-        String callbackAddress = null;
-        String callbackID = null;
-        Object conversationID = null;
-
-        //FIXME: can we use the Axis2 addressing support for this?
-        SOAPHeader header = inMC.getEnvelope().getHeader();
-        if (header != null) {
-            OMElement from = header.getFirstChildWithName(QNAME_WSA_FROM);
-            if (from != null) {
-                OMElement callbackAddrElement = from.getFirstChildWithName(QNAME_WSA_ADDRESS);
-                if (callbackAddrElement != null) {
-                    if (contract.getInterfaceContract().getCallbackInterface() != null) {
-                        callbackAddress = callbackAddrElement.getText();
-                    }
-                }
-                OMElement params = from.getFirstChildWithName(QNAME_WSA_REFERENCE_PARAMETERS);
-                if (params != null) {
-                    OMElement convIDElement =
-                        params.getFirstChildWithName(Axis2BindingInvoker.CONVERSATION_ID_REFPARM_QN);
-                    if (convIDElement != null) {
-                        if (isConversational()) {
-                            conversationID = convIDElement.getText();
-                        }
-                    }
-                    OMElement callbackIDElement =
-                        params.getFirstChildWithName(Axis2BindingInvoker.CALLBACK_ID_REFPARM_QN);
-                    if (callbackIDElement != null) {
-                        callbackID = callbackIDElement.getText();
-                    }
-                }
-            }
-        }
-
-        // create a message object and set the args as its body
-        Message msg = messageFactory.createMessage();
-        msg.setBody(args);
-        msg.setOperation(op);
-        
-        //fill message with QoS context info 
-        fillQoSContext(msg, inMC);
-        
-        // if reference parameters are needed, create a new "From" EPR to hold them
-        EndpointReference from = null;
-        ReferenceParameters parameters = null;
-        if (callbackAddress != null ||
-            callbackID != null ||
-            conversationID != null) {
-            from = new EndpointReferenceImpl(null);
-            parameters = from.getReferenceParameters();
-            msg.setFrom(from);
-        }
-
-        // set the reference parameters into the "From" EPR
-        if (callbackAddress != null) {
-            parameters.setCallbackReference(new EndpointReferenceImpl(callbackAddress));
-        }
-        if (callbackID != null) {
-            parameters.setCallbackID(callbackID);
-        }
-        if (conversationID != null) {
-            parameters.setConversationID(conversationID);
-        }
-
-        // find the runtime wire and invoke it with the message
-        RuntimeWire wire = ((RuntimeComponentService)contract).getRuntimeWire(getBinding());
-        return wire.invoke(op, msg);
-    }
-
-    public boolean isConversational() {
-        return wsBinding.getBindingInterfaceContract().getInterface().isConversational();
-    }
-
-    /**
-     * Return the binding for this provider as a primitive binding type
-     * For use when looking up wires registered against the binding.
-     * 
-     * @return the binding
-     */
-    protected Binding getBinding() {
-        return wsBinding;
-    }
-    
-    private void setupPolicyHandlers(List<PolicyHandler> policyHandlers, ConfigurationContext configContext)  {
-        for ( PolicyHandler aHandler : policyHandlers ) {
-            aHandler.setUp(configContext);
-        }
-    }
-    
-    private void createPolicyHandlers() throws IllegalAccessException,
-                                               InstantiationException, 
-                                               ClassNotFoundException {
-        if (wsBinding instanceof PolicySetAttachPoint) {
-            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
-            PolicyHandler policyHandler = null;
-            for (PolicySet policySet : policiedBinding.getPolicySets()) {
-                policyHandler =
-                    PolicyHandlerUtils.findPolicyHandler(policySet, policyHandlerClassnames);
-                if (policyHandler != null) {
-                    policyHandler.setApplicablePolicySet(policySet);
-                    policyHandlerList.add(policyHandler);
-                }
-            }
-        }
-    }
-     
-    
-    private void fillQoSContext(Message message, MessageContext axis2MsgCtx) {
-        if ( axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS) != null &&
-            axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS) instanceof Vector ) {
-            Vector recvResults = (Vector)axis2MsgCtx.getProperty(WSHandlerConstants.RECV_RESULTS);
-            for ( int count1 = 0 ; count1 < recvResults.size() ; ++count1 ) {
-                if ( recvResults.elementAt(count1) instanceof WSHandlerResult ) {
-                    WSHandlerResult wshr = (WSHandlerResult)recvResults.elementAt(count1);
-                    Vector results = wshr.getResults();
-                    for ( int count2 = 0 ; count2 < results.size() ; ++count2 ) {
-                        if ( results.elementAt(count2) instanceof WSSecurityEngineResult ) {
-                            WSSecurityEngineResult securityResult = 
-                                (WSSecurityEngineResult)wshr.getResults().elementAt(count2);
-                            if ( securityResult.get("principal") != null ) {
-                                message.getQoSContext().put(Message.QOS_CTX_SECURITY_PRINCIPAL, securityResult.get("principal"));
-                            }
-                        }
-                    }
-                }
-            }
-            
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
deleted file mode 100644
index 4ef71fafe6..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.axis2;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.SocketException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.transport.http.AxisServlet;
-import org.apache.axis2.transport.http.ListingAgent;
-import org.apache.axis2.transport.http.server.HttpUtils;
-
-/**
- * This overrides the Servlet init of the AxisServlet so Tuscany can use
- * a single Axis2 ConfigurationContext instance shared between AxisServlet 
- * instances for each SCA service with a ws binding. 
- * TODO: need to review if thats really what we want to be doing
- *
- * @version $Rev$ $Date$
- */
-public class Axis2ServiceServlet extends AxisServlet {
-
-    protected TuscanyListingAgent agent;
-
-    private static final long serialVersionUID = 1L;
-    private static final ServletConfig DUMMY_CONFIG = createDummyServletConfig();
-    
-//JIRA TUSCANY-1561 Port to Axis2 1.3    
-    private ConfigurationContext tmpconfigContext;
-
-    public void init(ConfigurationContext configContext) {
-        this.tmpconfigContext = configContext;
-        try {
-            super.init(DUMMY_CONFIG);
-        } catch (ServletException e) {
-            throw new RuntimeException(e);
-        }
-        agent = new TuscanyListingAgent(configContext);
-    }
-
-    /**
-     * Override Axis2 Servlet method to avoid loop when init 
-     * is called after servletConfig already initialized by
-     * this classes init(ConfigurationContext) method.
-     */
-    @Override
-    public void init() throws ServletException {
-    }
-
-    public void init(ServletConfig config) throws ServletException {
-        ServletContext servletContext = config.getServletContext();
-        servletContext.setAttribute(CONFIGURATION_CONTEXT, tmpconfigContext);
-        super.init(config);
-    }
-
-    /**
-     * We've setup the Servlet by passing in a ConfigurationContext on our init method 
-     * override this method to just return that
-     */
-    @Override
-    protected ConfigurationContext initConfigContext(ServletConfig config) throws ServletException {
-        return this.tmpconfigContext;
-    }
-    
-    @Override
-    public ServletConfig getServletConfig() {
-        return DUMMY_CONFIG;
-    }
-    
-    @Override
-    public String getServletName() {
-        return "TuscanyAxis2Servlet";
-    }
-
-    /**
-     * The AxisServlet gets NPE during init without a ServletConfig so this is a mocked up one to prevent that.
-     */
-    private static ServletConfig createDummyServletConfig() {
-        ServletConfig sc = new ServletConfig() {
-
-            public String getServletName() {
-                return "TuscanyAxis2DummyServlet";
-            }
-
-            public ServletContext getServletContext() {
-                return new ServletContext() {
-
-                    public ServletContext getContext(String uripath) {
-                        return null;
-                    }
-
-                    @SuppressWarnings("unused") // it's on the Servlet 2.5 API so we need it
-                    public String getContextPath() {
-                        return null;
-                    }
-
-                    public int getMajorVersion() {
-                        return 0;
-                    }
-
-                    public int getMinorVersion() {
-                        return 0;
-                    }
-
-                    public String getMimeType(String file) {
-                        return null;
-                    }
-
-                    public Set<?> getResourcePaths(String path) {
-                        return Collections.emptySet();
-                    }
-
-                    public URL getResource(String path) throws MalformedURLException {
-                        if("/".equals(path)) {
-                            // HACK: To avoid NPE
-                            return new URL("/axis2");
-                        }
-                        return null;
-                    }
-
-                    public InputStream getResourceAsStream(String path) {
-                        return null;
-                    }
-
-                    public RequestDispatcher getRequestDispatcher(String path) {
-                        return null;
-                    }
-
-                    public RequestDispatcher getNamedDispatcher(String arg0) {
-                        return null;
-                    }
-
-                    public Servlet getServlet(String arg0) throws ServletException {
-                        return null;
-                    }
-
-                    public Enumeration getServlets() {
-                        return null;
-                    }
-
-                    public Enumeration getServletNames() {
-                        return null;
-                    }
-
-                    public void log(String arg0) {
-                    }
-
-                    public void log(Exception arg0, String arg1) {
-                    }
-
-                    public void log(String arg0, Throwable arg1) {
-                    }
-
-                    public String getRealPath(String arg0) {
-                        return null;
-                    }
-
-                    public String getServerInfo() {
-                        return null;
-                    }
-
-                    public String getInitParameter(String arg0) {
-                        return null;
-                    }
-
-                    public Enumeration getInitParameterNames() {
-                        return null;
-                    }
-
-                    public Object getAttribute(String arg0) {
-                        return null;
-                    }
-
-                    public Enumeration getAttributeNames() {
-                        return null;
-                    }
-
-                    public void setAttribute(String arg0, Object arg1) {
-                    }
-
-                    public void removeAttribute(String arg0) {
-                    }
-
-                    public String getServletContextName() {
-                        return null;
-                    }
-                };
-            }
-
-            public String getInitParameter(String arg0) {
-                return null;
-            }
-
-            public Enumeration getInitParameterNames() {
-                return new Vector().elements();
-            }
-        };
-        return sc;
-    }
-
-    @Override
-    public void destroy() {
-        try {
-            super.destroy();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Override the AxisServlet doGet to use the TuscanyListingAgent for ?wsdl 
-     */
-    @Override
-    protected void doGet(HttpServletRequest request,
-                         HttpServletResponse response) throws ServletException, IOException {
-
-        initContextRoot(request);
-
-        String query = request.getQueryString();
-        if ((query != null) && (query.indexOf("wsdl2") >= 0 ||
-                query.indexOf("wsdl") >= 0 || query.indexOf("xsd") >= 0 ||
-                query.indexOf("policy") >= 0)) {
-            agent.processListService(request, response);
-        } else {
-            super.doGet(request, response);
-        }
-    }
-    
-    /**
-
-    /**
-     * Override the AxisServlet method so as to not add "/services" into the URL
-     * and to work with Tuscany service names. can go once moved to Axis2 1.3
-     */
-    @Override
-    public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
-        //RUNNING_PORT
-        String port = (String) configContext.getProperty(ListingAgent.RUNNING_PORT);
-        if (port == null) {
-            port = "8080";
-        }
-        if (ip == null) {
-            try {
-                ip = HttpUtils.getIpAddress();
-                if (ip == null) {
-                    ip = "localhost";
-                }
-            } catch (SocketException e) {
-//TUSCANY-1561 Port to Axis2 1.3                 
-//                throw new AxisFault.(e);
-                throw AxisFault.makeFault(e);
-            }
-        }
-
-        URI epURI = URI.create("http://" + ip + ":" + port + "/" + serviceName).normalize();
-
-        return new EndpointReference[]{new EndpointReference(epURI.toString())};
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
deleted file mode 100644
index c5b1666e4f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.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.ws.axis2;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AxisPolicyHelper {
-
-    public static final String XMLNS_SCA_1_0 = "http://www.osoa.org/xmlns/sca/1.0";
-    public static final QName AUTHENTICATION_INTENT = new QName(XMLNS_SCA_1_0, "authentication");
-    public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_1_0, "confidentiality");
-    public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_1_0, "integrity");
-    public static final QName MTOM_INTENT = new QName(XMLNS_SCA_1_0, "MTOM");
-    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "soap12");
-
-    public static PolicySet getPolicySet(Binding wsBinding, QName intentName) {
-        PolicySet returnPolicySet = null;
-
-        if (wsBinding instanceof PolicySetAttachPoint) {
-            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)wsBinding;
-            for (PolicySet policySet : policiedBinding.getPolicySets()) {
-                for (Intent intent : policySet.getProvidedIntents()) {
-                    if (intent.getName().equals(intentName)) {
-                        returnPolicySet = policySet;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return returnPolicySet;
-    }
-
-    public static boolean isIntentRequired(Binding wsBinding, QName intent) {
-        if (wsBinding instanceof IntentAttachPoint) {
-            List<Intent> intents = ((IntentAttachPoint)wsBinding).getRequiredIntents();
-            for (Intent i : intents) {
-                if (intent.equals(i.getName())) {
-                    return true;
-                }
-            }
-        }
-        return getPolicySet(wsBinding, intent) != null;
-    }
-
-    public static boolean isRampartRequired(Binding wsBinding) {
-        return isIntentRequired(wsBinding, AUTHENTICATION_INTENT) || isIntentRequired(wsBinding, INTEGRITY_INTENT)
-            || isIntentRequired(wsBinding, CONFIDENTIALITY_INTENT);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
deleted file mode 100644
index 8b3a5122d9..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.axis2;
-
-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 org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.DeploymentErrorMsgs;
-import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.deployment.ModuleBuilder;
-import org.apache.axis2.deployment.URLBasedAxisConfigurator;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisConfigurator;
-import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.util.Loader;
-
-/**
- * Helps configure Axis2 from a resource in binding.ws.axis2 instead of Axis2.xml 
- * <p/> TODO: Review: should there be a single global Axis ConfigurationContext
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyAxisConfigurator extends URLBasedAxisConfigurator implements AxisConfigurator {
-    
-    /* these two fields are part of a temporary fix to solve problems that Maven has with including
-     * rampart-1.3.mar into the classpath and also at the time of Release 1.0 rampart-1.3.mar seems
-     * to pull in a SNAPSHOT version of rampart-project pom.  Hence rampart.mar has been excluded
-     * as a Maven dependency and has been packed with this module 
-     */
-    /************start of fix *********************************************************************/
-    private URL axis2_xml = 
-        getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml");
-    private URL axis2_repository = null;
-    private URL rampart_mar_url =
-        getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar");
-    /************** end of fix *************************************************************/
-    
-    private boolean isRampartRequired;
-    
-    public TuscanyAxisConfigurator(boolean isRampartRequired) throws AxisFault {
-        //super(TuscanyAxisConfigurator.class.getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml"), 
-        //      TuscanyAxisConfigurator.class.getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart.mar"));
-        super(getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml"), 
-                    null);
-        this.isRampartRequired = isRampartRequired;
-    }
-    
-    private static URL getResource(final String name) {
-        return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return TuscanyAxisConfigurator.class.getResource(name);
-            }
-        });
-    }
-
-    public ConfigurationContext getConfigurationContext() throws AxisFault {
-        if (configContext == null) {
-            configContext = ConfigurationContextFactory.createConfigurationContext(this);
-        }
-        return configContext;
-    }
-    
-    /* these three methods are part of a temporary fix to solve problems that Maven has with including
-     * rampart-1.3.mar into the classpath and also at the time of Release 1.0 rampart-1.3.mar seems
-     * to pull in a SNAPSHOT version of rampart-project pom.  Hence rampart.mar has been excluded
-     * as a Maven dependency and has been packed with this module 
-     */
-    /************start of fix *********************************************************************/
-    public AxisConfiguration getAxisConfiguration() throws AxisFault {
-        InputStream axis2xmlStream;
-        try {
-            if (axis2_xml == null) {
-                axis2xmlStream =
-                        Loader.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
-            } else {
-                axis2xmlStream = axis2_xml.openStream();
-            }
-            axisConfig = populateAxisConfiguration(axis2xmlStream);
-            if (isRampartRequired) {
-                axisConfig.addGlobalModuleRef("rampart");
-            }   
-            if (axis2_repository == null) {
-                Parameter axis2repoPara = axisConfig.getParameter(DeploymentConstants.AXIS2_REPO);
-                if (axis2repoPara != null) {
-                    String repoValue = (String) axis2repoPara.getValue();
-                    if (repoValue != null && !"".equals(repoValue.trim())) {
-                        if (repoValue.startsWith("file:/")) {
-                            // we treat this case specially , by assuming file is
-                            // located in the local machine
-                            loadRepository(repoValue);
-                        } else {
-                            loadRepositoryFromURL(new URL(repoValue));
-                        }
-                    }
-                } else {
-                    //log.info("No repository found , module will be loaded from classpath");
-                    try {
-                        loadFromClassPath(); 
-                    } catch ( Exception e ) {
-                        if (isRampartRequired) {
-                            loadRampartModule();
-                        }
-                    }
-                }
-                
-            } else {
-                loadRepositoryFromURL(axis2_repository);
-            }
-
-        } catch (IOException e) {
-            throw new AxisFault(e.getMessage());
-        }
-        axisConfig.setConfigurator(this);
-        return axisConfig;
-    }
-    
-    public void loadRampartModule() throws DeploymentException {
-        try {
-            ClassLoader deploymentClassLoader =
-                    org.apache.axis2.deployment.util.Utils.createClassLoader(
-                            new URL[]{rampart_mar_url},
-                            axisConfig.getModuleClassLoader(),
-                            true,
-                            (File) axisConfig.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
-            final AxisModule module = new AxisModule();
-            module.setModuleClassLoader(deploymentClassLoader);
-            module.setParent(axisConfig);
-            //String moduleFile = fileUrl.substring(0, fileUrl.indexOf(".mar"));
-            if (module.getName() == null) {
-                module.setName(org.apache.axis2.util.Utils.getModuleName("rampart-1.3"));
-                module.setVersion(org.apache.axis2.util.Utils.getModuleVersion("rampart-1.3"));
-            }
-            populateModule(module, rampart_mar_url);
-            module.setFileName(rampart_mar_url);
-            // Allow privileged access to read properties. Requires PropertiesPermission read in
-            // security policy.
-            try {
-                AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                    public Object run() throws IOException {
-                        addNewModule(module, axisConfig);
-                        return null;
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                throw (AxisFault)e.getException();
-            }            
-           
-            org.apache.axis2.util.Utils.
-                    calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
-            axisConfig.validateSystemPredefinedPhases();
-        } catch (IOException e) {
-            throw new DeploymentException(e);
-        }
-    }
-    
-    private void populateModule(AxisModule module, URL moduleUrl) throws DeploymentException {
-        try {
-            ClassLoader classLoader = module.getModuleClassLoader();
-            InputStream moduleStream = classLoader.getResourceAsStream("META-INF/module.xml");
-            if (moduleStream == null) {
-                moduleStream = classLoader.getResourceAsStream("meta-inf/module.xml");
-            }
-            if (moduleStream == null) {
-                throw new DeploymentException(
-                        Messages.getMessage(
-                                DeploymentErrorMsgs.MODULE_XML_MISSING, moduleUrl.toString()));
-            }
-            ModuleBuilder moduleBuilder = new ModuleBuilder(moduleStream, module, axisConfig);
-            moduleBuilder.populateModule();
-        } catch (IOException e) {
-            throw new DeploymentException(e);
-        }
-    }
-    
-    /************** end of fix *************************************************************/
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
deleted file mode 100644
index 34899a4af0..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.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.binding.ws.axis2;
-
-import java.net.URI;
-import java.util.HashMap;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.HandlerDescription;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.RequestURIBasedDispatcher;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A Tuscany specific Axis2 Dispatcher that enables using services
- * exposed at the SCA defined service URI instead of /services/<serviceName> 
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyDispatcher extends RequestURIBasedDispatcher {
-
-    public static final String NAME = "TuscanyDispatcher";
-    private static final Log log = LogFactory.getLog(RequestURIBasedDispatcher.class);
-    private static final boolean isDebugEnabled = log.isDebugEnabled();
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
-     */
-    @Override
-    public AxisService findService(MessageContext messageContext) throws AxisFault {
-        EndpointReference toEPR = messageContext.getTo();
-
-        if (toEPR != null) {
-            if(isDebugEnabled){
-                log.debug("Checking for Service using target endpoint address : " + toEPR.getAddress());
-            }
-
-            String path = URI.create(toEPR.getAddress()).getPath();
-            
-            ConfigurationContext configurationContext = messageContext.getConfigurationContext();
-            AxisConfiguration registry = configurationContext.getAxisConfiguration();
-
-            String serviceName = findAxisServiceName(registry, path);
-            return registry.getService(serviceName);
-
-        } else {
-            if(isDebugEnabled){
-                log.debug("Attempted to check for Service using null target endpoint URI");
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public void initDispatcher() {
-        init(new HandlerDescription(NAME));
-    }
-
-    protected String findAxisServiceName(AxisConfiguration registry, String path) {
-        HashMap services = registry.getServices();
-        if (services == null) {
-            return null;
-        }
-        String[] parts = JavaUtils.split(path, '/');
-        String serviceName = "";
-        for (int i=parts.length-1; i>=0; i--) {
-            serviceName = parts[i] + serviceName;
-            if (services.containsKey(serviceName)) {
-                return serviceName;
-            }
-            serviceName = "/" + serviceName;
-            if (services.containsKey(serviceName)) {
-                return serviceName;
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
deleted file mode 100644
index 21fef3e5d8..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.axis2;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.attachments.utils.IOUtils;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.description.AxisDescription;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.PolicyInclude;
-import org.apache.axis2.transport.http.ListingAgent;
-import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.util.ExternalPolicySerializer;
-import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyRegistry;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaExternal;
-
-/**
- * A Tuscany specific Axis2 ListingAgent as the Axis2 one does not work
- * with the Tuscany service names which include slash ('/') characters.
- * Unfortunately it ends up having  to copy a fair amount of Axis2 code to do this. 
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyListingAgent extends ListingAgent {
-
-    private static final String LIST_SINGLE_SERVICE_JSP_NAME =
-        "listSingleService.jsp";
-    
-    public TuscanyListingAgent(ConfigurationContext aConfigContext) {
-        super(aConfigContext);
-    }
-
-    /**
-     * This method overrides the Axis2 listing agent's computation of the
-     * service name.
-     */
-    @Override
-    public String extractServiceName(String urlString) {
-        String serviceName = findAxisServiceName(urlString);
-        setContextRoot(urlString, serviceName);
-        return serviceName;
-    }
-
-    /**
-     * Override ?xsd processing so that WSDL documents with XSD imports
-     * and includes work correctly.  When we move to Axis2 1.4, we may
-     * be able to use SchemaSupplier to do this in a cleaner way.  Also
-     * ensure that the correct IP address and port are returned by ?wsdl.
-     */
-    @Override
-    public void processListService(HttpServletRequest req,
-                                   HttpServletResponse res)
-            throws IOException, ServletException {
-
-        String url = req.getRequestURL().toString();
-        String query = req.getQueryString();
-
-        // for ?wsdl requests, need to update the WSDL with correct IPaddr and port 
-        int wsdl = query.indexOf("wsdl");
-        if (wsdl >= 0) {
-            String serviceName = extractServiceName(url);
-            HashMap services = configContext.getAxisConfiguration().getServices();
-            if ((services != null) && !services.isEmpty()) {
-                AxisService axisService = (AxisService)services.get(serviceName);
-                Parameter wsld4jdefinition = axisService.getParameter(WSDLConstants.WSDL_4_J_DEFINITION);
-                Definition definition = (Definition)wsld4jdefinition.getValue();
-                for (Object s : definition.getServices().values()) {
-                    for (Object p : ((Service)s).getPorts().values()) {
-                        String endpointURL = Axis2ServiceProvider.getPortAddress((Port)p);
-                        String modifiedURL = setIPAddress(endpointURL, url);
-                        Axis2ServiceProvider.setPortAddress((Port)p, modifiedURL);
-                    }
-                }
-            }
-        }
-
-        // handle ?xsd requests here
-        int xsd = query.indexOf("xsd");
-        if (xsd >= 0) {
-            String serviceName = extractServiceName(url);
-            HashMap services = configContext.getAxisConfiguration().getServices();
-            if ((services != null) && !services.isEmpty()) {
-                Object serviceObj = services.get(serviceName);
-                if (serviceObj != null) {
-                    String xsds = req.getParameter("xsd");
-                    if (xsds != null && !"".equals(xsds)) {
-                        // a schema name (perhaps with path) is present
-                        AxisService axisService = (AxisService)serviceObj;
-                        ArrayList schemas = axisService.getSchema();
-                        for (Object rootSchema : axisService.getSchema()) {
-                            XmlSchema schema = getSchema(((XmlSchema)rootSchema), xsds);
-                            if (schema != null) {
-                                // found the schema
-                                res.setContentType("text/xml");
-                                OutputStream out = res.getOutputStream();
-                                schema.write(new OutputStreamWriter(out, "UTF8"));
-                                out.flush();
-                                out.close();
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // in all other cases, delegate to the Axis2 code
-        super.processListService(req, res);
-    }
-
-    private XmlSchema getSchema(XmlSchema parentSchema, String name) {
-        for (Iterator iter = parentSchema.getIncludes().getIterator(); iter.hasNext();) {
-            Object obj = iter.next();
-            if (obj instanceof XmlSchemaExternal) {
-                XmlSchemaExternal extSchema = (XmlSchemaExternal)obj;
-                if (extSchema.getSchemaLocation().endsWith(name)) {
-                    return extSchema.getSchema();
-                } else {
-                    XmlSchema schema = getSchema(extSchema.getSchema(), name);
-                    if (schema != null) {
-                        return schema;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private String findAxisServiceName(String path) {
-        HashMap services = configContext.getAxisConfiguration().getServices();
-        if (services == null) {
-            return null;
-        }
-        String[] parts = JavaUtils.split(path, '/');
-        String serviceName = "";
-        for (int i=parts.length-1; i>=0; i--) {
-            serviceName = parts[i] + serviceName;
-            if (services.containsKey(serviceName)) {
-                return serviceName;
-            }
-            serviceName = "/" + serviceName;
-            if (services.containsKey(serviceName)) {
-                return serviceName;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Hack for Tuscany to get ?wsdl working with Tuscany service names
-     * Can go once moved up to Axis2 1.3
-     */
-    private void setContextRoot(String filePart, String serviceName) {
-        String contextRoot = configContext.getContextRoot();
-        if (contextRoot != null && contextRoot.length() > 0) {
-            if (contextRoot.equals("/")) {
-                configContext.setServicePath("/");
-            } else {
-                int i = filePart.indexOf(contextRoot) + contextRoot.length();
-                int j = filePart.lastIndexOf(serviceName);
-                if (i>=j || (i+1 == j)) {
-                    configContext.setServicePath("/");
-                } else {
-                    String mapping = filePart.substring(i+1, j);
-                    configContext.setServicePath(mapping);
-                }
-            }
-            configContext.setContextRoot(contextRoot);
-        }
-    }
-
-    private static String setIPAddress(String wsdlURI, String requestURI) {
-        try {
-            URI wsdlURIObj = new URI(wsdlURI);
-            String wsdlHost = wsdlURIObj.getHost();
-            int wsdlPort = wsdlURIObj.getPort();
-            String wsdlAddr = wsdlHost + (wsdlPort != -1 ? ":" + Integer.toString(wsdlPort) : "");
-            URI requestURIObj = new URI(requestURI);
-            String ipAddr = HttpUtils.getIpAddress();
-            int requestPort = requestURIObj.getPort();
-            String newAddr = ipAddr + (requestPort != -1 ? ":" + Integer.toString(requestPort) : "");
-            return wsdlURI.replace(wsdlAddr, newAddr);
-        } catch (Exception e) {
-            // URI string not in expected format, so return the WSDL URI unmodified
-            return wsdlURI;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
deleted file mode 100644
index 5254a5716c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.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.ws.axis2;
-
-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 related to security
- *
- * @version $Rev$ $Date$
- */
-public class WSBindingDefinitionsProvider implements SCADefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/binding/ws/axis2/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-    
-    public WSBindingDefinitionsProvider(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/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index a48ff54c77..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-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.ws.axis2.Axis2BindingProviderFactory;model=org.apache.tuscany.sca.binding.ws.WebServiceBinding

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 370b83f87b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/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.ws.axis2.WSBindingDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
deleted file mode 100644
index 57b3eaa565..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ /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.    

--->

-<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:bindingType type="sca:binding.ws"  mayProvide="soap soap.1_1 soap.1_2" alwaysProvides="" 

-									/>	 		

-

-	<!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->

-	 <sca:intent name="soap"  

-	 			 constrains="sca:binding.ws">

-	 			 <sca:description>

-	 			 Communitcation thro this binding requires SOAP 

-	 			 </sca:description>

-	 </sca:intent>

-	

-	 <sca:intent name="soap.1_1">

-	 			 <sca:description>

-	 			 Communitcation thro this binding requires SOAP 1.1

-	 			 </sca:description>

-	 </sca:intent>

-	

-	 <sca:intent name="soap.1_2">

-	 			 <sca:description>

-	 			 Communitcation thro this binding requires SOAP 1.2

-	 			 </sca:description>

-	 </sca:intent>

-	 <sca:intent name="MTOM"  

-	 			 constrains="sca:binding.ws">

-	 			 <sca:description>

-	 			 Communitcation thro this binding requires MTOM support

-	 			 </sca:description>

-	 </sca:intent>

- </sca:definitions>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
deleted file mode 100644
index 4d7a34d73d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<axisconfig name="AxisJava2.0">
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment">true</parameter>
-    <parameter name="hotupdate">false</parameter>
-    <parameter name="enableMTOM">false</parameter>
-    <parameter name="enableSwA">false</parameter>
-    
-    <!-- Customized by Tuscany -->
-    <!-- parameter name="OutflowSecurity">
-		<action>
-			<items>Timestamp</items>
-		</action>
-	</parameter-->
-
-    <!--Uncomment if you want to enable file caching for attachments -->
-    <!--parameter name="cacheAttachments">true</parameter>
-    <parameter name="attachmentDIR"></parameter>
-    <parameter name="sizeThreshold">4000</parameter-->
-
-    <!--This will give out the timout of the configuration contexts, in milliseconds-->
-    <parameter name="ConfigContextTimeoutInterval">30000</parameter>
-
-    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
-    <!--that behavior.-->
-
-    <!-- Customized by Tuscany -->
-    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
-
-    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
-    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
-    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
-    <!--is set, then Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
-    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
-
-    <parameter name="userName">admin</parameter>
-    <parameter name="password">axis2</parameter>
-
-    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
-    <!--ServicesDirectory only works on the following cases-->
-    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
-    <!---When creating URL Based configurator with URL Ă¢â‚¬Å“file://Ă¢â‚¬Â�  -->
-    <!--- War based configurator with expanded case , -->
-
-    <!--All the other scenarios it will be ignored.-->
-    <!--<parameter name="ServicesDirectory">service</parameter>-->
-    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
-    <!--<parameter name="ModulesDirectory">modules</parameter>-->
-
-
-
-    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
-    <!--root which can configured using the following contextRoot parameter-->
-    <!--<parameter name="contextRoot">axis2</parameter>-->
-
-    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
-    <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
-    <!--context path to proper Axis2 servlets-->
-
-    <!-- Customized by Tuscany -->
-    <parameter name="servicePath">/</parameter>
-
-    <!--<parameter name="restPath">rest</parameter>-->
-
-    <!-- Following parameter will completely disable REST handling in Axis2-->
-
-    <parameter name="disableREST" locked="true">false</parameter>
-
-    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
-    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
-
-    <!-- Following parameter will set the host name for the epr-->
-    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
-
-    <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
-    <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
-
-
-    <!--    The way of adding listener to the system-->
-    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
-    <!--    </listener>-->
-
-    <!-- ================================================= -->
-    <!-- Message Receivers -->
-    <!-- ================================================= -->
-    <!--This is the deafult MessageReceiver for the system , if you want to have MessageReceivers for -->
-    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
-    <!--any operation -->
-    <!--Note : You can ovrride this for a particular service by adding the same element with your requirement-->
-    <messageReceivers>
-
-       <!-- Added by Tuscany -->
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
-
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
-       <!-- Added by Tuscany -->
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
-
-       <!-- Added by Tuscany -->
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
-                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
-
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
-       <!-- Added by Tuscany -->
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
-                         class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
-
-    </messageReceivers>
-    <!-- ================================================= -->
-    <!-- Message Formatter -->
-    <!-- ================================================= -->
-    <!--Following content type to message formatter mapping can be used to implement support for different message -->
-    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageFormatters>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
-        <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
-        <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
-    </messageFormatters>
-
-    <!-- ================================================= -->
-    <!-- Message Builders -->
-    <!-- ================================================= -->
-    <!--Following content type to builder mapping can be used to implement support for different message -->
-    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
-        <messageBuilder contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-        <messageBuilder contentType="multipart/form-data"
-                         class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
-    </messageBuilders>
-
-    <!-- ================================================= -->
-    <!-- Transport Ins -->
-    <!-- ================================================= -->
-    <transportReceiver name="http"
-                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
-
-        <!-- Customized by Tuscany -->
-        <parameter name="port" locked="false">6060</parameter>
-
-        <!-- Here is the complete list of supported parameters (see example settings further below):
-            port: the port to listen on (default 6060)
-            hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
-            originServer:  value of http Server header in outgoing messages                                         (default "Simple-Server/1.1")
-            requestTimeout:  value in millis of time that requests can wait for data                                (default 20000)
-            requestTcpNoDelay:  true to maximize performance and minimize latency                                   (default true)
-                                false to minimize bandwidth consumption by combining segments
-            requestCoreThreadPoolSize:  number of threads available for request processing (unless queue fills up)  (default 25)
-            requestMaxThreadPoolSize:  number of threads available for request processing if queue fills up         (default 150)
-                                       note that default queue never fills up:  see HttpFactory
-            threadKeepAliveTime:  time to keep threads in excess of core size alive while inactive                  (default 180)
-                                  note that no such threads can exist with default unbounded request queue
-            threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
-        -->
-        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
-        <!-- <parameter name="originServer">My-Server/1.1</parameter>           -->
-        <!-- <parameter name="requestTimeout">10000</parameter>                   -->
-        <!-- <parameter name="requestTcpNoDelay">false</parameter>                   -->
-        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
-        <!-- <parameter name="RequestMaxThreadPoolSize">100</parameter>                     -->
-        <!-- <parameter name="threadKeepAliveTime">240000</parameter>                  -->
-        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
-    </transportReceiver>
-    
-     <!-- Added by Tuscany -->
-     <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <!--  These configuation parameters now come from the binding.ws uri
-              or from a policy set
-        <parameter name="myTopicConnectionFactory">
-            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory">
-            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default">
-            <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
-        </parameter>
-        -->
-     </transportReceiver>
-
-    <!-- ================================================= -->
-    <!-- Non-blocking http/s Transport Listener  -->
-
-    <!-- the non blocking http transport based on HttpCore + NIO extensions
-    <transportReceiver name="http" class="org.apache.axis2.transport.nhttp.HttpCoreNIOListener">
-    	<parameter name="port" locked="false">9000</parameter>
-    	<parameter name="non-blocking" locked="false">true</parameter>
-    </transportReceiver>-->
-
-    <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions
-    <transportReceiver name="https" class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLListener">
-    	<parameter name="port" locked="false">9002</parameter>
-    	<parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>identity.jks</Location>
-                <Type>JKS</Type>
-                <Password>password</Password>
-                <KeyPassword>password</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>trust.jks</Location>
-                <Type>JKS</Type>
-                <Password>password</Password>
-            </TrustStore>
-        </parameter>-->
-        <!--<parameter name="SSLVerifyClient">require</parameter>
-            supports optional|require or defaults to none -->
-    <!--</transportReceiver>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Listener  -->
-    <!-- This is a sample configuration. It assumes a mail server running in localhost.
-         Listener pops  messages that comes to the email address red@localhost. Users
-         password is red. Listener connect to the server every 3000 milliseconds.
-         Parameters with "transport." prefix is Axis2 specific. Others are all from Java Mail API. 
-         http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-     -->
-    <!-- ================================================= -->
-    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host">localhost</parameter>
-        <parameter name="mail.pop3.user">red</parameter>
-        <parameter name="mail.store.protocol">pop3</parameter>
-        <parameter name="transport.mail.pop3.password">red</parameter>
-        <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
-        <parameter name="transport.listener.interval">3000</parameter>
-    </transportReceiver>-->
-
-	<!--Uncomment if you want to have TCP transport support-->
-    <!--transportReceiver name="tcp"
-                       class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port">6060</parameter-->>
-        <!--If you want to give your own host address for EPR generation-->
-        <!--uncomment the following paramter , and set it as you required.-->
-        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
-    <!-- /transportReceiver -->
-
-    <!-- ================================================= -->
-    <!-- Transport Outs -->
-    <!-- ================================================= -->
-
-    <transportSender name="tcp"
-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
-    <transportSender name="local"
-                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <transportSender name="http"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-
-        <!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
-        <!--  <parameter name="OmitSOAP12Action">true</parameter>  -->
-    </transportSender>
-    
-    <transportSender name="https"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-    </transportSender>
-    <transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>
-     
-    <!-- ================================================= -->
-    <!-- Non-blocking http/s Transport Sender  -->
-
-    <!-- the non-blocking http transport sender based on HttpCore + NIO extensions
-    <transportSender name="http"  class="org.apache.axis2.transport.nhttp.HttpCoreNIOSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-    </transportSender>-->
-
-    <!-- the non-blocking https transport sender based on HttpCore + NIO SSL extensions
-    <transportSender name="https" class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>identity.jks</Location>
-                <Type>JKS</Type>
-                <Password>password</Password>
-                <KeyPassword>password</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>trust.jks</Location>
-                <Type>JKS</Type>
-                <Password>password</Password>
-            </TrustStore>
-        </parameter>-->
-        <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>
-            supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
-    <!--</transportSender>-->
-
-    <!-- ================================================= -->
-    <!-- Mail Transport Sender  -->
-    <!--Only need to uncomment the sender. Configuration is achieved with every client.
-        At any instant mail host should be given. Sample configuration has been given.
-        http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
-        -->
-    <!-- ================================================= -->
-   <!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host">localhost</parameter>
-    </transportSender>-->
-
-    <!-- ================================================= -->
-    <!-- Global Modules  -->
-    <!-- ================================================= -->
-    <!-- Comment this to disable Addressing -->
-
-    <!--  Commented out by Tuscany
-    <module ref="addressing"/>
-    -->
-
-	<!-- Added by Tuscany -->
-    <!-- 
-    <module ref="rampart"/>
-     -->
-    
-    <!-- wsp:Policy wsu:Id="UTOverTransport" 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:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
-				</wsp:Policy>
-			</sp:SignedSupportingTokens>
-			
-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
-				<ramp:user>TuscanyWsUser</ramp:user>
-				<ramp:passwordType>PasswordText</ramp:passwordType>
-				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.ClientPWCBHandler</ramp:passwordCallbackClass>
-			</ramp:RampartConfig>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy-->
-
-    <!--Configuring module , providing parameters for modules whether they refer or not-->
-    <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara">N/A</parameter>-->
-    <!--</moduleConfig>-->
-
-    <!-- ================================================= -->
-    <!-- Clustering  -->
-    <!-- ================================================= -->
-    <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
-    <!--
-    <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
-        <parameter name="param1">value1</parameter>
-        <parameter name="domain">apache.axis2.domain</parameter>
-    	<configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager">
-    	    <listener class="org.apache.axis2.cluster.configuration.DefaultConfigurationManagerListener"/>
-    	</configurationManager>
-    	<contextManager class="org.apache.axis2.cluster.context.TribesContextManager">
-    	    <listener class="org.apache.axis2.cluster.context.DefaultContextManagerListener"/>
-    	</contextManager>
-    </cluster>
-    -->
-
-    <!-- ================================================= -->
-    <!-- Phases  -->
-    <!-- ================================================= -->
-    <phaseOrder type="InFlow">
-        <!--  System pre defined phases       -->
-        <phase name="Transport">
-
-            <!-- Added by Tuscany -->
-            <handler name="TuscanyDispatcher"
-                     class="org.apache.tuscany.sca.binding.ws.axis2.TuscanyDispatcher">
-                <order phase="Transport"/>
-            </handler>
-
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-        </phase>
-        <phase name="Addressing">
-             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                 <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-<!--
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
--->					 
-        </phase>
-        <phase name="RMPhase"/>
-        <!--  System pre defined phases       -->
-        <!--   After Postdispatch phase module author or service author can add any phase he want      -->
-        <phase name="OperationInPhase"/>
-	<phase name="soapmonitorPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFlow">
-        <!--      user can add his own phases to this area  -->
-	<phase name="soapmonitorPhase"/>
-        <phase name="OperationOutPhase"/>
-        <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-    <phaseOrder type="InFaultFlow">
-        <phase name="Addressing">
-             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                 <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-<!--
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
--->					 
-        </phase>
-        <phase name="RMPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-        <phase name="soapmonitorPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFaultFlow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="soapmonitorPhase"/>
-        <phase name="OperationOutFaultPhase"/>
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-    </phaseOrder>
-</axisconfig>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
deleted file mode 100644
index 1641457d28..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
+++ /dev/null
@@ -1 +0,0 @@
-rampart-1.3.mar
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
deleted file mode 100644
index af3c45aa93..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
deleted file mode 100644
index 2ce23bf2c4..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.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.ws.axis2;
-
-import junit.framework.TestCase;
-
-public class Axis2ReferenceTestCase extends TestCase {
-
-    public void testInvokeService() throws Exception {
-//        Axis2ReferenceBinding axis2Reference = createAxis2Reference("testWebAppName", "testServiceName");
-//        ServiceContract contract = new JavaServiceContract();
-//        Operation operation = new Operation<Type>("sayHi", null, null, null, false, null, NO_CONVERSATION);
-//        TargetInvoker targetInvoker = axis2Reference.createTargetInvoker(contract, operation);
-//        assertNotNull(targetInvoker);
-//        assertFalse(targetInvoker instanceof Axis2AsyncTargetInvoker);
-    }
-
-    public void testAsyncTargetInvoker() throws Exception {
-//        Axis2ReferenceBinding axis2Reference = createAxis2Reference("testWebAppName", "testServiceName");
-//        //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
-//        Wire inboundWire = EasyMock.createNiceMock(Wire.class);
-//        JavaServiceContract contract = new JavaServiceContract(Greeter.class);
-//        contract.setCallbackName("");
-//        contract.setCallbackClass(GreetingCallback.class);
-//        Operation<Type> callbackOp =
-//            new Operation<Type>("sayHiCallback", null, null, null, true, null, NO_CONVERSATION);
-//        HashMap<String, Operation<Type>> callbackOps = new HashMap<String, Operation<Type>>();
-//        callbackOps.put("sayHiCallback", callbackOp);
-//        contract.setCallbackOperations(callbackOps);
-//        EasyMock.expect(inboundWire.getTargetContract()).andReturn(contract).anyTimes();
-//        EasyMock.replay(inboundWire);
-//
-//        axis2Reference.setWire(inboundWire);
-//        Operation operation = new Operation<Type>("sayHi", null, null, null, true, null, NO_CONVERSATION);
-//        TargetInvoker asyncTargetInvoker = axis2Reference.createTargetInvoker(contract, operation);
-//        assertNotNull(asyncTargetInvoker);
-//        assertTrue(asyncTargetInvoker instanceof Axis2AsyncTargetInvoker);
-    }
-
-//    @SuppressWarnings("unchecked")
-//    private Axis2ReferenceBinding createAxis2Reference(String webAppName, String serviceName) throws Exception {
-//        //Create WebServiceBindingDefinition
-//        String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
-//        URL url = getClass().getResource(wsdlLocation);
-//        assertNotNull("Could not find wsdl " + url.toString(), url);
-//
-//        WSDLFactory factory = WSDLFactory.newInstance();
-//        WSDLReader reader = factory.newWSDLReader();
-//        reader.setFeature("javax.wsdl.verbose", false);
-//        InputSource input = new InputSource(url.openStream());
-//        Definition wsdlDef = reader.readWSDL(url.toString(), input);
-//        Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
-//            "SOAPService"));
-//        Port port = wsdlService.getPort("SoapPort");
-//        WebServiceBindingDefinition wsBinding =
-//            new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
-//        //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
-//        // TODO figure out what to do with the service contract
-//        ServiceContract<?> contract = new WSDLServiceContract();
-//        contract.setInterfaceClass(Greeter.class);
-//        return new Axis2ReferenceBinding(URI.create(serviceName),
-//            wsBinding,
-//            contract,
-//            null,
-//            null);
-//    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
deleted file mode 100644
index d4d20414e5..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.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.binding.ws.axis2;
-
-import junit.framework.TestCase;
-
-public class Axis2ServiceTestCase extends TestCase {
-
-    public void testInvokeService() throws Exception {
-//        TestServletHost tomcatHost = new TestServletHost();
-//        Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, false);
-//        axis2Service.start();
-//
-//        if (true) return;
-//        Servlet servlet = tomcatHost.getMapping("testWebAppName/serviceBindings/testServiceName");
-//        assertNotNull(servlet);
-//
-//        //Create mocked HttpRequest and HttpResponse object to test the Axis2Servlet
-//        //To be done:
-
-    }
-
-    public void testAsyncMessageReceiver() throws Exception {
-
-//        TestServletHost tomcatHost = new TestServletHost();
-//        Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, true);
-//        axis2Service.start();
-    }
-
-//    @SuppressWarnings("unchecked")
-//    private Axis2ServiceBinding createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
-//        throws Exception {
-//        //Create WebServiceBindingDefinition
-//        String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
-//        URL url = getClass().getResource(wsdlLocation);
-//        assertNotNull("Could not find wsdl " + url.toString(), url);
-//
-//        WSDLFactory factory = WSDLFactory.newInstance();
-//        WSDLReader reader = factory.newWSDLReader();
-//        reader.setFeature("javax.wsdl.verbose", false);
-//        InputSource input = new InputSource(url.openStream());
-//        Definition wsdlDef = reader.readWSDL(url.toString(), input);
-//        Service wsdlService = wsdlDef.getService(new QName("http://objectweb.org/hello_world_soap_http",
-//            "SOAPService"));
-//        Port port = wsdlService.getPort("SoapPort");
-//        WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
-//
-//        //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
-////        WireService wireService = EasyMock.createNiceMock(WireService.class);
-////        wireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(Wire.class));
-////        EasyMock.expectLastCall().andReturn(null);
-////        EasyMock.replay(wireService);
-//
-//        //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
-//        Wire inboundWire = EasyMock.createNiceMock(Wire.class);
-//        JavaServiceContract contract = new JavaServiceContract(Greeter.class);
-//        Map<String, Operation<Type>> opMap = new HashMap<String, Operation<Type>>();
-//        for (Method m : Greeter.class.getMethods()) {
-//            opMap.put(m.getName(), new Operation<Type>(m.getName(), null, null, null));
-//        }
-//        contract.setOperations(opMap);
-//        EasyMock.expect(inboundWire.getTargetContract()).andReturn(contract).anyTimes();
-//        if (callback) {
-//            contract.setCallbackName("");
-//        }
-//        EasyMock.replay(inboundWire);
-//
-//        Wire outboundWire = EasyMock.createNiceMock(Wire.class);
-//        Map<Operation<?>, InvocationChain> map = new HashMap<Operation<?>, InvocationChain>();
-//        EasyMock.expect(outboundWire.getInvocationChains()).andReturn(map).once();
-//        EasyMock.replay(outboundWire);
-//
-//        TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
-//        ConfigurationContext configurationContext = tuscanyAxisConfigurator.getConfigurationContext();
-//        Axis2ServiceBinding axis2Service =
-//            new Axis2ServiceBinding(URI.create(serviceName),
-//                contract,
-//                null,
-//                wsBinding,
-//                tomcatHost,
-//                configurationContext, null);
-//        axis2Service.setWire(inboundWire);
-////        axis2Service.setOutboundWire(outboundWire);
-//
-//        return axis2Service;
-//    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
deleted file mode 100644
index 767f59646f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.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.ws.axis2;
-
-public interface Greeter {
-
-    String sayHi();
-
-    String greetMe(String requestType);
-
-    void greetMeOneWay(String requestType);
-
-    void greetMeWithCallback(String requestType);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
deleted file mode 100644
index e5e76af0b7..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.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.ws.axis2;
-
-public interface GreetingCallback {
-
-    void greetMeCallback(String greetMeResponse);
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
deleted file mode 100644
index 4e7c1b0539..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.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.ws.axis2.itests;

-

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * Test ?wsdl works and that the returned WSDL has the correct endpoint

- *

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface Account {

-    

-    CustomerProfileData getCustomerProfile(String loginID);

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
deleted file mode 100644
index 5edb4ddc5a..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.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.ws.axis2.itests;

-

-/**

- * Test ?wsdl works and that the returned WSDL has the correct endpoint

- *

- * @version $Rev$ $Date$

- */

-public class AccountService implements Account {

-

-    public CustomerProfileData getCustomerProfile(String loginID) {

-        return new CustomerProfileData(loginID);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
deleted file mode 100644
index 2dc7d8dee4..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.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.ws.axis2.itests;
-
-import java.io.Serializable;
-
-public class Bar implements Serializable {
-    private static final long serialVersionUID = 1249963611910502668L;
-    
-    private String s;
-    private int x;
-    private Integer y;
-    
-    private Boolean b;
-    
-    public Boolean getB() {
-        return b;
-    }
-    public void setB(Boolean b) {
-        this.b = b;
-    }
-    public String getS() {
-        return s;
-    }
-    public void setS(String s) {
-        this.s = s;
-    }
-    public int getX() {
-        return x;
-    }
-    public void setX(int x) {
-        this.x = x;
-    }
-    public Integer getY() {
-        return y;
-    }
-    public void setY(Integer y) {
-        this.y = y;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
deleted file mode 100644
index 5c1ee6a435..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.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.ws.axis2.itests;

-

-/**

- * Test ?wsdl works and that the returned WSDL has the correct endpoint

- *

- * @version $Rev$ $Date$

- */

-public class CustomerProfileData {

-    

-    private String firstName;

-    private String lastName;

-    private String address;

-    private String email;

-    private String loginID;

-    private String password;

-    private int id;

-

-    public CustomerProfileData(String loginID) {

-        firstName = "John";

-        lastName = "Doe";

-        address = "345 Main Street";

-        email = "john@doe.org";

-        this.loginID = loginID;

-        password = "hello";

-        id = 1234;

-    }

-

-    public String getFirstName() {

-        return firstName;

-    }

-

-    public void setFirstName(String firstName) {

-        this.firstName = firstName;

-    }

-

-    public String getLastName() {

-        return lastName;

-    }

-

-    public void setLastName(String firstName) {

-        this.lastName = lastName;

-    }

-

-    public String getAddress() {

-        return address;

-    }

-

-    public void setAddress(String address) {

-        this.address = address;

-    }

-

-    public String getEmail() {

-        return email;

-    }

-

-    public void setEmail(String email) {

-        this.email = email;

-    }

-

-    public String getLoginID() {

-        return loginID;

-    }

-

-    public void setLoginID(String loginID) {

-        this.loginID = loginID;

-    }

-

-    public String getPassword() {

-        return password;

-    }

-

-    public void setPassword(String password) {

-        this.password = password;

-    }

-

-    public int getId() {

-        return id;

-    }

-

-    public void setId(int id) {

-        this.id = id;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
deleted file mode 100644
index 6fccbcfd00..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/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 org.apache.tuscany.sca.binding.ws.axis2.itests;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Echo {
-    
-    Foo echoFoo(Foo foo);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
deleted file mode 100644
index 5e1a4cf259..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.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.ws.axis2.itests;
-
-import org.osoa.sca.annotations.Reference;
-
-public class EchoComponent implements Echo {
-
-    @Reference
-    public Echo echoWS;
-
-    public Foo echoFoo(Foo foo) {
-        return echoWS.echoFoo(foo);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
deleted file mode 100644
index d028ced69e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.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.ws.axis2.itests;
-
-
-public class EchoImpl implements Echo {
-
-    public Foo echoFoo(Foo foo) {
-        return foo;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
deleted file mode 100644
index c7b503af17..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.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.ws.axis2.itests;
-
-import java.io.Serializable;
-
-public class Foo implements Serializable {
-    private static final long serialVersionUID = 4879476066850018458L;
-    
-    private Bar[] bars;
-
-    public Bar[] getBars() {
-        return bars;
-    }
-
-    public void setBars(Bar[] bars) {
-        this.bars = bars;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
deleted file mode 100644
index f474c12af3..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/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 org.apache.tuscany.sca.binding.ws.axis2.itests;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorld {
-    
-    String getGreetings(String s);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
deleted file mode 100644
index 88705c1a95..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.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.ws.axis2.itests;
-
-import org.osoa.sca.annotations.Reference;
-
-public class HelloWorldComponent implements HelloWorld {
-
-    @Reference
-    public HelloWorld helloWorldWS;
-    
-    public String getGreetings(String s) {
-        return helloWorldWS.getGreetings(s);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
deleted file mode 100644
index f30286feea..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.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.ws.axis2.itests;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-
-public class HelloWorldMultiService implements HelloWorldOM, HelloWorldOM2 {
-
-    public OMElement getGreetings(OMElement requestOM) {
-        String name = requestOM.getFirstElement().getText();
-
-        OMFactory omFactory = OMAbstractFactory.getOMFactory();
-        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
-        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
-        responseOM.addChild(param);
-        param.addChild(omFactory.createOMText("Hello " + name));
-        
-        return  responseOM;
-    }
-
-    public OMElement getGreetings2(OMElement requestOM) {
-        String name = requestOM.getFirstElement().getText();
-
-        OMFactory omFactory = OMAbstractFactory.getOMFactory();
-        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
-        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
-        responseOM.addChild(param);
-        param.addChild(omFactory.createOMText("Hello2 " + name));
-        
-        return  responseOM;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
deleted file mode 100644
index 7ee48d4451..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.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.axis2.itests ;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class HelloWorldNoWSDLTestCase extends TestCase {
-
-    private SCADomain domain;
-
-    public void testHelloWorld() throws Exception {
-        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-
-    /**
-     * Test a a WS call with a complex type
-     */
-    public void testEchoFoo() throws Exception {
-        Echo echo = domain.getService(Echo.class, "EchoComponent");
-       
-        Foo f = new Foo();
-        Bar b1 = new Bar();
-        b1.setS("petra");
-        b1.setX(1);
-        b1.setY(new Integer(2));
-        b1.setB(Boolean.TRUE);
-        Bar b2 = new Bar();
-        b2.setS("beate");
-        b2.setX(3);
-        b2.setY(new Integer(4));
-        b2.setB(Boolean.FALSE);
-        f.setBars(new Bar[] { b1, b2} );
-       
-        Foo f2 = echo.echoFoo(f);
-
-        assertEquals("petra", f2.getBars()[0].getS());
-        assertEquals(1, f2.getBars()[0].getX());
-        assertEquals(2, f2.getBars()[0].getY().intValue());
-        assertTrue(f2.getBars()[0].getB().booleanValue());
-        assertEquals("beate", f2.getBars()[1].getS());
-        assertEquals(3, f2.getBars()[1].getX());
-        assertEquals(4, f2.getBars()[1].getY().intValue());
-        assertFalse(f2.getBars()[1].getB().booleanValue());
-       
-    }
-   
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite");
-    }
-   
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
deleted file mode 100644
index 274f6c8d28..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.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.ws.axis2.itests;
-
-import org.apache.axiom.om.OMElement;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldOM {
-    
-    OMElement getGreetings(OMElement parmE);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
deleted file mode 100644
index bf371430a1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.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.ws.axis2.itests;
-
-import org.apache.axiom.om.OMElement;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloWorldOM2 {
-    
-    OMElement getGreetings2(OMElement parmE);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
deleted file mode 100644
index d1cbfb88fd..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.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.ws.axis2.itests;
-
-import org.apache.axiom.om.OMElement;
-import org.osoa.sca.annotations.Reference;
-
-public class HelloWorldOMComponent implements HelloWorldOM {
-
-    @Reference
-    public HelloWorldOM helloWorldWS;
-    
-    public OMElement getGreetings(OMElement om) {
-        return helloWorldWS.getGreetings(om);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
deleted file mode 100644
index 71d7bf68fb..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.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.ws.axis2.itests;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-
-public class HelloWorldOMService implements HelloWorldOM {
-
-    public OMElement getGreetings(OMElement requestOM) {
-        System.out.println(" **** getGreetings **** ");
-        String name = requestOM.getFirstElement().getText();
-
-        OMFactory omFactory = OMAbstractFactory.getOMFactory();
-        OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld");
-        OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld");
-        responseOM.addChild(param);
-        param.addChild(omFactory.createOMText("Hello " + name));
-        
-        return  responseOM;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
deleted file mode 100644
index e7511027c2..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.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.ws.axis2.itests;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class HelloWorldOMTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorldOM helloWorld;
-
-    public void testHelloWorld() throws Exception {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
-        requestOM.addChild(parmE);
-        parmE.addChild(fac.createOMText("petra"));
-        OMElement responseOM = helloWorld.getGreetings(requestOM);
-        OMElement child = (OMElement)responseOM.getFirstElement();
-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite");
-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
deleted file mode 100644
index 017d9bb478..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/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 org.apache.tuscany.sca.binding.ws.axis2.itests;
-
-public class HelloWorldService implements HelloWorld {
-
-    public String getGreetings(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
deleted file mode 100644
index a3a43d032f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.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.ws.axis2.itests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorld helloWorld;
-
-    public void testCalculator() throws Exception {
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite");
-        helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
deleted file mode 100644
index 8e17b89f33..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.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.ws.axis2.itests;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.axiom.om.OMAbstractFactory;

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMFactory;

-import org.apache.axiom.om.OMText;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public class HelloWorldWSDLMergedTestCase extends TestCase {

-

-    private SCADomain domain;

-    private HelloWorldOM helloWorld;

-

-    public void testHelloWorld() throws Exception {

-        OMFactory fac = OMAbstractFactory.getOMFactory();

-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

-        requestOM.addChild(parmE);

-        parmE.addChild(fac.createOMText("petra"));

-        OMElement responseOM = helloWorld.getGreetings(requestOM);

-        OMElement child = (OMElement)responseOM.getFirstElement();

-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite");

-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldWSDLMergedComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
deleted file mode 100644
index bfccb62cc7..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.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.ws.axis2.itests;

-

-import java.io.BufferedReader;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.net.URL;

-import java.util.List;

-

-import javax.wsdl.Definition;

-import javax.wsdl.Port;

-import javax.wsdl.Service;

-import javax.wsdl.extensions.soap.SOAPAddress;

-import javax.wsdl.factory.WSDLFactory;

-import javax.wsdl.xml.WSDLReader;

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

-import org.apache.axis2.transport.http.server.HttpUtils;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * Test ?wsdl works and that the returned WSDL has the correct endpoint

- *

- * @version $Rev$ $Date$

- */

-public class QuestionMarkWSDLImportTestCase extends TestCase {

-

-    private SCADomain domain;

-

-    /**

-     * Tests ?wsdl works and returns the correct port endpoint from the WSDL

-     */

-    public void testWSDLImportPortEndpoint() throws Exception {

-        InputStream inp = new URL("http://localhost:8086/AccountService?wsdl").openStream();

-        BufferedReader br = new BufferedReader(new InputStreamReader(inp));

-        String line;

-        while((line = br.readLine()) != null) {

-            System.out.println(line);

-        }

-        br.close();

-

-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();

-        wsdlReader.setFeature("javax.wsdl.verbose", false);

-        wsdlReader.setFeature("javax.wsdl.importDocuments", true);

-

-        Definition definition = wsdlReader.readWSDL("http://localhost:8086/AccountService?wsdl");

-        assertNotNull(definition);

-        Service service = definition.getService(new QName("http://account2/AccountService/$promoted$.ep1", "AccountService"));

-        Port port = service.getPort("AccountSoapPort");

-

-        String endpoint = getEndpoint(port);

-        String ip = HttpUtils.getIpAddress();

-        assertEquals("http://" + ip + ":8086/AccountService", endpoint);

-    }

-

-    private String getEndpoint(Port port) {

-        List wsdlPortExtensions = port.getExtensibilityElements();

-        for (final Object extension : wsdlPortExtensions) {

-            if (extension instanceof SOAPAddress) {

-                return ((SOAPAddress) extension).getLocationURI();

-            }

-        }

-        throw new RuntimeException("no SOAPAddress");

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite");

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java
deleted file mode 100644
index aa54316660..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.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.ws.axis2.itests;

-

-import java.io.BufferedReader;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.net.URL;

-import java.util.List;

-

-import javax.wsdl.Definition;

-import javax.wsdl.Port;

-import javax.wsdl.Service;

-import javax.wsdl.extensions.soap.SOAPAddress;

-import javax.wsdl.factory.WSDLFactory;

-import javax.wsdl.xml.WSDLReader;

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

-import org.apache.axis2.transport.http.server.HttpUtils;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * Test ?wsdl works and that the returned WSDL has the correct endpoint

- *

- * @version $Rev: 660340 $ $Date: 2008-05-27 01:08:32 +0100 (Tue, 27 May 2008) $

- */

-public class QuestionMarkWSDLIncludeTestCase extends TestCase {

-

-    private SCADomain domain;

-

-    /**

-     * Tests ?wsdl works and returns the correct port endpoint from the WSDL

-     */

-    public void testWSDLIncludePortEndpoint() throws Exception {

-        InputStream inp = new URL("http://localhost:8085/AccountService?wsdl").openStream();

-        BufferedReader br = new BufferedReader(new InputStreamReader(inp));

-        String line;

-        while((line = br.readLine()) != null) {

-            System.out.println(line);

-        }

-        br.close();

-

-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();

-        wsdlReader.setFeature("javax.wsdl.verbose", false);

-        wsdlReader.setFeature("javax.wsdl.importDocuments", true);

-

-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/AccountService?wsdl");

-        assertNotNull(definition);

-        Service service = definition.getService(new QName("http://accounts/AccountService/$promoted$.ep1", "AccountService"));

-        Port port = service.getPort("AccountSoapPort");

-

-        String endpoint = getEndpoint(port);

-        String ip = HttpUtils.getIpAddress();

-        assertEquals("http://" + ip + ":8085/AccountService", endpoint);

-    }

-

-    private String getEndpoint(Port port) {

-        List wsdlPortExtensions = port.getExtensibilityElements();

-        for (final Object extension : wsdlPortExtensions) {

-            if (extension instanceof SOAPAddress) {

-                return ((SOAPAddress) extension).getLocationURI();

-            }

-        }

-        throw new RuntimeException("no SOAPAddress");

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite");

-    }

-

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
deleted file mode 100644
index ac9da19119..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.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.ws.axis2.itests;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Test ?wsdl works and that the returned WSDL has the correct endpoint
- *
- * @version $Rev$ $Date$
- */
-public class QuestionMarkWSDLTestCase extends TestCase {
-
-    private SCADomain domain;
-
-    /**
-     * Tests ?wsdl works and returns the correct port endpoint from the WSDL
-     */
-    public void testWSDLPortEndpoint() throws Exception {
-        InputStream inp = new URL("http://localhost:8085/services/HelloWorldWebService?wsdl").openStream();
-        BufferedReader br = new BufferedReader(new InputStreamReader(inp));
-        String line;
-        while((line = br.readLine()) != null) {
-            System.out.println(line);
-        }
-        br.close();
-
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/services/HelloWorldWebService?wsdl");
-        assertNotNull(definition);
-        Service service = definition.getService(new QName("http://helloworld/HelloWorldService/$promoted$.ep1",
-                                                          "HelloWorldService"));
-        Port port = service.getPort("HelloWorldSoapPort");
-
-        String endpoint = getEndpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/services/HelloWorldWebService", endpoint);
-    }
-
-    /**
-     * Tests ?wsdl works and returns the correct port endpoint from binding.ws with a custom URI
-     */
-    public void testCustomEndpoint() throws Exception {
-        InputStream inp = new URL("http://localhost:8085/foo/bar?wsdl").openStream();
-        BufferedReader br = new BufferedReader(new InputStreamReader(inp));
-        String line;
-        while((line = br.readLine()) != null) {
-            System.out.println(line);
-        }
-        br.close();
-
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/foo/bar?wsdl");
-        assertNotNull(definition);
-        Service service = definition.getService(new QName("http://itests.axis2.ws.binding.sca.tuscany.apache.org/",
-                                                          "HelloWorldService"));
-        Port port = service.getPort("HelloWorldPort");
-
-        String endpoint = getEndpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/foo/bar", endpoint);
-    }
-
-    protected String getEndpoint(Port port) {
-        List wsdlPortExtensions = port.getExtensibilityElements();
-        for (final Object extension : wsdlPortExtensions) {
-            if (extension instanceof SOAPAddress) {
-                return ((SOAPAddress) extension).getLocationURI();
-            }
-        }
-        throw new RuntimeException("no SOAPAddress");
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
deleted file mode 100644
index 5efbedba4c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.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.ws.axis2.itests;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * This test verifies that the Endpoint URI specified in the wsdl takes precedence over the URI specified
- * in binding.  Ref: WS Binding Specification V1.00 - Section 2.1.1
- * 
- * @version $Rev$ $Date$
- */
-public class UriPrecedenceTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorldOM helloWorld;
-
-    public void testUriPrecedence() throws Exception {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-prec", "helloworld");
-        OMElement parmE = fac.createOMElement("name", "http://helloworld-prec", "helloworld");
-        requestOM.addChild(parmE);
-        parmE.addChild(fac.createOMText("petra"));
-        try {
-            OMElement responseOM = helloWorld.getGreetings(requestOM);
-            OMElement child = (OMElement)responseOM.getFirstElement();
-            Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
-        } catch (ServiceRuntimeException e) {
-            fail("Endpoint URI from wsdl did not take precedence over URI in binding.");
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite");
-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
deleted file mode 100644
index 56d0537a44..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.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.ws.axis2.itests.endpoints;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public abstract class AbstractHelloWorldOMTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorldOM helloWorld;
-
-    public void testCalculator() throws Exception {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
-        requestOM.addChild(parmE);
-        parmE.addChild(fac.createOMText("petra"));
-        OMElement responseOM = helloWorld.getGreetings(requestOM);
-        OMElement child = (OMElement)responseOM.getFirstElement();
-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-    
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
deleted file mode 100644
index 661afdddad..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.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.ws.axis2.itests.endpoints;
-
-public class DefaultMultiServiceTestCase extends AbstractHelloWorldOMTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
deleted file mode 100644
index 9b2e0eafa0..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.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.ws.axis2.itests.endpoints;
-
-public class DefaultSingleServiceTestCase extends AbstractHelloWorldOMTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
deleted file mode 100644
index 98d9a73926..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.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.ws.axis2.itests.endpoints;
-
-public class WSDLExplicitURITestCase extends AbstractHelloWorldOMTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
deleted file mode 100644
index 201d11a79f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.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.ws.axis2.itests.endpoints;
-
-public class WSDLRelativeURITestCase extends AbstractHelloWorldOMTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
deleted file mode 100644
index f5d87cdcee..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.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.ws.axis2.itests.epr;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class HelloWorldTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorld helloWorld;
-
-    public void testCalculator() throws Exception {
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite");
-        helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
deleted file mode 100644
index 6cdb12c221..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.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.ws.axis2.itests.policy.configparams;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.axiom.om.OMAbstractFactory;

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMFactory;

-import org.apache.axiom.om.OMText;

-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public abstract class AbstractHelloWorldOMTestCase extends TestCase {

-

-    private SCADomain domain;

-    private HelloWorldOM helloWorld;

-

-    public void testHelloWorld() throws Exception {

-        OMFactory fac = OMAbstractFactory.getOMFactory();

-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

-        requestOM.addChild(parmE);

-        parmE.addChild(fac.createOMText("petra"));

-        OMElement responseOM = helloWorld.getGreetings(requestOM);

-        OMElement child = (OMElement)responseOM.getFirstElement();

-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance(getCompositeName());

-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-    

-    protected String getCompositeName() {

-        String className = this.getClass().getName();

-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
deleted file mode 100644
index 67d6f1c56e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/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 org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams;

-

-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

- *

- * @version $Rev$ $Date$

- */

-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];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
deleted file mode 100644
index 45c5472100..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.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.ws.axis2.itests.policy.configparams;

-

-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

- *

- * @version $Rev$ $Date$

- */

-public class IntegrityPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-        	System.out.println("*** Calling Integrity Password Handler .... ");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
deleted file mode 100644
index 7a4b50cc2c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.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.ws.axis2.itests.policy.configparams;

-

-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 

- *

- * @version $Rev$ $Date$

- */

-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];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
deleted file mode 100644
index 18a713a243..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.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.ws.axis2.itests.policy.configparams;

-

-public class WSSecurityAuthenticationTestCaseFIXME extends AbstractHelloWorldOMTestCase {

-    // super class does it all getting composite based on this class name

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
deleted file mode 100644
index 1fd1b8d48e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.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.ws.axis2.itests.policy.configparams;

-

-import java.security.Provider;

-import java.security.Security;

-

-public class WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue extends AbstractHelloWorldOMTestCase {

-

-    /**

-     * @see org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.AbstractHelloWorldOMTestCase#setUp()

-     */

-    @Override

-    protected void setUp() throws Exception {

-        // Workaround an issue with IBM JDK

-        Provider jce = Security.getProvider("IBMJCE");

-        if (jce != null) {

-            // Make sure IBMJCE is used first

-            Security.removeProvider("IBMJCE");

-            Security.insertProviderAt(jce, 1);

-        }

-        super.setUp();

-    }

-    // super class does it all getting composite based on this class name

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
deleted file mode 100644
index 824132161c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.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.ws.axis2.itests.policy.configparams;

-

-public class WSSecurityIntegrityTestCase extends AbstractHelloWorldOMTestCase {

-    // super class does it all getting composite based on this class name

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
deleted file mode 100644
index 395cfe28d6..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.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.ws.axis2.itests.policy.mixed;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public abstract class AbstractHelloWorldOMTestCase extends TestCase {
-
-    private SCADomain domain;
-    private HelloWorldOM helloWorld;
-
-    public void testHelloWorld() throws Exception {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");
-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");
-        requestOM.addChild(parmE);
-        parmE.addChild(fac.createOMText("petra"));
-        OMElement responseOM = helloWorld.getGreetings(requestOM);
-        OMElement child = (OMElement)responseOM.getFirstElement();
-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-    
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
deleted file mode 100644
index 88fc0d63fa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.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.ws.axis2.itests.policy.mixed;
-
-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
- *
- * @version $Rev$ $Date$
- */
-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(" **** 1. UserId : " + pwcb.getIdentifer());
-            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
-            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
-            
-            pwcb.setPassword("TuscanyWsUserPasswd");
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
deleted file mode 100644
index 0d8914156f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.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.ws.axis2.itests.policy.mixed;
-
-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
- *
- * @version $Rev$ $Date$
- */
-public class IntegrityPWCBHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException,
-            UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-        	System.out.println("*** Calling Integrity Password Handler .... ");
-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
-            
-            System.out.println(" **** 1. UserId : " + pwcb.getIdentifer());
-            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
-            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
-            
-            pwcb.setPassword("TuscanyWsUserPasswd");
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
deleted file mode 100644
index 5840f71057..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.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.ws.axis2.itests.policy.mixed;
-
-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 
- *
- * @version $Rev$ $Date$
- */
-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(" **** 1. UserId : " + pwcb.getIdentifer());
-            System.out.println(" **** 2. Passwd : " + pwcb.getPassword());
-            System.out.println(" **** 3. Usage  : " + pwcb.getUsage());
-            
-            pwcb.setPassword("TuscanyWsUserPasswd");
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
deleted file mode 100644
index db5b88f9ac..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.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.ws.axis2.itests.policy.mixed;
-
-public class WSSecurityMixedTestCase extends AbstractHelloWorldOMTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
deleted file mode 100644
index 04de589fb1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.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.ws.axis2.itests.policy.wspolicy;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.axiom.om.OMAbstractFactory;

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMFactory;

-import org.apache.axiom.om.OMText;

-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-public abstract class AbstractHelloWorldOMTestCase extends TestCase {

-

-    private SCADomain domain;

-    private HelloWorldOM helloWorld;

-

-    public void testHelloWorld() throws Exception {

-        OMFactory fac = OMAbstractFactory.getOMFactory();

-        OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld");

-        OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld");

-        requestOM.addChild(parmE);

-        parmE.addChild(fac.createOMText("petra"));

-        OMElement responseOM = helloWorld.getGreetings(requestOM);

-        OMElement child = (OMElement)responseOM.getFirstElement();

-        Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());

-    }

-

-    @Override

-    protected void setUp() throws Exception {

-        domain = SCADomain.newInstance(getCompositeName());

-        helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        domain.close();

-    }

-    

-    protected String getCompositeName() {

-        String className = this.getClass().getName();

-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
deleted file mode 100644
index cf342653c7..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/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 org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy;

-

-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

- *

- * @version $Rev$ $Date$

- */

-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];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
deleted file mode 100644
index 84b64d3902..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.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.ws.axis2.itests.policy.wspolicy;

-

-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

- *

- * @version $Rev$ $Date$

- */

-public class IntegrityPWCBHandler implements CallbackHandler {

-

-    public void handle(Callback[] callbacks) throws IOException,

-            UnsupportedCallbackException {

-        for (int i = 0; i < callbacks.length; i++) {

-        	System.out.println("*** Calling Integrity Password Handler .... ");

-            WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
deleted file mode 100644
index 04825b6b56..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.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.ws.axis2.itests.policy.wspolicy;

-

-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 

- *

- * @version $Rev$ $Date$

- */

-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];

-            pwcb.setPassword("TuscanyWsUserPasswd");

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
deleted file mode 100644
index a439ff4c8f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.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.ws.axis2.itests.policy.wspolicy;

-

-public class WSSecurityAuthenticationTestCase extends AbstractHelloWorldOMTestCase {

-    // super class does it all getting composite based on this class name

-} 

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
deleted file mode 100644
index f37a8deeb7..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.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.ws.axis2.itests.policy.wspolicy;

-

-import java.security.Provider;

-import java.security.Security;

-

-public class WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue extends AbstractHelloWorldOMTestCase {

-

-    /**

-     * @see org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.AbstractHelloWorldOMTestCase#setUp()

-     */

-    @Override

-    protected void setUp() throws Exception {

-        // Workaround an issue with IBM JDK

-        Provider jce = Security.getProvider("IBMJCE");

-        if (jce != null) {

-            // Make sure IBMJCE is used first

-            Security.removeProvider("IBMJCE");

-            Security.insertProviderAt(jce, 1);

-        }

-        super.setUp();

-    }

-    // super class does it all getting composite based on this class name

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
deleted file mode 100644
index 18bbf98628..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.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.ws.axis2.itests.policy.wspolicy;

-

-public class WSSecurityIntegrityTestCase extends AbstractHelloWorldOMTestCase {

-    // super class does it all getting composite based on this class name

-}

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
deleted file mode 100644
index b2ccd7f97d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.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.ws.axis2.itests.soap12 ;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class HelloWorldSOAP12TestCase extends TestCase {
-
-    private SCADomain domain;
-
-    public void testHelloWorld() throws Exception {
-        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClient");
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-    public void testHelloWorldSOAP() throws Exception {
-        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP");
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-    public void testHelloWorldSOAP11() throws Exception {
-        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP11");
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-    public void testHelloWorldSOAP12() throws Exception {
-        HelloWorld helloWorld = domain.getService(HelloWorld.class, "HelloWorldClientSOAP12");
-        assertEquals("Hello petra", helloWorld.getGreetings("petra"));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite");
-    }
-   
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
deleted file mode 100644
index 88a8b9b01d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.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.ws.axis2.itests.soap12;
-
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Test ?wsdl works and that the returned WSDL has the correct endpoint
- *
- * @version $Rev$ $Date$
- */
-public class QuestionMarkWSDLTestCase extends TestCase {
-
-    private static boolean newGenerator = true;
-    private SCADomain domain;
-
-    /**
-     * Tests ?wsdl returns a soap 1.1 port by default
-     */
-    public void testSOAPDefault() throws Exception {
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep1?wsdl");
-        assertNotNull(definition);
-        Service service = definition.getService(new QName(
-                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
-                              newGenerator ? "HelloWorldService" : "HelloWorld"));
-        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
-
-        String endpoint = getSOAP11Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep1", endpoint);
-    }
-
-    /**
-     * Tests ?wsdl returns a soap 1.1 port when binding uses requires="soap.1_1"
-     */
-    public void testSOAP11Endpoint() throws Exception {
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep2?wsdl");
-        assertNotNull(definition);
-        Service service = definition.getService(new QName(
-                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
-                              newGenerator ? "HelloWorldService" : "HelloWorld"));
-        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP11port_http");
-
-        String endpoint = getSOAP11Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep2", endpoint);
-    }
-
-    /**
-     * Tests ?wsdl returns a soap 1.2 port when binding uses requires="soap.1_2"
-     */
-    public void testSOAP12Endpoint() throws Exception {
-        WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        wsdlReader.setFeature("javax.wsdl.verbose",false);
-        wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
-        Definition definition = wsdlReader.readWSDL("http://localhost:8085/ep3?wsdl");
-        assertNotNull(definition);
-        Service service = definition.getService(new QName(
-                              "http://itests.axis2.ws.binding.sca.tuscany.apache.org" + (newGenerator ? "/" : ""),
-                              newGenerator ? "HelloWorldService" : "HelloWorld"));
-        Port port = service.getPort(newGenerator ? "HelloWorldPort" : "HelloWorldSOAP12port_http");
-
-        String endpoint = getSOAP12Endpoint(port);
-        String ip = HttpUtils.getIpAddress();
-        assertEquals("http://" + ip + ":8085/ep3", endpoint);
-    }
-
-    protected String getSOAP11Endpoint(Port port) {
-        List wsdlPortExtensions = port.getExtensibilityElements();
-        for (final Object extension : wsdlPortExtensions) {
-            if (extension instanceof SOAPAddress) {
-                return ((SOAPAddress) extension).getLocationURI();
-            }
-        }
-        throw new RuntimeException("no SOAPAddress");
-    }
-
-    protected String getSOAP12Endpoint(Port port) {
-        List wsdlPortExtensions = port.getExtensibilityElements();
-        for (final Object extension : wsdlPortExtensions) {
-            if (extension instanceof SOAP12Address) {
-                return ((SOAP12Address) extension).getLocationURI();
-            }
-        }
-        throw new RuntimeException("no SOAPAddress");
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index 32b042402b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/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>

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
deleted file mode 100644
index 5cea469e3d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.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:sca="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="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)">

-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-              <wsa:Address>http://localhost:8085/services/HelloWorldWebService</wsa:Address>

-           </wsa:EndpointReference>

-        </binding.ws>

-        

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
deleted file mode 100644
index b11c50b00c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.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"

-           name="HelloWorldNoWSDL">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

-        <binding.ws uri="http://localhost:8085/helloWorld"/>

-    </service>

-

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / -->

-        <!-- interface.java interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->

-        <binding.ws uri="http://localhost:8085/helloWorld"/>

-    </reference>

-

-    <service name="Echo" promote="EchoService">

-        <binding.ws uri="http://localhost:8085/Echo"/>

-    </service>

-

-    <component name="EchoService">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.EchoImpl"/>

-    </component>

-

-    <component name="EchoComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.EchoComponent"/>

-        <reference name="echoWS" />

-    </component>

-

-    <reference name="echoWS" promote="EchoComponent/echoWS">

-        <binding.ws uri="http://localhost:8085/Echo"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
deleted file mode 100644
index f09ed09b6a..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.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.    

--->

-<xsd:schema elementFormDefault="qualified"

-            targetNamespace="http://accounts"

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

-

-    <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:schema>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
deleted file mode 100644
index ec67b84851..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
+++ /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.    

--->

-<xsd:schema elementFormDefault="qualified"

-            targetNamespace="http://accounts"

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

-

-    <xsd:include schemaLocation="customerdata.xsd" />

-    <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd" />

-    

-</xsd:schema>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
deleted file mode 100644
index 7c903c6394..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.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.    

--->

-<xsd:schema elementFormDefault="qualified"

-            targetNamespace="http://accounts"

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

-

-    <xsd:complexType name="CustomerProfileInfo">

-        <xsd:sequence>

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

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

-        </xsd:sequence>

-    </xsd:complexType>

-    

-</xsd:schema>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
deleted file mode 100644
index 394bf05506..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint1">

-           

-    <!-- 

-    exposing a component which has multiple services with a WS binding,

-    endpoint should be <componentURI>/<serviceName> so for this composite:

-    http://localhost:8085/HelloWorldService/service1 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService/HelloWorldOM">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
-			wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldMultiService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/HelloWorldService/helloWorld"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
deleted file mode 100644
index c7081b9a72..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint1">

-           

-    <!-- 

-    exposing a component with a WS binding, endpoint should be <componentURI>/<serviceName>

-    unless the component has just a single service in which case its just <componentURI>

-    so for this composite: http://localhost:8085/HelloWorldService 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"
-			wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/>

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/HelloWorldService/helloWorld"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
deleted file mode 100644
index 7d3e1d1327..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
deleted file mode 100644
index c2cd598508..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint4">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with a relative URL

-    so for this composite the service is: http://localhost:8085/HelloWorldService/myRelativeURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
deleted file mode 100644
index fe68755c47..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld-om-relative-uri" xmlns:tns="http://helloworld-om-relative-uri" 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-om">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-relative-uri" 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/helloWorld/myRelativeURI"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
deleted file mode 100644
index 38a7c045be..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="HelloWorld">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

-        <binding.ws>

-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-              <wsa:Address>http://localhost:8085/myService</wsa:Address>

-           </wsa:EndpointReference>

-        </binding.ws>

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <binding.ws>

-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-              <wsa:Address>http://localhost:8085/myService</wsa:Address>

-           </wsa:EndpointReference>

-        </binding.ws>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
deleted file mode 100644
index 7bf47bc412..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld-om-merged" xmlns:tns="http://helloworld-om-merged" 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-om-bindings">
-
-    <wsdl:import namespace="http://helloworld-om-merged"
-		location="helloworld-om-porttype.wsdl"/>  
-
-    <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://endpoint.not.used"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
deleted file mode 100644
index dee0effd99..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="HelloWorldOM-Merged">

-

-    <service name="helloWorld" promote="HelloWorldMergedService">

-        <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

-    </service>

-

-    <component name="HelloWorldMergedService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldWSDLMergedComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-    </component>

- 

-    <reference name="mergedHelloWorldWS" promote="HelloWorldWSDLMergedComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
deleted file mode 100644
index c66fa51c34..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
+++ /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.    

--->

-<wsdl:definitions targetNamespace="http://helloworld-om-merged" xmlns:tns="http://helloworld-om-merged" 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-om-porttype">

-

-    <wsdl:types>

-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-merged" 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:definitions>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
deleted file mode 100644
index baa223f41c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld-om-uri" xmlns:tns="http://helloworld-om-uri" 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-om">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-uri" 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/myExplicitURI"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
deleted file mode 100644
index 8fcbdef33d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.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"

-           name="HelloWorldOM">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

-    </service>

-    

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-    

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-    

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
deleted file mode 100644
index 73ca02246d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://helloworld-om" xmlns:tns="http://helloworld-om" 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-om">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om" 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://endpoint.not.used"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
deleted file mode 100644
index c506b09bb2..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.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.    

--->

-

-<!-- $Rev$ $Date$ -->

-

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

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

-           name="HelloWorldPrec">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <interface.wsdl interface="http://helloworld-prec#wsdl.interface(HelloWorld)" />

-        <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/>

-    </service>

-    

-    <component name="HelloWorldService">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-    

-    <component name="HelloWorldComponent">

-        <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-    

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">

-        <interface.wsdl interface="http://helloworld-prec#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-prec#wsdl.port(HelloWorldService/HelloWorldSoapPort)"

-                    uri="http://INVALID.END.POINT" />

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
deleted file mode 100644
index 5908c43e7d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.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.    
--->
-
-<!-- $Rev$ $Date$ -->
-
-<wsdl:definitions targetNamespace="http://helloworld-prec" xmlns:tns="http://helloworld-prec" 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-prec">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://helloworld-prec" 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/helloWorld"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
deleted file mode 100644
index 1a2272d7ee..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
+++ /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.    
--->
-<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:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2">
-            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/>
-        </wsdl:port>
-        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3">
-            <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
deleted file mode 100644
index da5bab45e8..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.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"

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

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" requires="authentication">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsClientAuthenticationPolicy">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
deleted file mode 100644
index 13e002be1b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" requires="confidentiality">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="confidentiality">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
deleted file mode 100644
index 2f6fab0d07..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" requires="integrity">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="integrity">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
deleted file mode 100644
index 9ff02b3a6b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
+++ /dev/null
@@ -1,108 +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://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">

-

- <sca:intent name="wsAuthentication" 

- 			 constrains="sca:binding.ws">

- 			 <description>

- 			 Communitcation thro this binding required Authentication.

- 			 </description>

- </sca:intent>	

- 

- <!-- WS Security POLICY SETS -->

-  <sca:policySet name="wsAuthenticationPolicy"

- 	provides="sca:authentication"

- 	appliesTo="//sca:binding.ws"

- 	>

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.ServerPWCBHandler</passwordCallbackClass>

-       		</action>

-      	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <sca:policySet name="wsClientAuthenticationPolicy"

- 	provides="tuscany:wsAuthentication"

- 	appliesTo="//sca:binding.ws">

- 	<tuscany:wsConfigParam>

- 		<parameter name="OutflowSecurity">

- 			<action>

- 				<items>UsernameToken</items>

- 				<user>TuscanyWsUser</user>

-				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.ClientPWCBHandler</passwordCallbackClass>" +

-                <passwordType>PasswordText</passwordType>

-               </action>

-    	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- 

- <sca:policySet name="wsIntegrityPolicy"

- 	provides="sca:integrity"

- 	appliesTo="//sca:binding.ws">

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

-		    <action>

-		        <items>Timestamp Signature</items>

-		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

-		    </action>

-		</parameter>

- 		<parameter name="OutflowSecurity">

-      		<action>

-        		<items>Timestamp Signature</items>

-        		<user>TuscanyWsUser</user>

-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>" +

-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

-      		</action>

-    	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

-

- <sca:policySet name="wsConfidentialityPolicy"

- 	provides="sca:confidentiality"

- 	appliesTo="//sca:binding.ws">

- 	<tuscany:wsConfigParam>

- 		<parameter name="InflowSecurity">

-      		<action>

-        		<items>Timestamp Signature Encrypt</items>

-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>

-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

-      		</action>

-    	</parameter>

- 		<parameter name="OutflowSecurity">

-      		<action>

-        		<items>Timestamp Signature Encrypt</items>

-        		<user>TuscanyWsUser</user>

-        		<encryptionUser>TuscanyWsUser</encryptionUser>

-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.configparams.IntegrityPWCBHandler</passwordCallbackClass>

-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties</signaturePropFile>

-      			<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

-      			<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>

-	      </action>

-    	</parameter>

- 	</tuscany:wsConfigParam>

- </sca:policySet>

- </sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
deleted file mode 100644
index db221a4bea..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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=TuscanyWsUserPasswd

-org.apache.ws.security.crypto.merlin.file=org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
deleted file mode 100644
index 307edb9b37..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
deleted file mode 100644
index 12b2b18e55..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.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"
-			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-           name="endpoint3">
-           
-    <!-- 
-    exposing a component with a WS binding using a WSDL port with an explicit URL
-    so for this composite the service is: http://localhost:8085/myExplicitURI 
-    -->      
-
-    <service name="helloWorld" promote="HelloWorldService" 
-    	policySets="tuscany:serverWsPolicyForAuthentication">
-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />
-    </service>
-
-    <component name="HelloWorldService">
-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>
-    </component>
-
-    <component name="HelloWorldComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>
-        <reference name="helloWorldWS" />
-    </component>
-
-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" 
-    	policySets="tuscany:clientWsPolicyForAuthentication">
-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />
-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"
-                    uri="http://localhost:8085/myExplicitURI"/>
-    </reference>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
deleted file mode 100644
index 75d0dc717c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
+++ /dev/null
@@ -1,332 +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://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">
-
- <!-- WS Security POLICY SETS -->
- <!-- A policyset that uses WS Policy -->
- <sca:intent name="wsAuthentication" 
- 			 constrains="sca:binding.ws">
- 			 <description>
- 			 Communitcation thro this binding required Authentication.
- 			 </description>
- </sca:intent>	
- 
- <!-- WS Security POLICY SETS -->
-  <sca:policySet name="wsAuthenticationPolicy"
- 	provides="sca:authentication"
- 	appliesTo="//sca:binding.ws"
- 	>
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
- 			<action>
- 				<items>UsernameToken</items>
- 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
-       		</action>
-      	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsClientAuthenticationPolicy"
- 	provides="tuscany:wsAuthentication"
- 	appliesTo="//sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="OutflowSecurity">
- 			<action>
- 				<items>UsernameToken</items>
- 				<user>TuscanyWsUser</user>
-				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</passwordCallbackClass>" +
-                <passwordType>PasswordText</passwordType>
-               </action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsMixedReceiverIntegrityPolicy"
- 	provides="sca:integrity"
- 	appliesTo="//sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
-		    <action>
-		        <items>Signature</items>
-		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
-		    </action>
-		</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsMixedSenderIntegrityPolicy"
- 	provides="sca:integrity"
- 	appliesTo="//sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="OutflowSecurity">
-      		<action>
-        		<items>Signature</items>
-        		<user>TuscanyWsUser</user>
-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.IntegrityPWCBHandler</passwordCallbackClass>
-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-      		</action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsServerAuthenticationIntegrityPolicy"
- 	provides="sca:authentication sca:integrity"
- 	appliesTo="//sca:binding.ws"
- 	>
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
- 			<action>
- 				<items>UsernameToken Signature</items>
- 				<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
- 				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
-       		</action>
-      	</parameter>
-      	<parameter name="OutflowSecurity">
-      		<action>
-        		<items>Signature</items>
-        		<user>TuscanyWsUser</user>
-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</passwordCallbackClass>
-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-      		</action>
-  		</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsClientAuthenticationIntegrityPolicy"
- 	provides="tuscany:wsAuthentication"
- 	appliesTo="//sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
-		    <action>
-		        <items>Signature</items>
-		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
-		    </action>
-		</parameter>
- 		<parameter name="OutflowSecurity">
- 			<action>
- 				<items>UsernameToken Signature</items>
- 				<user>TuscanyWsUser</user>
-				<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</passwordCallbackClass>" +
-				<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties</signaturePropFile>
-                <passwordType>PasswordText</passwordType>
-                <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-            </action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="clientWsPolicyForAuthentication"
- 	provides="sca:authentication"
- 	appliesTo="//sca:binding.ws"
- 	>
- 	<wsp:Policy wsu:Id="UTOverTransport" 
- 		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:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
-				</wsp:Policy>
-			</sp:SignedSupportingTokens>
-			
-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
-				<ramp:user>TuscanyWsUser</ramp:user>
-				<!-- ramp:passwordType>PasswordText</ramp:passwordType-->
-				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ClientPWCBHandler</ramp:passwordCallbackClass>
-			</ramp:RampartConfig>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
- </sca:policySet>
- 
- <sca:policySet name="serverWsPolicyForAuthentication"
- 	provides="sca:authentication"
- 	appliesTo="//sca:binding.ws"
- 	>
- 	<wsp:Policy wsu:Id="UTOverTransport" 
- 		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:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
-				</wsp:Policy>
-			</sp:SignedSupportingTokens>
-			
-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
-				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.ServerPWCBHandler</ramp:passwordCallbackClass>
-			</ramp:RampartConfig>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
- </sca:policySet>
- 
-  <!-- A policyset that uses WS Policy --> 
- <sca:policySet name="serverWsPolicyForIntegrity"
- 	provides="sca: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>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</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">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.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>
- 
- 
- <!-- A policyset that uses WS Policy --> 
- <!-- sca:policySet name="tuscany:wsSecurityPolicyForIntegritys"
- 	provides="sca: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>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed.IntegrityPWCBHandler</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">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.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/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
deleted file mode 100644
index 8f9158a0f8..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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=TuscanyWsUserPasswd
-org.apache.ws.security.crypto.merlin.file=org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
deleted file mode 100644
index 307edb9b37..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
deleted file mode 100644
index 2a22a0905d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.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"

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

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" policySets="tuscany:wsSecurityPolicyForAuthentication">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsSecurityPolicyForAuthentication">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
deleted file mode 100644
index e6f999aad7..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.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:sca="http://www.osoa.org/xmlns/sca/1.0"

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" policySets="wsSecurityPolicyForConfidentiality">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="wsSecurityPolicyForConfidentiality">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
deleted file mode 100644
index d9e889768b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.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"

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

-           name="endpoint3">

-           

-    <!-- 

-    exposing a component with a WS binding using a WSDL port with an explicit URL

-    so for this composite the service is: http://localhost:8085/myExplicitURI 

-    -->      

-

-    <service name="helloWorld" promote="HelloWorldService" policySets="tuscany:wsSecurityPolicyForIntegrity">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMService"/>

-    </component>

-

-    <component name="HelloWorldComponent">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOMComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="tuscany:wsSecurityPolicyForIntegrity">

-        <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" />

-        <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"

-                    uri="http://localhost:8085/myExplicitURI"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
deleted file mode 100644
index 200400f0b5..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ /dev/null
@@ -1,211 +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://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">

-

- <sca:intent name="wsAuthentication" 

- 			 constrains="sca:binding.ws">

- 			 <description>

- 			 Communitcation thro this binding required Authentication.

- 			 </description>

- </sca:intent>	

- 

- <!-- WS Security POLICY SETS -->

- <!-- A policyset that uses WS Policy -->

- <sca:policySet name="wsSecurityPolicyForAuthentication"

- 	provides="sca:authentication"

- 	appliesTo="sca:binding.ws"

- 	>

- 	<wsp:Policy wsu:Id="UTOverTransport" 

- 		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:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-				<wsp:Policy>

-					<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />

-				</wsp:Policy>

-			</sp:SignedSupportingTokens>

-			

-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-				<ramp:user>TuscanyWsUser</ramp:user>

-				<ramp:passwordType>PasswordText</ramp:passwordType>

-				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.ClientPWCBHandler</ramp:passwordCallbackClass>

-			</ramp:RampartConfig>

-			</wsp:All>

-		</wsp:ExactlyOne>

-	</wsp:Policy>

- </sca:policySet>

- 

-  <!-- A policyset that uses WS Policy --> 

- <sca:policySet name="wsSecurityPolicyForIntegrity"

- 	provides="sca: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>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</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">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.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>

- 

- <!-- A policyset that uses WS Policy -->

- <sca:policySet name="wsSecurityPolicyForConfidentiality"

- 	provides="sca:confidentiality"

- 	appliesTo="sca:binding.ws">

- 	<wsp:Policy wsu:Id="SigEncr" 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>

-			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">

-				<sp:Body/>

-			</sp:EncryptedParts>

-

-			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

-				<ramp:user>TuscanyWsUser</ramp:user>

-				<ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser>

-				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.IntegrityPWCBHandler</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">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>

-						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

-					</ramp:crypto>

-				</ramp:signatureCrypto>

-				

-				<ramp:encryptionCypto>

-					<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">org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks</ramp:property>

-						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property>

-					</ramp:crypto>

-				</ramp:encryptionCypto>

-			</ramp:RampartConfig>

-

-		</wsp:All>

-	</wsp:ExactlyOne>

-</wsp:Policy>

- </sca:policySet>

- 

- </sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
deleted file mode 100644
index 307edb9b37..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
deleted file mode 100644
index 41a491361f..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
+++ /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.    

--->

-<wsdl:definitions targetNamespace="http://account3"

-                  xmlns:tns="http://account3"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

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

-	              name="questionmark-import-nested">

-

-    <wsdl:types>

-        <xsd:schema elementFormDefault="qualified"

-                    targetNamespace="http://account3"

-                    xmlns:account="http://accounts"

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

-

-            <xsd:import namespace="http://accounts" schemaLocation="customerdefs.xsd" />

-

-            <xsd:element name="getCustomerProfile">

-                <xsd:complexType>

-                    <xsd:sequence>

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

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="getCustomerProfileResponse">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="customerProfile"

-                            type="account:CustomerProfileData" />

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-            

-        </xsd:schema>

-    </wsdl:types>

-

-    <wsdl:message name="getCustomerProfileRequest">

-        <wsdl:part element="tns:getCustomerProfile" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:message name="getCustomerProfileResponse">

-        <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" />

-    </wsdl:message>

-

-    <wsdl:portType name="Account">

-        <wsdl:operation name="getCustomerProfile">

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

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

-        </wsdl:operation>

-    </wsdl:portType>

-

-</wsdl:definitions>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
deleted file mode 100644
index 99a8c6d81d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.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://account2"
-                  xmlns:tns="http://account2"
-                  xmlns:account3="http://account3"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	              name="questionmark-import">
-
-    <wsdl:import namespace="http://account3" location="/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl" />
-
-    <wsdl:binding name="AccountSoapBinding" type="account3:Account">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getCustomerProfile">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getCustomerProfileRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getCustomerProfileResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="AccountService">
-        <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort">
-            <wsdlsoap:address location="http://localhost:8086/AccountService" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
deleted file mode 100644
index 80e4b62801..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://accounts"
-                  xmlns:tns="http://accounts"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	              name="questionmark-include">
-
-    <wsdl:types>
-        <xsd:schema elementFormDefault="qualified"
-                    targetNamespace="http://accounts"
-                    xmlns:account="http://accounts"
-                    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd" />
-
-            <xsd:element name="getCustomerProfile">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="loginID" type="xsd:string" />
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-
-            <xsd:element name="getCustomerProfileResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="customerProfile"
-                            type="xsd:string" />
-                        <!--
-                        <xsd:element name="customerProfile"
-                            type="account:CustomerProfileData" />
-                        -->
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            
-        </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:message name="getCustomerProfileRequest">
-        <wsdl:part element="tns:getCustomerProfile" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:message name="getCustomerProfileResponse">
-        <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" />
-    </wsdl:message>
-
-    <wsdl:portType name="Account">
-        <wsdl:operation name="getCustomerProfile">
-            <wsdl:input message="tns:getCustomerProfileRequest" name="getCustomerProfileRequest" />
-            <wsdl:output message="tns:getCustomerProfileResponse" name="getCustomerProfileResponse" />
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="AccountSoapBinding" type="tns:Account">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="getCustomerProfile">
-            <wsdlsoap:operation soapAction="" />
-            <wsdl:input name="getCustomerProfileRequest">
-                <wsdlsoap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output name="getCustomerProfileResponse">
-                <wsdlsoap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-
-    </wsdl:binding>
-
-    <wsdl:service name="AccountService">
-        <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/AccountService" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
deleted file mode 100644
index 008d42d03d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.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"

-           name="QuestionMarkWSDLImport">

-

-    <service name="ep1" promote="AccountService">

-        <binding.ws wsdlElement="http://account2#wsdl.port(AccountService/AccountSoapPort)" />

-    </service>

-

-    <component name="AccountService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.AccountService" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
deleted file mode 100644
index 7fff56377b..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.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"

-           name="QuestionMarkWSDLInclude">

-

-    <service name="ep1" promote="AccountService">

-        <binding.ws wsdlElement="http://accounts#wsdl.port(AccountService/AccountSoapPort)" />

-    </service>

-

-    <component name="AccountService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.AccountService" />

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
deleted file mode 100644
index c042ae5675..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.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:sca="http://www.osoa.org/xmlns/sca/1.0"
-           name="QuestionMarkWSDLTests">
-
-    <service name="ep1" promote="HelloWorldService">
-        <binding.ws wsdlElement="http://helloworld#wsdl.service(HelloWorldService)"/>
-        <!--
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-        -->
-    </service>
-
-    <service name="ep2" promote="HelloWorldService">
-        <binding.ws uri="http://localhost:8085/foo/bar"  />
-    </service>
-
-    <component name="HelloWorldService">
-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
deleted file mode 100644
index 5042dc7a0c..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.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.    

--->

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

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

-           name="HelloWorld">

-

-    <service name="helloWorld" promote="HelloWorldService">

-        <binding.ws uri="http://localhost:8085/helloWorld"/>

-    </service>

-    <service name="helloWorldSOAP" promote="HelloWorldService">

-        <binding.ws requires="soap" uri="http://localhost:8085/helloWorldSOAP"/>

-    </service>

-    <service name="helloWorldSOAP11" promote="HelloWorldService">

-        <binding.ws requires="soap.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>

-    </service>

-    <service name="helloWorldSOAP12" promote="HelloWorldService">

-        <binding.ws requires="soap.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

-    </component>

-

-    <component name="HelloWorldClient">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-    <component name="HelloWorldClientSOAP">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-    <component name="HelloWorldClientSOAP11">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-    <component name="HelloWorldClientSOAP12">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldComponent"/>

-        <reference name="helloWorldWS" />

-    </component>

-

-    <reference name="helloWorldWS" promote="HelloWorldClient/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorld"/>

-    </reference>

-    <reference name="helloWorldWS" promote="HelloWorldClientSOAP/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="soap"/>

-    </reference>

-    <reference name="helloWorldWS" promote="HelloWorldClientSOAP11/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="soap.1_1"/>

-    </reference>

-    <reference name="helloWorldWS" promote="HelloWorldClientSOAP12/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="soap.1_2"/>

-    </reference>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
deleted file mode 100644
index d2e2fd3e09..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.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"

-           name="QuestionMarkWSDLTests">

-

-    <service name="ep1" promote="HelloWorldService">

-        <binding.ws uri="http://localhost:8085/ep1"/>

-    </service>

-

-    <service name="ep2" promote="HelloWorldService">

-        <binding.ws requires="soap.1_1"  uri="http://localhost:8085/ep2"/>

-    </service>

-

-    <service name="ep3" promote="HelloWorldService">

-        <binding.ws requires="soap.1_2"  uri="http://localhost:8085/ep3"/>

-    </service>

-

-    <component name="HelloWorldService">

-		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldService"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/LICENSE b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/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/tags/java/sca/1.3/modules/binding-ws-wsdlgen/NOTICE b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/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/tags/java/sca/1.3/modules/binding-ws-wsdlgen/pom.xml b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/pom.xml
deleted file mode 100644
index 2512eada63..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-binding-ws-wsdlgen</artifactId>

-    <name>Apache Tuscany SCA Web Service binding WSDL Generator</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface-java</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface-java-jaxws</artifactId>

-            <version>1.3</version>

-        </dependency>        

-        <dependency>

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

-            <artifactId>tuscany-xsd</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-xsd-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-databinding</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-policy-security-ws</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-core-databinding</artifactId>

-            <version>1.3</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.ws.wsdlgen</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.binding.ws.wsdlgen*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
deleted file mode 100644
index d94ed30c34..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.wsdlgen;
-
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.WSDLException;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.databinding.DataBindingExtensionPoint;
-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.java.JavaInterfaceContract;
-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.WSDLInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.impl.InvalidWSDLException;
-import org.apache.tuscany.sca.interfacedef.wsdl.impl.WSDLInterfaceIntrospectorImpl;
-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.IntentAttachPoint;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BindingWSDLGenerator {
-    private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName());
-    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "soap.1_2");
-
-    public static boolean printWSDL;     // external code sets this to print generated WSDL
-
-    private BindingWSDLGenerator() {
-        // this class has static methods only and cannot be instantiated
-    }
-
-    /**
-     * Log a warning message.
-     * @param problem
-     */
-    private static void logWarning(Problem problem) {
-        Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName());
-        if (problemLogger != null){
-            problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, problem.getMessageId(), problem.getMessageParams());
-        } else {
-            logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName());
-        }
-    }
-
-    /**
-     * Report a warning.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private static void warning(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) {
-        Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            logWarning(problem);
-        }
-    }
-
-    /**
-     * Report an error.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) {
-        Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            throw new WSDLGenerationException(problem.toString(), null, problem);
-        }
-    }
-  
-    /**
-     * Report an exception error.
-     * @param message
-     * @param binding
-     * @param exception
-     */
-    private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, Exception ex) {
-        Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            throw new WSDLGenerationException(problem.toString(), ex, problem);
-        }
-    }
-  
-    /**
-     * Report a fatal error.
-     * @param message
-     * @param binding
-     * @param exception
-     */
-    private static void fatal(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) {
-        Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR,wsBinding, message, (Object[])messageParameters);
-        throw new WSDLGenerationException(problem.toString(), null, problem);
-    }
-  
-    /**
-     * Report a fatal exception error.
-     * @param message
-     * @param binding
-     * @param exception
-     */
-    private static void fatal(Monitor monitor, String message, WebServiceBinding wsBinding, Exception ex) {
-        Problem problem = new ProblemImpl(BindingWSDLGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, ex);
-        throw new WSDLGenerationException(problem.toString(), ex, problem);
-    }
-
-    /**
-     * This method can be called from the binding builder or from the runtime.
-     * Report problems and exceptions in the most appropriate way for both
-     * of these cases.
-     */
-    public static void generateWSDL(Component component,
-                                    AbstractContract contract,
-                                    WebServiceBinding wsBinding,
-                                    ExtensionPointRegistry extensionPoints,
-                                    Monitor monitor) {
-        try {
-            createWSDLDocument(component, contract, wsBinding, extensionPoints, monitor);
-        } catch (WSDLGenerationException ex) {
-            if (ex.getProblem() != null) {
-                warning(monitor, "WsdlGenProblem", wsBinding, component.getName(), contract.getName());
-                if (monitor != null) {
-                    monitor.problem(ex.getProblem());
-                } else {
-                    throw ex;
-                }
-            } else if (ex.getCause() instanceof Exception) {
-                warning(monitor, "WsdlGenException", wsBinding, component.getName(), contract.getName());
-                error(monitor, "UnexpectedException", wsBinding, (Exception)ex.getCause());
-            } else { // should never happen
-                throw new IllegalStateException(ex);
-            }
-        } catch (RuntimeException ex) {
-            warning(monitor, "WsdlGenException", wsBinding, component.getName(), contract.getName());
-            error(monitor, "UnexpectedException", wsBinding, ex);
-        }    
-    }        
-
-    private static void createWSDLDocument(Component component,
-                                           AbstractContract contract,
-                                           WebServiceBinding wsBinding,
-                                           ExtensionPointRegistry extensionPoints,
-                                           Monitor monitor) {
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class);
-        WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class);
-
-        if (((Contract)contract).getInterfaceContract(wsBinding) == null) {
-            // can happen if incorrect component service name
-            fatal(monitor, "MissingInterfaceContract", wsBinding, component.getName(), contract.getName()); 
-        }
-
-        InterfaceContract icontract = wsBinding.getBindingInterfaceContract();
-        if (icontract == null) {
-            icontract = ((Contract)contract).getInterfaceContract(wsBinding).makeUnidirectional(false);
-            if (icontract instanceof JavaInterfaceContract) {
-                ModelResolver resolver = component instanceof ResolverExtension ?
-                                             ((ResolverExtension)component).getModelResolver() : null;
-                icontract = createWSDLInterfaceContract(
-                                    (JavaInterfaceContract)icontract,
-                                    requiresSOAP12(wsBinding),
-                                    resolver,
-                                    dataBindings,
-                                    wsdlFactory,
-                                    xsdFactory,
-                                    monitor);
-            } else {
-                try {
-                    //TUSCANY-2316 Cloning the Interface Contract to avoid overriding data binding information 
-                    icontract = (InterfaceContract)icontract.clone();
-                } catch (Exception e) {
-                    //ignore
-                }
-            }
-            wsBinding.setBindingInterfaceContract(icontract);
-        }
-        
-        // TODO - fix up the conversational flag and operation sequences in case the contract has come from WSDL
-        // as we don't yet support requires="conversational" or sca:endConversation annotations
-        // in WSDL interface descriptions (see section 1.5.4 of the Assembly Specification V1.0)
-        if (contract.getInterfaceContract().getInterface() != null ) {
-            icontract.getInterface().setConversational(contract.getInterfaceContract().getInterface().isConversational());
-            
-            for (Operation operation : icontract.getInterface().getOperations()){
-                Operation serviceOperation = null;
-                
-                for (Operation tmpOp : contract.getInterfaceContract().getInterface().getOperations()){
-                    if (operation.getName().equals(tmpOp.getName())) {
-                        serviceOperation = tmpOp;
-                        break;
-                    }
-                }
-                
-                if (serviceOperation != null ){
-                    operation.setConversationSequence(serviceOperation.getConversationSequence());
-                }
-            }
-        }
-
-        /*
-        // Look at all the Web Service bindings of the SCA service to see if any
-        // of them have an existing generated WSDL definitions document.  If found,
-        // use it for this binding as well.  If not found, generate a new document.
-        Definition definition = null;
-        for (Binding binding : contract.getBindings()) {
-            if (binding instanceof WebServiceBinding) {
-                definition = ((WebServiceBinding)binding).getWSDLDocument();
-                if (definition != null) {
-                    wsBinding.setWSDLDocument(definition);
-                    break;
-                }
-            }
-        }
-        */
-        // The above code is currently not used.  Instead, we only look
-        // for a WSDL definitions document in this binding and don't
-        // attempt to share the same document across multiple bindings.
-
-        // generate a WSDL definitions document if needed
-        Definition definition = wsBinding.getWSDLDocument();
-        if (definition == null) {
-            definition = WSDLServiceGenerator.configureWSDLDefinition(wsBinding, component, contract, monitor);
-            wsBinding.setWSDLDocument(definition);
-        }
-    }
-
-    protected static boolean requiresSOAP12(WebServiceBinding wsBinding) {
-        if (wsBinding instanceof IntentAttachPoint) {
-            List<Intent> intents = ((IntentAttachPoint)wsBinding).getRequiredIntents();
-            for (Intent intent : intents) {
-                if (SOAP12_INTENT.equals(intent.getName())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Create a WSDLInterfaceContract from a JavaInterfaceContract
-     */
-    protected static WSDLInterfaceContract createWSDLInterfaceContract(JavaInterfaceContract contract,
-                                                                       boolean requiresSOAP12,
-                                                                       ModelResolver resolver,
-                                                                       DataBindingExtensionPoint dataBindings,
-                                                                       WSDLFactory wsdlFactory,
-                                                                       XSDFactory xsdFactory,
-                                                                       Monitor monitor) {
-
-        WSDLInterfaceContract wsdlContract = wsdlFactory.createWSDLInterfaceContract();
-        WSDLInterface wsdlInterface = wsdlFactory.createWSDLInterface();
-        wsdlContract.setInterface(wsdlInterface);
-
-        WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-        JavaInterface iface = (JavaInterface)contract.getInterface();
-
-        Definition def = null;
-        try {
-            Interface2WSDLGenerator wsdlGenerator =
-                new Interface2WSDLGenerator(requiresSOAP12, resolver, dataBindings, xsdFactory, monitor);
-            def = wsdlGenerator.generate(iface, wsdlDefinition);
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-
-        // for debugging
-        if (printWSDL) {
-            try {
-                System.out.println("Generated WSDL for Java interface " + iface.getName() + " class " + iface.getJavaClass().getName());
-                WSDLWriter writer =  javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
-                writer.writeWSDL(def, System.out);
-            } catch (WSDLException e) {
-                throw new WSDLGenerationException(e);
-            }
-        }
-
-        wsdlDefinition.setDefinition(def);
-        wsdlInterface.setWsdlDefinition(wsdlDefinition);
-        wsdlInterface.setRemotable(true);
-        wsdlInterface.setConversational(contract.getInterface().isConversational());
-        wsdlInterface.setUnresolved(false);
-        wsdlInterface.setRemotable(true);
-        PortType portType = (PortType)def.getAllPortTypes().values().iterator().next();
-        wsdlInterface.setPortType(portType);
-
-        try {
-            for (Operation op : iface.getOperations()) {
-                javax.wsdl.Operation wsdlOp = portType.getOperation(op.getName(), null, null);
-                wsdlInterface.getOperations().add(WSDLInterfaceIntrospectorImpl.getOperation(
-                                                      wsdlOp, wsdlDefinition, resolver, xsdFactory));
-            }
-        } catch (InvalidWSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-
-        return wsdlContract;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
deleted file mode 100644
index 2e8e34853e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.wsdlgen;
-
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.OperationType;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.wsdl.PortType;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.schema.Schema;
-import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-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.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-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.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-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.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaException;
-import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * @version $Rev: 670103 $ $Date: 2008-06-21 01:35:00 +0100 (Sat, 21 Jun 2008) $
- */
-public class Interface2WSDLGenerator {
-    private static final Logger logger = Logger.getLogger(Interface2WSDLGenerator.class.getName());
-    private static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
-    private static final String SCHEMA_NAME = "schema";
-    private static final QName SCHEMA_QNAME = new QName(SCHEMA_NS, SCHEMA_NAME);
-    private static final String XMLNS_NS = "http://www.w3.org/2000/xmlns/";
-    
-    private static final String ANYTYPE_NAME = "anyType";
-    private static final QName ANYTYPE_QNAME = new QName(SCHEMA_NS, ANYTYPE_NAME);
-
-
-    private WSDLFactory factory;
-    private DataBindingExtensionPoint dataBindings;
-    private WSDLDefinitionGenerator definitionGenerator;
-    private boolean requiresSOAP12;
-    private ModelResolver resolver;
-    private XSDFactory xsdFactory;
-    private Monitor monitor;
-
-    public Interface2WSDLGenerator(boolean requiresSOAP12,
-                                   ModelResolver resolver,
-                                   DataBindingExtensionPoint dataBindings,
-                                   XSDFactory xsdFactory,
-                                   Monitor monitor) throws WSDLException {
-        super();
-        this.requiresSOAP12 = requiresSOAP12; 
-        this.resolver = resolver; 
-        definitionGenerator = new WSDLDefinitionGenerator(requiresSOAP12);
-        this.dataBindings = dataBindings;
-        this.xsdFactory = xsdFactory;
-        this.monitor = monitor;
-        this.factory = WSDLFactory.newInstance();
-    }
-
-    /**
-     * Log a warning message.
-     * @param problem
-     */
-    private static void logWarning(Problem problem) {
-        Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName());
-        if (problemLogger != null){
-            problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, problem.getMessageId(), problem.getMessageParams());
-        } else {
-            logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName());
-        }
-    }
-
-    /**
-     * Report a warning.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private void warning(String message, Interface interfaze, String... messageParameters) {
-        Problem problem = new ProblemImpl(this.getClass().getName(), "wsdlgen-validation-messages", Severity.WARNING, interfaze, message, (Object[])messageParameters);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            logWarning(problem);
-        }
-    }
-
-    /**
-     * Report a fatal error.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private void fatal(String message, Interface interfaze, String... messageParameters) {
-        Problem problem = new ProblemImpl(this.getClass().getName(), "wsdlgen-validation-messages", Severity.ERROR, interfaze, message, (Object[])messageParameters);
-        throw new WSDLGenerationException(problem.toString(), null, problem);
-    }
-    
-    private void addDataType(Map<XMLTypeHelper, List<DataType>> map, DataType type, Map<String, XMLTypeHelper> helpers) {
-        if (type == null) {
-            return;
-        }
-        String db = type.getDataBinding();
-        if (db == null) {
-            return;
-        }
-        if ("java:array".equals(db)) {
-            DataType dt = (DataType)type.getLogical();
-            db = dt.getDataBinding();
-        }
-        XMLTypeHelper helper = helpers.get(db);
-        List<DataType> types = map.get(helper);
-        if (types == null) {
-            types = new ArrayList<DataType>();
-            map.put(helper, types);
-        }
-        types.add(type);
-    }
-    
-    private Map<XMLTypeHelper, List<DataType>> getDataTypes(Interface intf, boolean useWrapper, Map<String, XMLTypeHelper> helpers) {
-        Map<XMLTypeHelper, List<DataType>> dataTypes = new HashMap<XMLTypeHelper, List<DataType>>();
-        for (Operation op : intf.getOperations()) {
-            WrapperInfo wrapper = op.getWrapper();
-            if (useWrapper && wrapper != null) {
-                DataType dt1 = wrapper.getInputWrapperType();
-                addDataType(dataTypes, dt1, helpers);
-                DataType dt2 = wrapper.getOutputWrapperType();
-                addDataType(dataTypes, dt2, helpers);
-            } else {
-                for (DataType dt1 : op.getInputType().getLogical()) {
-                    addDataType(dataTypes, dt1, helpers);
-                }
-                DataType dt2 = op.getOutputType();
-                addDataType(dataTypes, dt2, helpers);
-            }
-            for (DataType<DataType> dt3 : op.getFaultTypes()) {
-                DataType dt4 = dt3.getLogical();
-                addDataType(dataTypes, dt4, helpers);
-            }
-        }
-        return dataTypes;
-    }
-
-
-    public Definition generate(Interface interfaze, WSDLDefinition wsdlDefinition) throws WSDLException {
-        if (interfaze == null) {
-            return null;
-        }
-        if (interfaze instanceof WSDLInterface) {
-            return ((WSDLInterface)interfaze).getWsdlDefinition().getDefinition();
-        }
-        JavaInterface iface = (JavaInterface)interfaze;
-        if (!interfaze.isRemotable()) {
-            fatal("InterfaceNotRemotable", interfaze, iface.getName());
-        }
-        QName name = getQName(iface);
-        Definition definition = factory.newDefinition();
-        if (requiresSOAP12) {
-            definition.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-        } else {
-            definition.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-        }
-        definition.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
-        definition.addNamespace("xs", SCHEMA_NS);
-
-        String namespaceURI = name.getNamespaceURI();
-        definition.setTargetNamespace(namespaceURI);
-        definition.setQName(new QName(namespaceURI, name.getLocalPart() + "Service", name.getPrefix()));
-        definition.addNamespace(name.getPrefix(), namespaceURI);
-
-        PortType portType = definition.createPortType();
-        portType.setQName(name);
-        Binding binding = definitionGenerator.createBinding(definition, portType);
-        Map<String, XMLTypeHelper> helpers = new HashMap<String, XMLTypeHelper>();
-        Map<QName, List<ElementInfo>> wrappers = new HashMap<QName, List<ElementInfo>>();
-        for (Operation op : interfaze.getOperations()) {
-            javax.wsdl.Operation operation = generateOperation(definition, op, helpers, wrappers);
-            portType.addOperation(operation);
-            String action = ((JavaOperation)op).getAction();
-            BindingOperation bindingOp = definitionGenerator.createBindingOperation(definition, operation, action);
-            binding.addBindingOperation(bindingOp);
-        }
-        portType.setUndefined(false);
-        definition.addPortType(portType);
-        binding.setUndefined(false);
-        definition.addBinding(binding);
-        wsdlDefinition.setBinding(binding);
-
-        // call each helper in turn to populate the wsdl.types element
-        XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); 
-
-        for (Map.Entry<XMLTypeHelper, List<DataType>> en: getDataTypes(interfaze, false, helpers).entrySet()) {
-            XMLTypeHelper helper = en.getKey();
-            if (helper == null) {
-                continue;
-            }
-            List<XSDefinition> xsDefinitions = helper.getSchemaDefinitions(xsdFactory, resolver, en.getValue());
-            for (XSDefinition xsDef: xsDefinitions) {
-                addSchemaExtension(xsDef, schemaCollection, wsdlDefinition, definition);
-            }
-        }
-
-        // remove global wrapper elements with schema definitions from generation list
-        for (QName wrapperName: new HashSet<QName>(wrappers.keySet())) {
-            if (wsdlDefinition.getXmlSchemaElement(wrapperName) != null) {
-                wrappers.remove(wrapperName);
-            }
-        }
-
-        // generate schema elements for wrappers that aren't defined in the schemas
-        if (wrappers.size() > 0) {
-            int i = 0;
-            int index = 0;
-            Map<String, XSDefinition> wrapperXSDs = new HashMap<String, XSDefinition>();
-            Map<Element, Map<String, String>> prefixMaps = new HashMap<Element, Map<String, String>>();
-            for (Map.Entry<QName, List<ElementInfo>> entry: wrappers.entrySet()) {
-                String targetNS = entry.getKey().getNamespaceURI();
-                Document schemaDoc = null;
-                Element schema = null;
-                XSDefinition xsDef = wrapperXSDs.get(targetNS);
-                if (xsDef != null) {
-                    schemaDoc = xsDef.getDocument();
-                    schema = schemaDoc.getDocumentElement();
-                } else {
-                    schemaDoc = createDocument();
-                    schema = schemaDoc.createElementNS(SCHEMA_NS, "xs:schema");
-                    // The elementFormDefault should be set to unqualified, see TUSCANY-2388
-                    schema.setAttribute("elementFormDefault", "unqualified");
-                    schema.setAttribute("attributeFormDefault", "qualified");
-                    schema.setAttribute("targetNamespace", targetNS);
-                    schema.setAttributeNS(XMLNS_NS, "xmlns:xs", SCHEMA_NS);
-                    schemaDoc.appendChild(schema);
-                    Schema schemaExt = createSchemaExt(definition);
-                    schemaExt.setElement(schema);
-                    prefixMaps.put(schema, new HashMap<String, String>());
-                    xsDef = xsdFactory.createXSDefinition();
-                    xsDef.setUnresolved(true);
-                    xsDef.setNamespace(targetNS);
-                    xsDef.setDocument(schemaDoc);
-                    // TUSCANY-2465: Set the system id to avoid schema conflict
-                    xsDef.setLocation(URI.create("xsd_" + index + ".xsd"));
-                    index++;
-                    wrapperXSDs.put(targetNS, xsDef);
-                }
-                Element wrapper = schemaDoc.createElementNS(SCHEMA_NS, "xs:element");
-                schema.appendChild(wrapper);
-                wrapper.setAttribute("name", entry.getKey().getLocalPart());
-                if (entry.getValue().size() == 1 && entry.getValue().get(0).getQName() == null) {
-                    // special case for global fault element
-                    QName typeName = entry.getValue().get(0).getType().getQName();
-                    wrapper.setAttribute("type", typeName.getLocalPart());
-                } else {
-                    // normal wrapper containing type definition inline
-                    Element complexType = schemaDoc.createElementNS(SCHEMA_NS, "xs:complexType");
-                    wrapper.appendChild(complexType);
-                    if (entry.getValue().size() > 0) {
-                        Element sequence = schemaDoc.createElementNS(SCHEMA_NS, "xs:sequence");
-                        complexType.appendChild(sequence);
-                        for (ElementInfo element: entry.getValue()) {
-                            Element xsElement = schemaDoc.createElementNS(SCHEMA_NS, "xs:element"); 
-                            if (element.isMany()) {
-                                xsElement.setAttribute("maxOccurs", "unbounded");
-                            }
-                            xsElement.setAttribute("minOccurs", "0");
-                            xsElement.setAttribute("name", element.getQName().getLocalPart());
-                            if (element.isNillable()) {
-                                xsElement.setAttribute("nillable", "true");
-                            }
-                            QName typeName = element.getType().getQName();
-                            String nsURI = typeName.getNamespaceURI();
-                            if ("".equals(nsURI) || targetNS.equals(nsURI)) {
-                                xsElement.setAttribute("type", typeName.getLocalPart());
-                            } else if (SCHEMA_NS.equals(nsURI)) {
-                                xsElement.setAttribute("type", "xs:" + typeName.getLocalPart());
-                            } else {
-                                Map<String, String> prefixMap = prefixMaps.get(schema);
-                                String prefix = prefixMap.get(nsURI);
-                                if (prefix == null) {
-                                    prefix = "ns" + i++;
-                                    prefixMap.put(nsURI, prefix);
-                                    schema.setAttributeNS(XMLNS_NS, "xmlns:" + prefix, nsURI);
-                                }
-                                xsElement.setAttribute("type", prefix + ":" + typeName.getLocalPart());
-                            }
-                            sequence.appendChild(xsElement);
-                        }
-                    }
-                }
-            }
- 
-            // resolve XSDefinitions containing generated wrappers
-            for (XSDefinition xsDef: wrapperXSDs.values()) {
-                loadXSD(schemaCollection, xsDef);
-                wsdlDefinition.getXmlSchemas().add(xsDef);
-            }
-        }
-
-        return definition;
-    }
-    
-    private void addSchemaExtension(XSDefinition xsDef,
-                                    XmlSchemaCollection schemaCollection,
-                                    WSDLDefinition wsdlDefinition,
-                                    Definition definition) throws WSDLException {
-        if (xsDef.getAggregatedDefinitions() != null) {
-            for (XSDefinition xsd: xsDef.getAggregatedDefinitions()) {
-                addSchemaExtension(xsd, schemaCollection, wsdlDefinition, definition);
-            }
-        } else {
-            String nsURI = xsDef.getNamespace();
-            Document document = xsDef.getDocument();
-            if (document == null) {
-                try {
-                    NamespaceMap prefixMap = new NamespaceMap();
-                    prefixMap.add("xs", SCHEMA_NS);
-                    prefixMap.add("tns", nsURI);
-                    XmlSchema schemaDef = xsDef.getSchema();
-                    schemaDef.setNamespaceContext(prefixMap);
-                    Document[] docs = schemaDef.getAllSchemas();
-                    document = docs[docs.length-1];
-                    document.setDocumentURI(xsDef.getLocation().toString());
-                    xsDef.setDocument(document);
-                } catch (XmlSchemaException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            loadXSD(schemaCollection, xsDef);
-            wsdlDefinition.getXmlSchemas().add(xsDef);
-            Element schema = document.getDocumentElement();
-            Schema schemaExt = createSchemaExt(definition);
-            schemaExt.setDocumentBaseURI(document.getDocumentURI());
-            schemaExt.setElement(schema);
-        }
-    }
-
-    private static void loadXSD(XmlSchemaCollection schemaCollection, XSDefinition definition) {
-        if (definition.getSchema() != null) {
-            return;
-        }
-        if (definition.getDocument() != null) {
-            String uri = null;
-            if (definition.getLocation() != null) {
-                uri = definition.getLocation().toString();
-            }
-            XmlSchema schema = schemaCollection.read(definition.getDocument(), uri, null);
-            if (definition.getSchemaCollection() == null) {
-                definition.setSchemaCollection(schemaCollection);
-            }
-            if (definition.getSchema() == null) {
-                definition.setSchema(schema);
-            }
-        }
-    }
-
-    public Schema createSchemaExt(Definition definition) throws WSDLException {
-        Types types = definition.getTypes();
-        if (types == null) {
-            types = definition.createTypes();
-            definition.setTypes(types);
-        }
-
-        Schema schemaExt = createSchema(definition);
-        types.addExtensibilityElement(schemaExt);
-
-        return schemaExt;
-    }
-
-    public Schema createSchema(Definition definition) throws WSDLException {
-        return (Schema)definition.getExtensionRegistry().createExtension(Types.class, SCHEMA_QNAME);
-    }
-
-    private DocumentBuilderFactory documentBuilderFactory;
-
-    public Document createDocument() {
-        Document document;
-        try {
-            if (documentBuilderFactory == null) {
-                documentBuilderFactory = DocumentBuilderFactory.newInstance();
-                documentBuilderFactory.setNamespaceAware(true);
-            }
-            document = documentBuilderFactory.newDocumentBuilder().newDocument();
-        } catch (ParserConfigurationException ex) {
-            throw new WSDLGenerationException(ex);
-         }
-        // document.setDocumentURI("http://");
-        return document;
-    }
-
-    protected QName getQName(Interface interfaze) {
-        JavaInterface iface = (JavaInterface)interfaze;
-        QName qname = iface.getQName();
-        if (qname != null) {
-            return qname;
-        } else {
-            Class<?> javaClass = iface.getJavaClass();
-            return new QName(JavaXMLMapper.getNamespace(javaClass), javaClass.getSimpleName(), "tns");
-        }
-    }
-
-    public javax.wsdl.Operation generateOperation(Definition definition,
-                                                  Operation op,
-                                                  Map<String, XMLTypeHelper> helpers,
-                                                  Map<QName, List<ElementInfo>> wrappers)
-                                              throws WSDLException {
-        javax.wsdl.Operation operation = definition.createOperation();
-        operation.setName(op.getName());
-        operation.setUndefined(false);
-
-        Input input = definition.createInput();
-        Message inputMsg = definition.createMessage();
-        String namespaceURI = definition.getQName().getNamespaceURI();
-        QName inputMsgName = new QName(namespaceURI, op.getName());
-        inputMsg.setQName(inputMsgName);
-        inputMsg.setUndefined(false);
-        definition.addMessage(inputMsg);
-
-        // FIXME: By default, java interface is mapped to doc-lit-wrapper style WSDL
-        if (op.getWrapper() != null) {
-            // Generate doc-lit-wrapper style
-            inputMsg.addPart(generateWrapperPart(definition, op, helpers, wrappers, true));
-        } else {
-            // Bare style
-            int i = 0;
-            for (DataType d : op.getInputType().getLogical()) {
-                inputMsg.addPart(generatePart(definition, d, "arg" + i));
-                i++;
-            }
-        }
-        input.setMessage(inputMsg);
-        operation.setInput(input);
-
-        if (!op.isNonBlocking()) {
-            Output output = definition.createOutput();
-            Message outputMsg = definition.createMessage();
-            QName outputMsgName = new QName(namespaceURI, op.getName() + "Response");
-            outputMsg.setQName(outputMsgName);
-            outputMsg.setUndefined(false);
-            definition.addMessage(outputMsg);
-
-            if (op.getWrapper() != null) {
-                outputMsg.addPart(generateWrapperPart(definition, op, helpers, wrappers, false));
-            } else {
-                outputMsg.addPart(generatePart(definition, op.getOutputType(), "return"));
-            }
-            output.setMessage(outputMsg);
-
-            operation.setOutput(output);
-            operation.setStyle(OperationType.REQUEST_RESPONSE);
-        } else {
-            operation.setStyle(OperationType.ONE_WAY);
-        }
-
-        for (DataType<DataType> faultType: op.getFaultTypes()) {
-            Fault fault = definition.createFault();
-            QName faultName = ((XMLType)faultType.getLogical().getLogical()).getElementName();
-            fault.setName(faultName.getLocalPart());
-            Message faultMsg = definition.getMessage(faultName);
-            if (faultMsg == null) {
-                faultMsg = definition.createMessage();
-                faultMsg.setQName(faultName);
-                faultMsg.setUndefined(false);
-                definition.addMessage(faultMsg);
-                faultMsg.addPart(generatePart(definition, faultType.getLogical(), faultName.getLocalPart()));
-            }
-            fault.setMessage(faultMsg);
-            operation.addFault(fault);
-            List<ElementInfo> elements = null;
-            if (faultType.getLogical().getPhysical() != faultType.getPhysical()) {
-                // create special wrapper for type indirection to real fault bean
-                elements = new ArrayList<ElementInfo>(1);
-                DataType logical = faultType.getLogical();
-                elements.add(getElementInfo(logical.getPhysical(), logical, null, helpers));
-             } else {
-                // convert synthesized fault bean to a wrapper type
-                elements = new ArrayList<ElementInfo>();
-                for (DataType<XMLType> propDT: op.getFaultBeans().get(faultName)) {
-                    XMLType logical = propDT.getLogical();
-                    elements.add(getElementInfo(propDT.getPhysical(), propDT, logical.getElementName(), helpers));
-                }
-            }
-            wrappers.put(faultName, elements);
-        }
-
-        operation.setUndefined(false);
-        return operation;
-    }
-
-    public Part generatePart(Definition definition, DataType arg, String partName) {
-        Part part = definition.createPart();
-        part.setName(partName);
-        if (arg != null && arg.getLogical() instanceof XMLType) {
-            XMLType xmlType = (XMLType)arg.getLogical();
-            QName elementName = xmlType.getElementName();
-            part.setElementName(elementName);
-            addNamespace(definition, elementName);
-            if (xmlType.getElementName() == null) {
-                QName typeName = xmlType.getTypeName();
-                part.setTypeName(typeName);
-                addNamespace(definition, typeName);
-            }
-        }
-        return part;
-    }
-
-    public Part generateWrapperPart(Definition definition,
-                                    Operation operation,
-                                    Map<String, XMLTypeHelper> helpers, 
-                                    Map<QName, List<ElementInfo>> wrappers,
-                                    boolean input) throws WSDLException {
-        Part part = definition.createPart();
-        String partName = input ? operation.getName() : (operation.getName() + "Response");
-        part.setName(partName);
-        WrapperInfo opWrapper = operation.getWrapper();
-        if (opWrapper != null) {
-            ElementInfo elementInfo =
-                input ? opWrapper.getInputWrapperElement() : opWrapper.getOutputWrapperElement();
-            List<ElementInfo> elements =
-                input ? opWrapper.getInputChildElements() : opWrapper.getOutputChildElements();
-            QName wrapperName = elementInfo.getQName();
-            part.setElementName(wrapperName);
-            addNamespace(definition, wrapperName);
-            wrappers.put(wrapperName, elements);
-
-            // FIXME: [rfeng] Ideally, we should try to register the wrappers only. But we are
-            // expriencing the problem that we cannot handle XSD imports 
-            /*
-            Class<?> wrapperClass = input ? opWrapper.getInputWrapperClass() : opWrapper.getOutputWrapperClass();
-            DataType wrapperDT = input ? opWrapper.getInputWrapperType() : opWrapper.getOutputWrapperType();
-            if (wrapperClass != null) {
-                getElementInfo(wrapperClass, wrapperDT, wrapperName, helpers);
-                return part;
-            }
-            */
-
-            Method method = ((JavaOperation)operation).getJavaMethod();
-            if (input) {
-                Class<?>[] paramTypes = method.getParameterTypes();
-                for (int i = 0; i < paramTypes.length; i++) {
-                    DataType dataType = operation.getInputType().getLogical().get(i);
-                    elements.set(i, getElementInfo(paramTypes[i], dataType, elements.get(i).getQName(), helpers));
-                }
-            } else {
-                Class<?> returnType = method.getReturnType();
-                if (returnType != Void.TYPE) {
-                    DataType dataType = operation.getOutputType();
-                    elements.set(0, getElementInfo(returnType, dataType, elements.get(0).getQName(), helpers));
-                }
-            }
-        }
-        return part;
-    }
-
-    private ElementInfo getElementInfo(Class javaType,
-                                       DataType dataType,
-                                       QName name,
-                                       Map<String, XMLTypeHelper> helpers) {
-        String db = dataType.getDataBinding();
-        while ("java:array".equals(db)) {
-            dataType = (DataType)dataType.getLogical();
-            db = dataType.getDataBinding();
-        }
-        XMLTypeHelper helper = helpers.get(db);
-        if (helper == null) {
-            DataBinding dataBinding = dataBindings.getDataBinding(db);
-            if (dataBinding == null) {
-                QName element = name;
-                if (element == null || dataType.getLogical() instanceof XMLType) {
-                    XMLType xmlType = (XMLType)dataType.getLogical();
-                    if (xmlType.getElementName() != null) {
-                        element = xmlType.getElementName();
-                    }
-                }
-                return new ElementInfo(element, new TypeInfo(ANYTYPE_QNAME, false, null));
-                // throw new ServiceRuntimeException("No data binding for " + db);
-            }
-
-            helper = dataBinding.getXMLTypeHelper();
-            if (helper == null) {
-                // Default to JAXB
-                helper = helpers.get(JAXBDataBinding.NAME);
-                if (helper == null) {
-                    helper = dataBindings.getDataBinding(JAXBDataBinding.NAME).getXMLTypeHelper();
-                    helpers.put(JAXBDataBinding.NAME, helper);
-                }
-            }
-            helpers.put(db, helper);
-        }
-        TypeInfo typeInfo = helper.getTypeInfo(javaType.isArray() ? javaType.getComponentType() : javaType,
-                                               dataType.getLogical());
-        ElementInfo element = new ElementInfo(name, typeInfo);
-        element.setMany(byte[].class != javaType && javaType.isArray());
-        element.setNillable(!javaType.isPrimitive());
-        return element;
-    }
-
-    private static void addNamespace(Definition definition, QName name) {
-        String namespace = name.getNamespaceURI();
-        if (definition.getPrefix(namespace) == null) {
-            definition.addNamespace("ns" + definition.getNamespaces().size(), namespace);
-        }
-    }
-
-    /*
-    // currently not using the next three methods
-    public XmlSchemaType getXmlSchemaType(DataType type) {
-        return null;
-    }
-
-    // FIXME: WE need to add databinding-specific Java2XSD generation
-    public Element generateXSD(DataType dataType) {
-        DataBinding dataBinding = dataBindings.getDataBinding(dataType.getDataBinding());
-        if (dataBinding != null) {
-            // return dataBinding.generateSchema(dataType);
-        }
-        return null;
-    }
-
-    public void generateWrapperElements(Operation op) {
-        XmlSchemaCollection collection = new XmlSchemaCollection();
-        String ns = getQName(op.getInterface()).getNamespaceURI();
-        XmlSchema schema = new XmlSchema(ns, collection);
-        schema.setAttributeFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
-        schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
-
-        XmlSchemaElement inputElement = new XmlSchemaElement();
-        inputElement.setQName(new QName(ns, op.getName()));
-        XmlSchemaComplexType inputType = new XmlSchemaComplexType(schema);
-        inputType.setName("");
-        XmlSchemaSequence inputSeq = new XmlSchemaSequence();
-        inputType.setParticle(inputSeq);
-        List<DataType> argTypes = op.getInputType().getLogical();
-        for (DataType argType : argTypes) {
-            XmlSchemaElement child = new XmlSchemaElement();
-            Object logical = argType.getLogical();
-            if (logical instanceof XMLType) {
-                child.setName(((XMLType)logical).getElementName().getLocalPart());
-                XmlSchemaType type = getXmlSchemaType(argType);
-                child.setType(type);
-            }
-            inputSeq.getItems().add(child);
-        }
-        inputElement.setType(inputType);
-
-        XmlSchemaElement outputElement = new XmlSchemaElement();
-        outputElement.setQName(new QName(ns, op.getName() + "Response"));
-        XmlSchemaComplexType outputType = new XmlSchemaComplexType(schema);
-        outputType.setName("");
-        XmlSchemaSequence outputSeq = new XmlSchemaSequence();
-        outputType.setParticle(outputSeq);
-        DataType returnType = op.getOutputType();
-        XmlSchemaElement child = new XmlSchemaElement();
-        Object logical = returnType.getLogical();
-        if (logical instanceof XMLType) {
-            child.setName(((XMLType)logical).getElementName().getLocalPart());
-            XmlSchemaType type = getXmlSchemaType(returnType);
-            child.setType(type);
-        }
-        outputSeq.getItems().add(child);
-        outputElement.setType(outputType);
-
-        schema.getElements().add(inputElement.getQName(), inputElement);
-        schema.getElements().add(outputElement.getQName(), outputElement);
-
-    }
-    */
-
-    public WSDLFactory getFactory() {
-        return factory;
-    }
-
-    public void setFactory(WSDLFactory factory) {
-        this.factory = factory;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
deleted file mode 100644
index f99947a52e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.wsdlgen;
-
-import java.util.Iterator;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingFault;
-import javax.wsdl.BindingInput;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
-import javax.wsdl.Definition;
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.Output;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-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.SOAP12Fault;
-import javax.wsdl.extensions.soap12.SOAP12Operation;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-/**
- * 
- * @version $Rev: 668025 $ $Date: 2008-06-16 01:06:34 +0100 (Mon, 16 Jun 2008) $
- */
-public class WSDLDefinitionGenerator {
-    private static final String SOAP_NS = "http://schemas.xmlsoap.org/wsdl/soap/";
-    public static final QName SOAP_ADDRESS = new QName(SOAP_NS, "address");
-    private static final QName SOAP_BINDING = new QName(SOAP_NS, "binding");
-    private static final QName SOAP_BODY = new QName(SOAP_NS, "body");
-    private static final QName SOAP_FAULT = new QName(SOAP_NS, "fault");
-    private static final QName SOAP_OPERATION = new QName(SOAP_NS, "operation");
-    private static final String SOAP12_NS = "http://schemas.xmlsoap.org/wsdl/soap12/";
-    public static final QName SOAP12_ADDRESS = new QName(SOAP12_NS, "address");
-    private static final QName SOAP12_BINDING = new QName(SOAP12_NS, "binding");
-    private static final QName SOAP12_BODY = new QName(SOAP12_NS, "body");
-    private static final QName SOAP12_FAULT = new QName(SOAP12_NS, "fault");
-    private static final QName SOAP12_OPERATION = new QName(SOAP12_NS, "operation");
-
-    private static final String BINDING_SUFFIX = "Binding";
-    private static final String SERVICE_SUFFIX = "Service";
-    private static final String PORT_SUFFIX = "Port";
-
-    private boolean requiresSOAP12;
-    private QName soapAddress;
-    private QName soapBinding;
-    private QName soapBody;
-    private QName soapFault;
-    private QName soapOperation;
-
-    public WSDLDefinitionGenerator(boolean requiresSOAP12) {
-        super();
-        this.requiresSOAP12 = requiresSOAP12;
-        soapAddress = requiresSOAP12 ? SOAP12_ADDRESS : SOAP_ADDRESS;
-        soapBinding = requiresSOAP12 ? SOAP12_BINDING : SOAP_BINDING;
-        soapBody = requiresSOAP12 ? SOAP12_BODY : SOAP_BODY;
-        soapFault = requiresSOAP12 ? SOAP12_FAULT : SOAP_FAULT;
-        soapOperation = requiresSOAP12 ? SOAP12_OPERATION : SOAP_OPERATION;
-    }
-
-    public Definition cloneDefinition(WSDLFactory factory, Definition definition) throws WSDLException {
-        Element root = definition.getDocumentationElement();
-        root = (Element)root.cloneNode(true);
-        WSDLReader reader = factory.newWSDLReader();
-        return reader.readWSDL(definition.getDocumentBaseURI(), root);
-    }
-    
-    public Types createTypes(Definition definition) {
-        Types types = definition.createTypes();
-        definition.setTypes(types);
-        return types;
-    }
-
-    public Binding createBinding(Definition definition, PortType portType) {
-        try {
-            Binding binding = definition.createBinding();
-            binding.setPortType(portType);
-            configureBinding(definition, binding, portType);
-            ExtensibilityElement bindingExtension =
-                definition.getExtensionRegistry().createExtension(Binding.class, soapBinding);
-            if (requiresSOAP12) {
-                ((SOAP12Binding)bindingExtension).setStyle("document");
-                ((SOAP12Binding)bindingExtension).setTransportURI("http://schemas.xmlsoap.org/soap/http");
-            } else {
-                ((SOAPBinding)bindingExtension).setStyle("document");
-                ((SOAPBinding)bindingExtension).setTransportURI("http://schemas.xmlsoap.org/soap/http");
-            }
-            binding.addExtensibilityElement(bindingExtension);
-            return binding;
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-    }
-
-    protected void configureBinding(Definition definition, Binding binding, PortType portType) throws WSDLException {
-        QName portTypeName = portType.getQName();
-        if (portTypeName != null) {
-            // Choose <porttype>Binding if available.  If this name is in use, insert
-            // separating underscores until there is no clash.
-            for (String suffix = BINDING_SUFFIX; ; suffix = "_" + suffix) { 
-                QName name = new QName(definition.getTargetNamespace(), portTypeName.getLocalPart() + suffix);
-                if (definition.getBinding(name) == null) {
-                    binding.setQName(name);
-                    break;
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public void createBindingOperations(Definition definition, Binding binding, PortType portType) {
-        try {
-            for (Iterator oi = portType.getOperations().iterator(); oi.hasNext();) {
-                Operation operation = (Operation)oi.next();
-                BindingOperation bindingOperation = createBindingOperation(definition, operation, "");
-                binding.addBindingOperation(bindingOperation);
-            }
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public BindingOperation createBindingOperation(Definition definition, Operation operation, String action)
-        throws WSDLException {
-        BindingOperation bindingOperation = definition.createBindingOperation();
-        bindingOperation.setOperation(operation);
-        configureBindingOperation(bindingOperation, operation);
-        ExtensibilityElement operationExtension =
-            definition.getExtensionRegistry().createExtension(BindingOperation.class, soapOperation);
-        if (requiresSOAP12) {
-            ((SOAP12Operation)operationExtension).setSoapActionURI(action);
-        } else {
-            ((SOAPOperation)operationExtension).setSoapActionURI(action);
-        }
-        bindingOperation.addExtensibilityElement(operationExtension);
-        if (operation.getInput() != null) {
-            BindingInput bindingInput = definition.createBindingInput();
-            configureBindingInput(bindingInput, operation.getInput());
-            ExtensibilityElement inputExtension =
-                definition.getExtensionRegistry().createExtension(BindingInput.class, soapBody);
-            if (requiresSOAP12) {
-                ((SOAP12Body)inputExtension).setUse("literal");
-            } else {
-                ((SOAPBody)inputExtension).setUse("literal");
-            }
-            bindingInput.addExtensibilityElement(inputExtension);
-            bindingOperation.setBindingInput(bindingInput);
-        }
-        if (operation.getOutput() != null) {
-            BindingOutput bindingOutput = definition.createBindingOutput();
-            configureBindingOutput(bindingOutput, operation.getOutput());
-            ExtensibilityElement outputExtension =
-                definition.getExtensionRegistry().createExtension(BindingOutput.class, soapBody);
-            if (requiresSOAP12) {
-                ((SOAP12Body)outputExtension).setUse("literal");
-            } else {
-                ((SOAPBody)outputExtension).setUse("literal");
-            }
-            bindingOutput.addExtensibilityElement(outputExtension);
-            bindingOperation.setBindingOutput(bindingOutput);
-        }
-        for (Iterator fi = operation.getFaults().values().iterator(); fi.hasNext();) {
-            Fault fault = (Fault)fi.next();
-            BindingFault bindingFault = definition.createBindingFault();
-            ExtensibilityElement faultExtension =
-                definition.getExtensionRegistry().createExtension(BindingFault.class, soapFault);
-            configureBindingFault(bindingFault, faultExtension, fault);
-            bindingFault.addExtensibilityElement(faultExtension);
-            bindingOperation.addBindingFault(bindingFault);
-        }
-        return bindingOperation;
-    }
-
-    protected void configureBindingOperation(BindingOperation bindingOperation, Operation operation)
-        throws WSDLException {
-        bindingOperation.setName(operation.getName());
-    }
-
-    protected void configureBindingInput(BindingInput bindingInput, Input input) throws WSDLException {
-        bindingInput.setName(input.getName());
-    }
-
-    protected void configureBindingOutput(BindingOutput bindingOutput, Output output) throws WSDLException {
-        bindingOutput.setName(output.getName());
-    }
-
-    protected void configureBindingFault(BindingFault bindingFault,
-                                         ExtensibilityElement faultExtension,
-                                         Fault fault)
-                                     throws WSDLException {
-        String faultName = fault.getName();
-        bindingFault.setName(faultName);
-        if (requiresSOAP12) {
-            ((SOAP12Fault)faultExtension).setName(faultName);
-            ((SOAP12Fault)faultExtension).setUse("literal");
-        } else {
-            ((SOAPFault)faultExtension).setName(faultName);
-            ((SOAPFault)faultExtension).setUse("literal");
-        }
-    }
-
-    public Service createService(Definition definition, PortType portType) {
-        try {
-            Service service = definition.createService();
-            configureService(definition, service, portType);
-            // createPort(definition, binding, service);
-            definition.addService(service);
-            return service;
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-    }
-
-    public Service createService(Definition definition, Binding binding) {
-        try {
-            Service service = definition.createService();
-            configureService(definition, service, binding.getPortType());
-            // createPort(definition, binding, service);
-            definition.addService(service);
-            return service;
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-    }
-
-    protected void configureService(Definition definition, Service service, PortType portType) throws WSDLException {
-        QName portTypeName = portType.getQName();
-        if (portTypeName != null) {
-            // Choose <porttype>Service if available.  If this name is in use, insert
-            // separating underscores until there is no clash.
-            for (String suffix = SERVICE_SUFFIX; ; suffix = "_" + suffix) {
-                QName name = new QName(definition.getTargetNamespace(), portTypeName.getLocalPart() + suffix);
-                if (definition.getService(name) == null) {
-                    service.setQName(name);
-                    break;
-                }
-            }
-        }
-    }
-
-    public Port createPort(Definition definition, Binding binding, Service service, String uri) {
-        try {
-            Port port = definition.createPort();
-            port.setBinding(binding);
-            configurePort(port, binding);
-            if (uri != null) {
-                ExtensibilityElement portExtension =
-                    definition.getExtensionRegistry().createExtension(Port.class, soapAddress);
-                if (requiresSOAP12) {
-                    ((SOAP12Address)portExtension).setLocationURI(uri);
-                } else {
-                    ((SOAPAddress)portExtension).setLocationURI(uri);
-                }
-                port.addExtensibilityElement(portExtension);
-            }
-            service.addPort(port);
-            return port;
-        } catch (WSDLException e) {
-            throw new WSDLGenerationException(e);
-        }
-    }
-
-    protected void configurePort(Port port, Binding binding) throws WSDLException {
-        if (binding.getPortType() != null && binding.getPortType().getQName() != null) {
-            port.setName(binding.getPortType().getQName().getLocalPart() + PORT_SUFFIX);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
deleted file mode 100644
index bf9e22f645..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.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.ws.wsdlgen;
-
-import org.apache.tuscany.sca.monitor.Problem;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class WSDLGenerationException extends ServiceRuntimeException {
-    private static final long serialVersionUID = 1L;
-    private Problem problem;
-
-    public WSDLGenerationException() {
-        super();
-    }
-
-    public WSDLGenerationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public WSDLGenerationException(String message) {
-        super(message);
-    }
-
-    public WSDLGenerationException(Throwable cause) {
-        super(cause);
-    }
-
-    public WSDLGenerationException(String message, Throwable cause, Problem problem) {
-        super(message, cause);
-        this.problem = problem;
-    }
-
-    public Problem getProblem() {
-        return problem;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
deleted file mode 100644
index d2e2e9eb34..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.wsdlgen;
-
-//FIXME: trim the import list down to what's really needed
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPOperation;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.dom.DOMSource;
-
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-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.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * WSDLServiceGenerator generates a binding WSDL service document.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLServiceGenerator {
-    // the following switch is temporary for debugging
-    public static boolean printWSDL;  // external code sets this to print generated WSDL
-    
-    private static final Logger logger = Logger.getLogger(WSDLServiceGenerator.class.getName());
-    private static final QName TRANSPORT_JMS_QUALIFIED_INTENT =
-        new QName("http://www.osoa.org/xmlns/sca/1.0", "transport.jms");
-    private static final String DEFAULT_QUEUE_CONNECTION_FACTORY = "TuscanyQueueConnectionFactory";
-    private static final String ADDRESS = "Address";
-
-    private WSDLServiceGenerator() {
-        // this class has static methods only and cannot be instantiated
-    }
-
-    /**
-     * Log a warning message.
-     * @param problem
-     */
-    private static void logWarning(Problem problem) {
-        Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName());
-        if (problemLogger != null){
-            problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, problem.getMessageId(), problem.getMessageParams());
-        } else {
-            logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName());
-        }
-    }
-
-    /**
-     * Report a warning.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private static void warning(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) {
-        Problem problem = new ProblemImpl(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.WARNING, wsBinding, message, (Object[])messageParameters);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            logWarning(problem);
-        }
-    }
-
-    /**
-     * Report an error.
-     * @param message
-     * @param binding
-     * @param parameters
-     */
-    private static void error(Monitor monitor, String message, WebServiceBinding wsBinding, String... messageParameters) {
-        Problem problem = new ProblemImpl(WSDLServiceGenerator.class.getName(), "wsdlgen-validation-messages", Severity.ERROR, wsBinding, message, (Object[])messageParameters);
-        if (monitor != null) {
-            monitor.problem(problem);
-        } else {
-            throw new WSDLGenerationException(problem.toString(), null, problem);
-        }
-    }
-
-    /**
-     * Generate a suitably configured WSDL definition
-     */
-    protected static Definition configureWSDLDefinition(WebServiceBinding wsBinding,
-                                                        Component component,
-                                                        AbstractContract contract,
-                                                        Monitor monitor) {
-
-        //[nash] changes to the builder sequence avoid calling this for a CompositeService
-        assert !(contract instanceof CompositeService);
-        /*
-        // For every promoted composite service, the underlying component
-        // gets a copy of the service with the name prefixed by "$promoted$."
-        String contractName = (contract instanceof CompositeService ? "$promoted$." : "") + contract.getName();
-        */
-        String contractName = contract.getName();
-
-        List<Port> ports = new ArrayList<Port>();
-        WSDLDefinition wsdlDefinition = wsBinding.getWSDLDefinition();
-        if (wsdlDefinition == null) {
-            error(monitor, "NoWsdlInterface", wsBinding, component.getName(), contract.getName());
-            return null;
-        }
-        Definition def = wsdlDefinition.getDefinition();
-        if (wsdlDefinition.getBinding() == null) {
-            // The WSDL document was provided by the user.  Generate a new
-            // WSDL document with imports from the user-provided document.
-            WSDLFactory factory = null;
-            try {
-                factory = WSDLFactory.newInstance();
-            } catch (WSDLException e) {
-                throw new WSDLGenerationException(e);
-            }
-            Definition newDef = factory.newDefinition();
-
-            // Construct a target namespace from the base URI of the user's
-            // WSDL document (is this what we should be using?) and a path
-            // computed according to the SCA Web Service binding spec.
-            String nsName = component.getName() + "/" + contractName;
-            String namespaceURI = null;
-            try {
-                URI userTNS = new URI(def.getTargetNamespace());
-                namespaceURI = userTNS.resolve("/" + nsName).toString();
-            } catch (URISyntaxException e1) {
-                throw new WSDLGenerationException(e1);
-            } catch (IllegalArgumentException e2) {
-                throw new WSDLGenerationException(e2);
-            }
-
-            // set name and targetNamespace attributes on the definition
-            String defsName = component.getName() + "." + contractName;
-            newDef.setQName(new QName(namespaceURI, defsName));
-            newDef.setTargetNamespace(namespaceURI);
-            newDef.addNamespace("tns", namespaceURI);
-
-            // set wsdl namespace prefix on the definition
-            newDef.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
-
-            // import the service or reference interface portType
-            List<WSDLDefinition> imports = new ArrayList<WSDLDefinition>();
-            Interface interfaze = wsBinding.getBindingInterfaceContract().getInterface();
-            if (interfaze instanceof WSDLInterface) {
-                PortType portType = ((WSDLInterface)interfaze).getPortType();
-                boolean ok = importPortType(portType, wsdlDefinition, newDef, imports);
-                if (!ok) {
-                    error(monitor, "PortTypeNotFound", wsBinding, portType.getQName().toString(),
-                          component.getName(), contract.getName());
-                }
-            }
-
-            // import an existing binding if specified
-            Binding binding = wsBinding.getBinding();
-            if (binding != null) {
-                boolean ok = importBinding(binding, wsdlDefinition, newDef, imports);
-                if (ok) {
-                    boolean ok2 = importPortType(binding.getPortType(), wsdlDefinition, newDef, imports);
-                    if (!ok2) {
-                        error(monitor, "PortTypeNotFound", wsBinding, binding.getPortType().getQName().toString(),
-                              component.getName(), contract.getName());
-                    }
-                } else {
-                    error(monitor, "BindingNotFound", wsBinding, binding.getQName().toString(),
-                          component.getName(), contract.getName());
-                }
-            }
-
-            // import bindings and portTypes needed by services and ports 
-            QName serviceQName = wsBinding.getServiceName();
-            String portName = wsBinding.getPortName();
-            if (serviceQName != null) {
-                Service service = def.getService(serviceQName); 
-                if (portName != null) {
-                    Port port = service.getPort(portName);
-                    Port newPort = copyPort(newDef, port, wsBinding);
-                    if (newPort != null) {
-                        importBinding(port.getBinding(), wsdlDefinition, newDef, imports);
-                        ports.add(newPort);
-                    } else {
-                        error(monitor, "InvalidPort", wsBinding, serviceQName.toString(), portName,
-                              component.getName(), contract.getName());
-                    }
-                } else {
-                    for (Object port : service.getPorts().values()) {
-                        Port newPort = copyPort(newDef, (Port)port, wsBinding);
-                        if (newPort != null) {
-                            importBinding(((Port)port).getBinding(), wsdlDefinition, newDef, imports);
-                            ports.add(newPort);
-                        } else {
-                            // not an error, just ignore the port
-                            warning(monitor, "IgnoringPort", wsBinding, serviceQName.toString(), ((Port)port).getName(),
-                                    component.getName(), contract.getName());
-                        }
-                    }
-                    if (ports.size() == 0) {
-                        error(monitor, "NoValidPorts", wsBinding, serviceQName.toString(),
-                              component.getName(), contract.getName());
-                    }
-                }
-            }
-
-            // replace original WSDL definition by the generated definition
-            def = newDef;
-
-        } else {
-            // The WSDL definition was generated by Interface2WSDLGenerator.
-            // Reuse it instead of creating a new definition here.
-        }
-
-        // add a service and ports to the generated definition  
-        WSDLDefinitionGenerator helper =
-                new WSDLDefinitionGenerator(BindingWSDLGenerator.requiresSOAP12(wsBinding));
-        WSDLInterface wi = (WSDLInterface)wsBinding.getBindingInterfaceContract().getInterface();
-        PortType portType = wi.getPortType();
-        Service service = helper.createService(def, portType);
-        if (wsBinding.getBinding() == null && ports.size() == 0) {
-            Binding binding = helper.createBinding(def, portType);
-            if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) {
-                def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-            } else {
-                def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
-            }
-            helper.createBindingOperations(def, binding, portType);
-            binding.setUndefined(false);
-            def.addBinding(binding);
-            
-            String endpointURI = computeActualURI(wsBinding, null);
-            Port port = helper.createPort(def, binding, service, endpointURI);
-            wsBinding.setService(service);
-            wsBinding.setPort(port);
-        } else {
-            if (ports.size() > 0) {
-                // there are one or more user-specified valid ports
-                for (Port port : ports) {
-                    service.addPort(port);
-                }
-                if (ports.size() == 1) {
-                    // only one port, so use it
-                    wsBinding.setPort(ports.get(0));
-                } else {
-                    // multiple ports, make them all available
-                    wsBinding.setPort(null);
-                }
-            } else {
-                // no valid user-specified ports, so create a suitably configured port
-                String endpointURI = computeActualURI(wsBinding, null);
-                Port port = helper.createPort(def, wsBinding.getBinding(), service, endpointURI);
-                if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) {
-                    def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-                } else {
-                    def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
-                }
-                wsBinding.setPort(port);
-            }
-            wsBinding.setService(service);
-        }
-
-        // for debugging
-        if (printWSDL) {
-            try {
-                System.out.println("Generated WSDL for " + component.getName() + "/" + contractName);
-                WSDLWriter writer =  javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
-                writer.writeWSDL(def, System.out);
-            } catch (WSDLException e) {
-                throw new WSDLGenerationException(e);
-            }
-        }
-
-        return def;
-    }
-
-    private static boolean importPortType(PortType portType,
-                                          WSDLDefinition wsdlDef,
-                                          Definition newDef,
-                                          List<WSDLDefinition> imports) {
-        return addImport(portType.getQName(), PortType.class, wsdlDef, newDef, imports);
-    }
-    
-    private static boolean importBinding(Binding binding,
-                                         WSDLDefinition wsdlDef,
-                                         Definition newDef,
-                                         List<WSDLDefinition> imports) {
-        boolean ok = addImport(binding.getQName(), Binding.class, wsdlDef, newDef, imports);
-        if (ok) {
-            List bindingExtensions = binding.getExtensibilityElements();
-            for (final Object extension : bindingExtensions) {
-                if (extension instanceof SOAPBinding) {
-                    newDef.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
-                }
-                if (extension instanceof SOAP12Binding) {
-                    newDef.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-                }
-            }
-        }
-        return ok;
-    }
-    
-    private static boolean addImport(QName name,
-                                     Class type,
-                                     WSDLDefinition wsdlDef,
-                                     Definition newDef,
-                                     List<WSDLDefinition> imports) {
-        String namespace = name.getNamespaceURI();
-        if (newDef.getImports(namespace) == null) {
-            WSDLDefinition impDef = findDefinition(wsdlDef, name, type);
-            if (impDef != null) {
-                Import imp = newDef.createImport();
-                imp.setNamespaceURI(namespace);
-                imp.setLocationURI(impDef.getURI().toString());
-                imp.setDefinition(impDef.getDefinition());
-                newDef.addNamespace("ns" + imports.size(), namespace);
-                newDef.addImport(imp);
-                imports.add(impDef);
-                return true;
-            } else {
-                // import was not added because element not found
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static WSDLDefinition findDefinition(WSDLDefinition wsdlDef, QName name, Class type) {
-        if (wsdlDef == null || name == null) {
-            return wsdlDef;
-        }
-        if (wsdlDef.getURI() != null) {  // not a facade
-            Definition def = wsdlDef.getDefinition();
-            Map types = type == PortType.class ? def.getPortTypes() : def.getBindings();
-            if (types.get(name) != null) {
-                return wsdlDef;
-            }
-        }
-        for (WSDLDefinition impDef : wsdlDef.getImportedDefinitions()) {
-            WSDLDefinition d = findDefinition(impDef, name, type);
-            if (d != null) {
-                return d;
-            }
-        }
-        return null;
-    }
-
-    private static Port copyPort(Definition def, Port port, WebServiceBinding wsBinding) {
-        Port newPort = def.createPort();
-        newPort.setName(port.getName());
-        newPort.setBinding(port.getBinding());
-        List portExtensions = port.getExtensibilityElements();
-        for (final Object extension : portExtensions) {
-            ExtensibilityElement newExt = null;
-            if (extension instanceof SOAPAddress) {
-                def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
-                try {
-                    newExt = def.getExtensionRegistry().createExtension(
-                             Port.class, WSDLDefinitionGenerator.SOAP_ADDRESS);
-                } catch (WSDLException e) {
-                }
-                String uri = computeActualURI(wsBinding, port);
-                ((SOAPAddress)newExt).setLocationURI(uri);
-                newPort.addExtensibilityElement(newExt);
-            } else if (extension instanceof SOAP12Address) {
-                def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-                try {
-                    newExt = def.getExtensionRegistry().createExtension(
-                             Port.class, WSDLDefinitionGenerator.SOAP12_ADDRESS);
-                } catch (WSDLException e) {
-                }
-                String uri = computeActualURI(wsBinding, port);
-                ((SOAP12Address)newExt).setLocationURI(uri);
-                newPort.addExtensibilityElement(newExt);
-            } else {
-                // we don't support ports with other extensibility elements such as HTTPAddress
-                return null;
-            }
-        }
-        return newPort;
-    }
-
-    /**
-     * Compute the endpoint URI based on section 2.1.1 of the WS binding Specification 1.
-     * The URIs in the endpoint(s) of the referenced WSDL, which may be relative
-     * 2. The URI specified by the wsa:Address element of the
-     * wsa:EndpointReference, which may be relative 3. The explicitly stated URI
-     * in the "uri" attribute of the binding.ws element, which may be relative,
-     * 4. The implicit URI as defined by in section 1.7 in the SCA Assembly Specification
-     * If the <binding.ws> has no wsdlElement but does have a uri attribute then
-     * the uri takes precedence over any implicitly used WSDL.
-     * 
-     */
-    private static String computeActualURI(WebServiceBinding wsBinding, Port port) {
-
-        URI eprURI = null;
-        if (wsBinding.getEndPointReference() != null) {
-            eprURI = getEPR(wsBinding); 
-        }
-
-        URI wsdlURI = null;
-        if (wsBinding.getServiceName() != null && wsBinding.getBindingName() == null) {
-            // <binding.ws> explicitly points at a WSDL port, may be a relative URI
-            wsdlURI = getEndpoint(port);
-        }
-
-        // if the WSDL port/endpoint has an absolute URI use that
-        if (wsdlURI != null && wsdlURI.isAbsolute()) {
-            return wsdlURI.toString();
-        }
-
-        // if the wsa:EndpointReference has an address element with an absolute URI use that
-        if (eprURI != null && eprURI.isAbsolute()) {
-            return eprURI.toString();
-        }
-        
-        // either there is no WSDL port endpoint URI or that URI is relative
-        String actualURI = wsBinding.getURI();
-        if (eprURI != null && eprURI.toString().length() != 0) {
-            // there is a relative URI in the binding EPR
-            actualURI = actualURI + "/" + eprURI;
-        }
-
-        if (wsdlURI != null && wsdlURI.toString().length() != 0) {
-            // there is a relative URI in the WSDL port
-            actualURI = actualURI + "/" + wsdlURI;
-        }
-        
-        if (actualURI != null) {
-            actualURI = URI.create(actualURI).normalize().toString();
-        }
-        
-        return actualURI;
-    }
-
-    private static URI getEPR(WebServiceBinding wsBinding) {
-        NodeList nodeList = wsBinding.getEndPointReference().getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++) {
-            Node childNode = nodeList.item(i);
-            if (childNode instanceof Element && ADDRESS.equals(childNode.getLocalName())) {
-                NodeList addrNodes = childNode.getChildNodes();
-                for (int j = 0; j < addrNodes.getLength(); j++) {
-                    Node addrNode = addrNodes.item(j);
-                    if (addrNode instanceof Text) {
-                        return URI.create(((Text)addrNode).getWholeText());
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the endpoint of a given port.
-     */
-    private static URI getEndpoint(Port wsdlPort) {
-        if (wsdlPort != null) {
-            List<?> wsdlPortExtensions = wsdlPort.getExtensibilityElements();
-            for (Object extension : wsdlPortExtensions) {
-                if (extension instanceof SOAPAddress) {
-                    String uri = ((SOAPAddress)extension).getLocationURI();
-                    return (uri == null || "".equals(uri)) ? null : URI.create(uri);
-                }
-                if (extension instanceof SOAP12Address) {
-                    SOAP12Address address = (SOAP12Address)extension;
-                    String uri = address.getLocationURI();
-                    return (uri == null || "".equals(uri)) ? null : URI.create(uri);
-                }
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
deleted file mode 100644
index 4bfbdd2901..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
+++ /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.
-#
-#
-WsdlGenProblem = Unable to generate WSDL for {0}/{1}
-WsdlGenException = Exception while generating WSDL for {0}/{1}
-UnexpectedException = Exception thrown was: {0}
-MissingInterfaceContract = No interface contract for {0}/{1}
-InterfaceNotRemotable = Interface not remotable: {0}
-IgnoringPort = Port {0}/{1} in {2}/{3} is not supported and was ignored
-PortTypeNotFound = PortType {0} in {1}/{2} was not found
-BindingNotFound = Binding {0} in {1}/{2} was not found
-InvalidPort = Port {0}/{1} in {2}/{3} is not supported
-NoValidPorts = No valid ports for service {0} in {1}/{2}
-NoWsdlInterface = No WSDL interface definition for {1}/{2}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
deleted file mode 100644
index b316b77793..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.tuscany.sca.binding.ws.other;
-
-public class Other {
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name ) {
-        this.name = name;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
deleted file mode 100644
index 5056760366..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://other.ws.binding.sca.tuscany.apache.org/")
-package org.apache.tuscany.sca.binding.ws.other;
-
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
deleted file mode 100644
index e474c7a318..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.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.ws.wsdlgen;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
-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.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.xml.XSDModelResolver;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class BindingWSDLGeneratorTestCase extends TestCase {
-
-    public void testCreateWSDLInterfaceContract() throws InvalidInterfaceException {
-        DefaultModelFactoryExtensionPoint modelFactories = new DefaultModelFactoryExtensionPoint();
-        WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class);
-        DefaultJavaInterfaceFactory factory = new DefaultJavaInterfaceFactory();
-        JavaInterfaceContract javaIC = factory.createJavaInterfaceContract();
-        JavaInterface iface = factory.createJavaInterface(HelloWorld.class);
-        DefaultDataBindingExtensionPoint dataBindings = new DefaultDataBindingExtensionPoint();
-        JAXWSFaultExceptionMapper faultExceptionMapper = new JAXWSFaultExceptionMapper(dataBindings, null);
-        new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper, null).visitInterface(iface);
-        new DataBindingJavaInterfaceProcessor(dataBindings).visitInterface(iface);
-        javaIC.setInterface(iface);
-        WSDLInterfaceContract wsdlIC = BindingWSDLGenerator.createWSDLInterfaceContract(javaIC, false, new XSDModelResolver(null, null), dataBindings, wsdlFactory, xsdFactory, null);
-        assertNotNull(wsdlIC);
-        WSDLInterface wsdlInterface = (WSDLInterface)wsdlIC.getInterface();
-        assertNotNull(wsdlInterface);
-        assertEquals(1, wsdlInterface.getOperations().size());
-        assertEquals("sayHello", wsdlInterface.getOperations().get(0).getName());
-        assertNotNull(wsdlInterface.getPortType());
- 
-        JavaInterfaceContract javaIC2 = factory.createJavaInterfaceContract();
-        JavaInterface iface2 = factory.createJavaInterface(TestJavaInterface.class);
-        new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper, null).visitInterface(iface2);
-        new DataBindingJavaInterfaceProcessor(dataBindings).visitInterface(iface2);
-        javaIC2.setInterface(iface2);
-        WSDLInterfaceContract wsdlIC2 = BindingWSDLGenerator.createWSDLInterfaceContract(javaIC2, false, new XSDModelResolver(null, null), dataBindings, wsdlFactory, xsdFactory, null);
-        assertNotNull(wsdlIC2);
-    }
-
-}
-
-@Remotable
-interface HelloWorld {
-    String sayHello(String s);
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
deleted file mode 100644
index f1e12f8ce0..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.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.ws.wsdlgen;
-
-import java.io.StringWriter;
-
-import javax.wsdl.Definition;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
-import org.apache.tuscany.sca.interfacedef.wsdl.DefaultWSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.xsd.DefaultXSDFactory;
-import org.apache.tuscany.sca.xsd.xml.XSDModelResolver;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Interface2WSDLGeneratorTestCase {
-
-    @Test
-    public void testGenerate() throws Exception {
-        DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory();
-        JavaInterface iface = iFactory.createJavaInterface(TestJavaInterface.class);
-        DefaultDataBindingExtensionPoint dataBindings = new DefaultDataBindingExtensionPoint();
-        JAXWSFaultExceptionMapper faultExceptionMapper = new JAXWSFaultExceptionMapper(dataBindings, null);
-        new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper, null).visitInterface(iface);
-        new DataBindingJavaInterfaceProcessor(dataBindings).visitInterface(iface);
-        DefaultModelFactoryExtensionPoint modelFactories = new DefaultModelFactoryExtensionPoint();
-        WSDLDefinition wsdlDefinition = new DefaultWSDLFactory(modelFactories).createWSDLDefinition();
-        DefaultXSDFactory factory = new DefaultXSDFactory();
-        Interface2WSDLGenerator generator = new Interface2WSDLGenerator(false, new XSDModelResolver(null, null), dataBindings, factory, null);
-        Definition definition = generator.generate(iface, wsdlDefinition);
-
-        // print the generated WSDL file and inline schemas
-        WSDLWriter writer = generator.getFactory().newWSDLWriter();
-        StringWriter sw = new StringWriter();
-        writer.writeWSDL(definition, sw);
-        System.out.println(sw.toString());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
deleted file mode 100644
index 1e4f802e01..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/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 org.apache.tuscany.sca.binding.ws.wsdlgen;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TestException extends Exception {
-
-    private String userdata;
-
-    public TestException(String message) {
-        super(message);
-    }
-
-    public TestException(String message, String userdata) {
-        super(message);
-        this.userdata = userdata;
-    }
-
-    public String getUserdata() {
-        return userdata;
-    }
-
-    public void setUserdata(String userdata) {
-        this.userdata = userdata;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
deleted file mode 100644
index da2c285bac..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.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.ws.wsdlgen;
-
-import javax.xml.ws.WebFault;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-@WebFault(faultBean="org.apache.tuscany.sca.binding.ws.wsdlgen.TestFaultBean")
-public class TestFault extends Exception {
-
-    private TestFaultBean bean;
-
-    public TestFault(TestFaultBean bean, String message) {
-        super(message);
-        this.bean = bean;
-    }
-
-    public TestFault(TestFaultBean bean, String message, Throwable cause) {
-        super(message, cause);
-        this.bean = bean;
-    }
-
-    public TestFaultBean getFaultInfo() {
-        return bean;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
deleted file mode 100644
index 64cce0e49d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.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.ws.wsdlgen;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TestFaultBean {
-    private String lastName;
-    private String firstName;
-    private float age;
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public float getAge() {
-        return age;
-    }
-
-    public void setAge(float age) {
-        this.age = age;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
deleted file mode 100644
index 3fd7361ae1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.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.ws.wsdlgen;
-import org.apache.tuscany.sca.binding.ws.other.Other;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TestJavaClass {
-    public Other other;
-    public String name;
-    public int number;
-    public float balance;
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
deleted file mode 100644
index 9635d65f99..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.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.ws.wsdlgen;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-@WebService
-public interface TestJavaInterface {
-    String m1(String str);
-
-    @OneWay
-    @WebMethod
-    void m2(int i);
-
-    @WebMethod
-    String m3();
-
-    void m4();
-
-    @WebMethod
-    String m5(String str, int i);
-
-    @WebMethod(exclude = true)
-    void dummy();
-
-    @WebMethod
-    void m6(TestJavaClass info) throws TestException;
-
-    @WebMethod
-    void m7(TestJavaClass info) throws TestFault;
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/LICENSE b/tags/java/sca/1.3/modules/binding-ws-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/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/tags/java/sca/1.3/modules/binding-ws-xml/NOTICE b/tags/java/sca/1.3/modules/binding-ws-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/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/tags/java/sca/1.3/modules/binding-ws-xml/pom.xml b/tags/java/sca/1.3/modules/binding-ws-xml/pom.xml
deleted file mode 100644
index c4599f6ea8..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-ws-xml</artifactId>
-    <name>Apache Tuscany SCA WS Binding XML Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</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.ws.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
deleted file mode 100644
index f2376231ab..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.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.ws.xml;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.assembly.AbstractContract;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilder;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A factory for the calculated WSDL document needed by Web Service bindings.
- * 
- * @version $Rev$ $Date$
- */
-public class BindingBuilderImpl implements BindingBuilder {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public BindingBuilderImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-    }
-    
-    /**
-     * Create a calculated WSDL document and save it in the Web Service binding. 
-     */
-    public void build(Component component, AbstractContract contract, Binding binding, Monitor monitor) {
-        BindingWSDLGenerator.generateWSDL(component, contract, (WebServiceBinding)binding, extensionPoints, monitor);
-    }  
-    
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
deleted file mode 100644
index ad2540e5fe..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.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.ws.xml;
-
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-import java.io.StringWriter;
-
-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.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-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;
-
-/**
- * Helper methods to read and write a wsa:endpointReference
- * TODO: almost direct copy of code for Assembly properties
- *       must be able to move to a common utility
- *
- * @version $Rev$ $Date$
- */
-public class EndPointReferenceHelper {
-    
-    /**
-     * Read a wsa:endpointReference into a DOM Element
-     */
-    public static Element readEndPointReference(XMLStreamReader reader) {
-        try {
-
-            return loadElement(reader);
-
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /**
-     * Write a wsa:endpointReference from a DOM Element
-     */
-    public static void writeEndPointReference(Element element, XMLStreamWriter writer)  {
-        try {
-
-            saveElement(element, writer);
-
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static Element loadElement(XMLStreamReader reader) throws XMLStreamException, ParserConfigurationException {
-        Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-        Node root = document;
-        Node current = root;
-        while (true) {
-            switch (reader.getEventType()) {
-                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 ("EndpointReference".equals(reader.getName().getLocalPart())) {
-                        return document.getDocumentElement();
-                    }
-
-                    // pop the element off the stack
-                    current = current.getParentNode();
-            }
-            if ( reader.hasNext()) reader.next();
-        }
-    }
-
-    private 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);
-    }
-
-    private static 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);
-        }
-    }
-    
-    private static void saveElement(Element element, XMLStreamWriter writer) throws XMLStreamException{
-
-        XMLStreamReader reader =
-            XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(element));
-
-        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;
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
deleted file mode 100644
index c472caac3a..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.ConfiguredOperationProcessor;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-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;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
-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.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * This is the StAXArtifactProcessor for the Web Services Binding.
- *
- * @version $Rev$ $Date$
- */
-public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
-
-    private ExtensionPointRegistry extensionPoints;
-    private WSDLFactory wsdlFactory;
-    private WebServiceBindingFactory wsFactory;
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private IntentAttachPointTypeFactory intentAttachPointTypeFactory;
-    private ConfiguredOperationProcessor configuredOperationProcessor;
-    private Monitor monitor;
-    
-    public WebServiceBindingProcessor(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.wsFactory = new DefaultWebServiceBindingFactory();
-        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        if (monitorFactory != null) {
-            this.monitor = monitorFactory.createMonitor();
-        }
-        this.configuredOperationProcessor = new ConfiguredOperationProcessor(modelFactories, this.monitor);
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-       if (monitor != null) {
-           Problem problem = new ProblemImpl(this.getClass().getName(), "binding-wsxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-           monitor.problem(problem);
-       }
-    }
-         
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "binding-wsxml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }
-
-    public WebServiceBinding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
-        // Read a <binding.ws>
-        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-        /*IntentAttachPointType bindingType = intentAttachPointTypeFactory.createBindingType();
-        bindingType.setName(getArtifactType());
-        bindingType.setUnresolved(true);
-        ((PolicySetAttachPoint)wsBinding).setType(bindingType);*/
-        wsBinding.setUnresolved(true);
-        wsBinding.setBuilder(new BindingBuilderImpl(extensionPoints));
-
-        // Read policies
-        policyProcessor.readPolicies(wsBinding, reader);
-
-        // Read the binding name
-        String name = reader.getAttributeValue(null, NAME);
-        if (name != null) {
-            wsBinding.setName(name);
-        }
-
-        // Read URI
-        String uri = reader.getAttributeValue(null, URI);
-        if (uri != null) {
-            wsBinding.setURI(uri);
-        }
-
-        // Read a qname in the form:
-        // namespace#wsdl.???(name)
-        Boolean wsdlElementIsBinding = null;
-        String wsdlElement = reader.getAttributeValue(null, WSDL_ELEMENT);
-        if (wsdlElement != null) {
-            int index = wsdlElement.indexOf('#');
-            if (index == -1) {
-            	error("InvalidWsdlElementAttr", reader, wsdlElement);
-                //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-            	return wsBinding;
-            }
-            String namespace = wsdlElement.substring(0, index);
-            wsBinding.setNamespace(namespace);
-            String localName = wsdlElement.substring(index + 1);
-            if (localName.startsWith("wsdl.service")) {
-
-                // Read a wsdl.service
-                localName = localName.substring("wsdl.service(".length(), localName.length() - 1);
-                wsBinding.setServiceName(new QName(namespace, localName));
-
-            } else if (localName.startsWith("wsdl.port")) {
-
-                // Read a wsdl.port
-                localName = localName.substring("wsdl.port(".length(), localName.length() - 1);
-                int s = localName.indexOf('/');
-                if (s == -1) {
-                	error("InvalidWsdlElementAttr", reader, wsdlElement);
-                    //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-                } else {
-                    wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
-                    wsBinding.setPortName(localName.substring(s + 1));
-                }
-            } else if (localName.startsWith("wsdl.endpoint")) {
-
-                // Read a wsdl.endpoint
-                localName = localName.substring("wsdl.endpoint(".length(), localName.length() - 1);
-                int s = localName.indexOf('/');
-                if (s == -1) {
-                	error("InvalidWsdlElementAttr", reader, wsdlElement);
-                    //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-                } else {
-                    wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
-                    wsBinding.setEndpointName(localName.substring(s + 1));
-                }
-            } else if (localName.startsWith("wsdl.binding")) {
-
-                // Read a wsdl.binding
-                localName = localName.substring("wsdl.binding(".length(), localName.length() - 1);
-                wsBinding.setBindingName(new QName(namespace, localName));
-
-                wsdlElementIsBinding = true;
-
-            } else {
-            	error("InvalidWsdlElementAttr", reader, wsdlElement);
-                //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-            }
-        }
-
-        // Read wsdlLocation
-        wsBinding.setLocation(reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION));
-
-        ConfiguredOperation confOp = null;
-        // Skip to end element
-        while (reader.hasNext()) {
-            int event = reader.next();
-            switch (event) {
-                case START_ELEMENT: {
-                    if (END_POINT_REFERENCE.equals(reader.getName().getLocalPart())) {
-                        if (wsdlElement != null && (wsdlElementIsBinding == null || !wsdlElementIsBinding)) {
-                        	error("MustUseWsdlBinding", reader, wsdlElement);
-                            throw new ContributionReadException(wsdlElement + " must use wsdl.binding when using wsa:EndpointReference");
-                        }
-                        wsBinding.setEndPointReference(EndPointReferenceHelper.readEndPointReference(reader));
-                    } else if (Constants.OPERATION_QNAME.equals(reader.getName())) {
-                        confOp = configuredOperationProcessor.read(reader);
-                        if (confOp != null) {
-                            ((OperationsConfigurator)wsBinding).getConfiguredOperations().add(confOp);
-                        }
-                    }
-                }
-                    break;
-
-            }
-
-            if (event == END_ELEMENT && BINDING_WS_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        return wsBinding;
-    }
-
-    protected void processEndPointReference(XMLStreamReader reader, WebServiceBinding wsBinding) {
-    }
-
-    public void write(WebServiceBinding wsBinding, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-
-        // Write a <binding.ws>
-        policyProcessor.writePolicyPrefixes(wsBinding, writer);
-        writer.writeStartElement(Constants.SCA10_NS, BINDING_WS);
-        policyProcessor.writePolicyAttributes(wsBinding, writer);
-
-        // Write binding name
-        if (wsBinding.getName() != null) {
-            writer.writeAttribute(NAME, wsBinding.getName());
-        }
-
-        // Write binding URI
-        if (wsBinding.getURI() != null) {
-            writer.writeAttribute(URI, wsBinding.getURI());
-        }
-
-        // Write wsdlElement attribute
-        if (wsBinding.getPortName() != null) {
-
-            // Write namespace#wsdl.port(service/port)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.port("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + "/"
-                    + wsBinding.getPortName()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getEndpointName() != null) {
-
-            // Write namespace#wsdl.endpoint(service/endpoint)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.endpoint("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + "/"
-                    + wsBinding.getEndpointName()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getBindingName() != null) {
-
-            // Write namespace#wsdl.binding(binding)
-            String wsdlElement =
-                wsBinding.getBindingName().getNamespaceURI() + "#wsdl.binding("
-                    + wsBinding.getBindingName().getLocalPart()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getServiceName() != null) {
-
-            // Write namespace#wsdl.service(service)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.service("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-        }
-
-        // Write location
-        if (wsBinding.getLocation() != null) {
-            writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsBinding.getLocation());
-        }
-
-        if (wsBinding.getEndPointReference() != null) {
-            EndPointReferenceHelper.writeEndPointReference(wsBinding.getEndPointReference(), writer);
-        }
-
-        writer.writeEndElement();
-    }
-
-    public void resolve(WebServiceBinding model, ModelResolver resolver) throws ContributionResolveException {
-        
-    	if (model == null || !model.isUnresolved())
-    		return;
-    		
-    	WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-        wsdlDefinition.setUnresolved(true);
-        wsdlDefinition.setNamespace(model.getNamespace());
-        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);
-
-        if (!resolved.isUnresolved()) {
-            wsdlDefinition.setDefinition(resolved.getDefinition());
-            wsdlDefinition.setLocation(resolved.getLocation());
-            wsdlDefinition.setURI(resolved.getURI());
-            wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions());
-            wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());
-            wsdlDefinition.setUnresolved(false);
-            model.setDefinition(wsdlDefinition);
-            if (model.getBindingName() != null) {
-                WSDLObject<Binding> binding = wsdlDefinition.getWSDLObject(Binding.class, model.getBindingName());
-                if (binding != null) {
-                    wsdlDefinition.setDefinition(binding.getDefinition());
-                    model.setBinding(binding.getElement());
-                } else {
-                	warning("WsdlBindingDoesNotMatch", wsdlDefinition, model.getBindingName());
-                }
-            }
-            if (model.getServiceName() != null) {
-                WSDLObject<Service> service = wsdlDefinition.getWSDLObject(Service.class, model.getServiceName());
-                if (service != null) {
-                    wsdlDefinition.setDefinition(service.getDefinition());
-                    model.setService(service.getElement());
-                    if (model.getPortName() != null) {
-                        Port port = service.getElement().getPort(model.getPortName());
-                        model.setPort(port);
-                        model.setBinding(port.getBinding());
-                    }
-                } else {
-                	warning("WsdlServiceDoesNotMatch", wsdlDefinition, model.getServiceName());
-                }
-            }
-
-            PortType portType = getPortType(model);
-            if (portType != null) {
-                WSDLInterfaceContract interfaceContract = wsdlFactory.createWSDLInterfaceContract();
-                WSDLInterface wsdlInterface = null;
-                try {
-                    wsdlInterface = wsdlFactory.createWSDLInterface(portType, wsdlDefinition, resolver);
-                } catch (InvalidInterfaceException e) {
-                	warning("InvalidInterfaceException", wsdlFactory, model.getName()); 
-                }
-                interfaceContract.setInterface(wsdlInterface);
-                model.setBindingInterfaceContract(interfaceContract);
-            }
-        }
-        policyProcessor.resolvePolicies(model, resolver);
-        OperationsConfigurator opCongigurator = (OperationsConfigurator)model;
-        for (ConfiguredOperation confOp : opCongigurator.getConfiguredOperations()) {
-            policyProcessor.resolvePolicies(confOp, resolver);
-        }
-    }
-
-    private PortType getPortType(WebServiceBinding model) {
-        PortType portType = null;
-        if (model.getPort() != null) {
-            portType = model.getPort().getBinding().getPortType();
-        } else if (model.getEndpoint() != null) {
-            portType = model.getPort().getBinding().getPortType();
-        } else if (model.getBinding() != null) {
-            portType = model.getBinding().getPortType();
-        } else if (model.getService() != null) {
-            // FIXME: How to find the compatible port?
-            Map ports = model.getService().getPorts();
-            if (!ports.isEmpty()) {
-                Port port = (Port)ports.values().iterator().next();
-                portType = port.getBinding().getPortType();
-            }
-        }
-        return portType;
-    }
-
-    public QName getArtifactType() {
-        return WebServiceConstants.BINDING_WS_QNAME;
-    }
-
-    public Class<WebServiceBinding> getModelType() {
-        return WebServiceBinding.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
deleted file mode 100644
index 03c84a6b41..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.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.ws.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * Constants for the Web Services Binding.
- *
- * @version $Rev$ $Date$
- */
-public interface WebServiceConstants {
-
-    String BINDING_WS = "binding.ws";
-    QName BINDING_WS_QNAME = new QName(Constants.SCA10_NS, BINDING_WS);
-    String WSDL_ELEMENT = "wsdlElement";
-    QName WSDL_ELEMENT_QNAME = new QName(Constants.SCA10_NS, WSDL_ELEMENT);
-    String WSDL_LOCATION = "wsdlLocation";
-    String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
-    QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 
-    String NAME = "name"; 
-    String URI = "uri"; 
-    String END_POINT_REFERENCE = "EndpointReference";
-    
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index cb982e8647..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/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.ws.xml.WebServiceBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties b/tags/java/sca/1.3/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
deleted file mode 100644
index 60a7e9e2f2..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
+++ /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.
-#
-#
-InvalidWsdlElementAttr = Invalid WebService binding wsdlElement attribute: {0}
-MustUseWsdlBinding = {0} must use wsdl.binding when using wsa:EndpointReference
-InvalidInterfaceException = Exception creating interface from WSDL for binding: {0}
-WsdlBindingDoesNotMatch = The #wsdl.binding({0}) does not match with the WSDL Definitions 
-WsdlServiceDoesNotMatch = The #wsdl.service({0}) does not match with the WSDL Definitions
-
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
deleted file mode 100644
index ef955254c1..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.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.binding.ws.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.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-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.service.ContributionReadException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @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);
-        
-        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);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-    }
-    
-    public void testReadPolicies() throws Exception {
-        InputStream is = getClass().getResourceAsStream("PoliciedCalculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-
-        assertEquals(((OperationsConfigurator)composite.getServices().get(0).getBindings().get(0))
-            .getConfiguredOperations().get(0).getRequiredIntents().size(), 2);
-    }
-
-    /**
-     * This test makes sure that an exception is thrown when a bad wsdlElement is present along with EndpointReference.
-     *
-     * Ref: Web Service Binding Specification v1.0 - Sec 2.1 - Lines 61 to 65.
-     * When an EndpointReference is present along with the wsdlElement attribute on the parent element, the wsdlElement attribute value MUST
-     * be of the 'Binding' form.
-     */
-    public void testReadBadWsdlElement() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator-bad-wsdlElement.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        try {
-            staxProcessor.read(reader);
-            fail("ContributionReadException expected.");
-        } catch(ContributionReadException e) {
-            // Expected
-            assertNotSame(-1, e.getMessage().indexOf("must use wsdl.binding when using wsa:EndpointReference"));
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
deleted file mode 100644
index 0e519af9d3..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.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.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.ComponentType;
-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 testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-    }
-*/    
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        System.out.println(bos.toString());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
deleted file mode 100644
index d8d1b3401e..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.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.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/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
deleted file mode 100644
index f7460813cd..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.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.    
--->
-<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#wsdl.service(CalculatorService)"/>
-        <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)"/>
-        <binding.ws wsdlElement="http://sample/calculator#wsdl.binding(CalculatorBinding)">
-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
-              <wsa:Address>http://localhost:8085/services/HelloWorldWebService</wsa:Address>
-           </wsa:EndpointReference>
-        </binding.ws>               
-    </service>
-
-    <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/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
deleted file mode 100644
index 959802af43..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ /dev/null
@@ -1,45 +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/2004/08/wsdl-instance">
-
-  <service name="CalculatorService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-        <binding.ws uri="http://localhost:8085/Calculator" wsdlElement="http://sample/calculator#wsdl.service(CalculatorService)"/>
-        <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>
-
-  <reference name="divideService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Divide)"/>
-        <binding.ws uri="tempuri.org" wsdlElement="http://sample/calculator#wsdl.service(DivideService)"/>
-        <binding.ws uri="tempuri.org" wsdlElement="http://sample/calculator#wsdl.binding(DivideBinding)"/>
-        <binding.ws uri="tempuri.org" wsdlElement="http://sample/calculator#wsdl.port(DivideService/DividePort)"/>
-        <binding.ws uri="tempuri.org" wsdlElement="http://sample/calculator#wsdl.endpoint(DivideService/DivideEndpoint)"/>
-        <binding.ws>
-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
-              <wsa:Address>myURI</wsa:Address>
-           </wsa:EndpointReference>
-        </binding.ws>
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
deleted file mode 100644
index 37c80aa910..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.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: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#wsdl.service(CalculatorService)">

-        	<operation name="add" requires="IntentOne IntentTwo"/>

-        </binding.ws>

-        <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.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/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
deleted file mode 100644
index 5e8e5dad0d..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://www.example.org"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  name="example">
-
-    <wsdl:portType name="HelloWorld">
-    </wsdl:portType>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
deleted file mode 100644
index ad81fc7867..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ /dev/null
@@ -1,58 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice1">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
deleted file mode 100644
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/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/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
deleted file mode 100644
index 39cd5547d9..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ /dev/null
@@ -1,58 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
deleted file mode 100644
index 8e26f7b4b5..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ /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.    
--->
-<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="test2.wsdl" 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/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
deleted file mode 100644
index c2210f4a94..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ /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.    
--->
-<schema targetNamespace="http://www.example.com/Customer" xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ipo="http://www.example.com/IPO" xmlns:tns="http://www.example.com/Customer">
-    <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-    <complexType name="Customer">
-        <sequence>
-            <element name="customerID" type="string"></element>
-            <element name="name" type="string"></element>
-            <element name="order" type="ipo:PurchaseOrderType" />
-        </sequence>
-    </complexType>
-    <element name="customer" type="tns:Customer"></element>
-
-</schema>
-
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
deleted file mode 100644
index 529b395fd5..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.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 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">
-
-            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-            <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:definitions>
diff --git a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
deleted file mode 100644
index 666a7e4069..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ /dev/null
@@ -1,76 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput1">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput1">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <message name="GetLastTradePriceInput2">
-        <part name="body" element="xsd1:getLastTradePrice" />
-        <part name="other" type="xsd:string"/>
-    </message>
-
-    <message name="GetLastTradePriceOutput2">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-    
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice1">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice2">
-            <input message="tns:GetLastTradePriceInput2" />
-            <output message="tns:GetLastTradePriceOutput2" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/binding-ws/LICENSE b/tags/java/sca/1.3/modules/binding-ws/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/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/tags/java/sca/1.3/modules/binding-ws/NOTICE b/tags/java/sca/1.3/modules/binding-ws/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/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/tags/java/sca/1.3/modules/binding-ws/pom.xml b/tags/java/sca/1.3/modules/binding-ws/pom.xml
deleted file mode 100644
index bf2768aec6..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-ws</artifactId>
-    <name>Apache Tuscany SCA WS Binding Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-         <dependency>
-             <groupId>wsdl4j</groupId>
-             <artifactId>wsdl4j</artifactId>
-             <version>1.6.2</version>
-         </dependency>
-    </dependencies>
-
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-    <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.ws</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
deleted file mode 100644
index 2ccaa5dc58..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.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.ws;
-
-import org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingFactoryImpl;
-
-/**
- * A factory for the Web Service binding model.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class DefaultWebServiceBindingFactory extends WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
deleted file mode 100644
index 0d07a55a14..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.w3c.dom.Element;
-
-
-/**
- * Represents a WebService binding.
- * 
- * @version $Rev$ $Date$
- */
-public interface WebServiceBinding extends Binding, BindingBuilderExtension {
-
-    /**
-     * Sets the WSDL location. 
-     * @param location the WSDL location
-     */
-    void setLocation(String location);
-
-    /**
-     * Returns the WSDL location
-     * @return the WSDL location
-     */
-    String getLocation();
-    
-    /**
-     * Returns the name of the WSDL service.
-     * 
-     * @return the name of the WSDL service
-     */
-    QName getServiceName();
-
-    /**
-     * Sets the name of the WSDL service.
-     * 
-     * @param serviceName the name of the WSDL service
-     */
-    void setServiceName(QName serviceName);
-
-    /**
-     * Returns the name of the WSDL port.
-     * 
-     * @return the name of the WSDL port
-     */
-    String getPortName();
-
-    /**
-     * Sets the name of the WSDL port.
-     * 
-     * @param portName the name of the WSDL port
-     */
-    void setPortName(String portName);
-
-    /**
-     * Returns the name of the WSDL binding.
-     * 
-     * @return the name of the WSDL binding
-     */
-    QName getBindingName();
-
-    /**
-     * Sets the name of the WSDL binding.
-     * 
-     * @param bindingName the name of the WSDL binding
-     */
-    void setBindingName(QName bindingName);
-
-    /**
-     * Returns the name of the WSDL endpoint.
-     * 
-     * @return the name of the WSDL endpoint
-     */
-    String getEndpointName();
-
-    /**
-     * Sets the name of the WSDL endpoint.
-     * 
-     * @param endpointName the name of the WSDL endpoint
-     */
-    void setEndpointName(String endpointName);
-
-    /**
-     * Returns the WSDL service
-     * @return the WSDL service
-     */
-    Service getService();
-    
-    /**
-     * Sets the WSDL service.
-     * @param service the WSDL service
-     */
-    void setService(Service service);
-    
-    /**
-     * Returns the WSDL port
-     * @return the WSDL port
-     */
-    Port getPort();
-    
-    /**
-     * Sets the WSDL endpoint
-     * @param endpoint the WSDL endpoint
-     */
-    void setEndpoint(Port endpoint);
-    
-    /**
-     * Returns the WSDL endpoint
-     * @return the WSDL endpoint
-     */
-    Port getEndpoint();
-    
-    /**
-     * Sets the WSDL port
-     * @param port the WSDL port
-     */
-    void setPort(Port port);
-    
-    /**
-     * Returns the WSDL binding.
-     * @return the WSDL binding
-     */
-    javax.wsdl.Binding getBinding();
-    
-    /**
-     * Sets the WSDL binding
-     * @param binding the WSDL binding
-     */
-    void setBinding(javax.wsdl.Binding binding);
-
-    /**
-     * Returns the WSDL definition.
-     * @return the WSDL definition
-     */
-    WSDLDefinition getWSDLDefinition();
-    
-    /**
-     * Sets the WSDL definition.
-     * @param wsdlDefinition the WSDL definition
-     */
-    void setDefinition(WSDLDefinition wsdlDefinition);
-
-    /**
-     * Returns the WSDL namespace.
-     * @return the WSDL namespace
-     */
-    String getNamespace();
-    
-    /**
-     * Sets the WSDL namespace
-     * @param namespace the WSDL namespace
-     */
-    void setNamespace(String namespace);
-    
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-    
-    InterfaceContract getBindingInterfaceContract();
-    
-    void setBindingInterfaceContract(InterfaceContract bindingInterfaceContract);
-    
-    Element getEndPointReference();
-    
-    void setEndPointReference(Element element);
-
-    /**
-     * Returns the generated WSDL definitions document.
-     * @return the generated WSDL definitions document
-     */
-    Definition getWSDLDocument();
-
-    /**
-     * Sets the generated WSDL definitions document.
-     * @param definition the generated WSDL definitions document
-     */
-    void setWSDLDocument(Definition definition);
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
deleted file mode 100644
index 1ad38c69e4..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.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.ws;
-
-/**
- * Factory for the Web Service binding model.
- * 
- * @version $Rev$ $Date$
- */
-public interface WebServiceBindingFactory {
-
-    /**
-     * Creates a new WebService binding.
-     * 
-     * @return a new WebService binding
-     */
-    WebServiceBinding createWebServiceBinding();
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
deleted file mode 100644
index a13584a3c2..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.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.ws.addressing;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-/**
- * Defines a model for WS-Addressing
- * &lt;wsa:EndpointReference&gt;
- *     &lt;wsa:Address&gt;xs:anyURI&lt;/wsa:Address&gt;
- *     &lt;wsa:ReferenceProperties&gt;... &lt;/wsa:ReferenceProperties&gt; ?
- *     &lt;wsa:ReferenceParameters&gt;... &lt;/wsa:ReferenceParameters&gt; ?
- *     &lt;wsa:PortType&gt;xs:QName&lt;/wsa:PortType&gt; ?
- *     &lt;wsa:ServiceName PortName="xs:NCName"?&gt;xs:QName&lt;/wsa:ServiceName&gt; ?
- *     &lt;wsp:Policy&gt; ... &lt;/wsp:Policy&gt;*
- * &lt;/wsa:EndpointReference&gt;
- * @version $Rev$ $Date$
- */
-public interface EndPointReference {
-    URI getAddress();
-
-    void setAddress(URI address);
-
-    QName getPortType();
-
-    void setPortType(QName portType);
-
-    QName getServiceName();
-
-    void setServiceName(QName serviceName);
-
-    QName getPortName();
-
-    void setPortName(QName portName);
-
-    List<Object> getReferenceProperties();
-
-    List<Object> getReferenceParameters();
-
-    List<Object> getPolicies();
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
deleted file mode 100644
index 055e2012dc..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.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.ws.impl;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-
-/**
- * A factory for the WSDL model.
- * 
- * @version $Rev$ $Date$
- */
-public class WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
-
-    public WebServiceBinding createWebServiceBinding() {
-        return new WebServiceBindingImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
deleted file mode 100644
index 26857abe83..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilder;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-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 org.w3c.dom.Element;
-
-/**
- * Represents a WebService binding.
- *
- * @version $Rev$ $Date$
- */
-class WebServiceBindingImpl implements WebServiceBinding, PolicySetAttachPoint, Extensible, OperationsConfigurator {
-    private String name;
-    private String uri;
-    private boolean unresolved;
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<ConfiguredOperation>  configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private String location;
-    private Binding binding;
-    private Service service;
-    private Port port;
-    private Port endpoint;
-    private QName bindingName;
-    private String portName;
-    private QName serviceName;
-    private String endpointName;
-    private WSDLDefinition wsdlDefinition;
-    private String wsdlNamespace;
-    private InterfaceContract bindingInterfaceContract;
-    private Element endPointReference;
-    private Definition generatedWSDLDocument;
-    private BindingBuilder builder;
-    
-    protected WebServiceBindingImpl() {
-    }
-    
-    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 unresolved;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    } 
-    
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-    
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public Binding getBinding() {
-        if (binding == null) {
-            if (getWSDLDefinition() != null && wsdlDefinition.getBinding() != null) {
-                binding = wsdlDefinition.getBinding();
-            }
-        }
-        return binding;
-    }
-
-    public QName getBindingName() {
-        if (isUnresolved()) {
-            return bindingName;
-        } else if (binding != null) {
-            return binding.getQName();
-        } else {
-            return null;
-        }
-    }
-
-    public String getEndpointName() {
-        if (isUnresolved()) {
-            return endpointName;
-        } else if (endpoint != null) {
-            //TODO support WSDL 2.0
-            return endpoint.getName();
-        } else {
-            return null;
-        }
-    }
-    
-    public Port getEndpoint() {
-        return endpoint;
-    }
-
-    public Port getPort() {
-        return port;
-    }
-
-    public String getPortName() {
-        if (isUnresolved()) {
-            return portName;
-        } else if (port != null) {
-            return port.getName();
-        } else {
-            return null;
-        }
-    }
-
-    public Service getService() {
-        return service;
-    }
-
-    public QName getServiceName() {
-        if (isUnresolved()) {
-            return serviceName;
-        } else if (service != null) {
-            return service.getQName();
-        } else {
-            return null;
-        }
-    }
-
-    public void setBinding(Binding binding) {
-        this.binding = binding;
-    }
-
-    public void setBindingName(QName bindingName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.bindingName = bindingName;
-    }
-    
-    public void setEndpoint(Port endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public void setEndpointName(String endpointName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.endpointName = endpointName;
-    }
-
-    public void setPort(Port port) {
-        this.port = port;
-    }
-
-    public void setPortName(String portName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.portName = portName;
-    }
-
-    public void setService(Service service) {
-        this.service = service;
-    }
-
-    public void setServiceName(QName serviceName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.serviceName = serviceName;
-    }
-
-    public WSDLDefinition getWSDLDefinition() {
-        if (wsdlDefinition == null) {
-            Interface iface = bindingInterfaceContract.getInterface();
-            if (iface instanceof WSDLInterface) {
-                wsdlDefinition = ((WSDLInterface) iface).getWsdlDefinition();
-            }
-        }
-        return wsdlDefinition;
-    }
-
-    public void setDefinition(WSDLDefinition wsdlDefinition) {
-        this.wsdlDefinition = wsdlDefinition;
-    }
-
-    public String getNamespace() {
-        return wsdlNamespace;
-    }
-
-    public void setNamespace(String namespace) {
-        this.wsdlNamespace = namespace;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return bindingInterfaceContract;
-    }
-
-    public void setBindingInterfaceContract(InterfaceContract bindingInterfaceContract) {
-        this.bindingInterfaceContract = bindingInterfaceContract;
-    }
-    
-    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 Element getEndPointReference() {
-        return endPointReference;
-    }
-
-    public void setEndPointReference(Element epr) {
-        this.endPointReference = epr;
-    }
-
-    public Definition getWSDLDocument() {
-        return generatedWSDLDocument;
-    }
-
-    public void setWSDLDocument(Definition definition) {
-        this.generatedWSDLDocument = definition;
-    }
-
-    public BindingBuilder getBuilder() {
-        return builder;
-    }
-
-    public void setBuilder(BindingBuilder builder) {
-        this.builder = builder;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public void setConfiguredOperations(List<ConfiguredOperation> configuredOperations) {
-        this.configuredOperations = configuredOperations;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/tags/java/sca/1.3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
deleted file mode 100644
index 6d50a24b93..0000000000
--- a/tags/java/sca/1.3/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+++ /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.ws.impl.WebServiceBindingFactoryImpl
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/LICENSE b/tags/java/sca/1.3/modules/contribution-groovy/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/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/tags/java/sca/1.3/modules/contribution-groovy/NOTICE b/tags/java/sca/1.3/modules/contribution-groovy/NOTICE
deleted file mode 100644
index aeeca5ef8d..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/NOTICE
+++ /dev/null
@@ -1,8 +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 uses Relax WS (http://code.google.com/p/relax-ws/) with the following copyright:
- * Copyright 2008 Jason Sando
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/pom.xml b/tags/java/sca/1.3/modules/contribution-groovy/pom.xml
deleted file mode 100644
index 31506b90bb..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-contribution-groovy</artifactId>
-    <name>Apache Tuscany SCA Groovy contributions</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all-minimal</artifactId>
-            <version>1.5.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.contribution.groovy</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.groovy*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
deleted file mode 100644
index 77dab193b9..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.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.groovy;
-
-import java.net.URL;
-
-/**
- * GroovyArtifact holds the URL to the Groovy script.
- *
- * @version $Rev$ $Date$
- */
-public class GroovyArtifact {
-
-    private URL artifactURL;
-
-    public GroovyArtifact(URL artifactURL) {
-        this.artifactURL = artifactURL;
-    }
-
-    public URL getArtifactURL() {
-        return artifactURL;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
deleted file mode 100644
index 4b7df4d9f8..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.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.contribution.groovy;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * A URLArtifactProcessor for Groovy scripts
- *
- * @version $Rev$ $Date$
- */
-public class GroovyArtifactProcessor implements URLArtifactProcessor<GroovyArtifact> {
-
-    public GroovyArtifactProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    public GroovyArtifact read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
-        return new GroovyArtifact(artifactURL);
-    }
-
-    public String getArtifactType() {
-        return ".groovy";
-    }
-
-    public Class<GroovyArtifact> getModelType() {
-        return GroovyArtifact.class;
-    }
-
-    public void resolve(GroovyArtifact groovyModel, ModelResolver arg1) throws ContributionResolveException {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
deleted file mode 100644
index 82fe0326df..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.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.contribution.groovy;
-
-import groovy.lang.GroovyClassLoader;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A ModelResolver that compiles Groovy scripts into the contribution 
- * class loader so they can be used just like a regular java class.
- *
- * @version $Rev$ $Date$
- */
-public class GroovyModelResolver implements ModelResolver {
-
-    protected ModelResolver modelresolver;
-    protected Contribution contribution;
-
-    public GroovyModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        modelresolver = contribution.getModelResolver();
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object model) {
-        ClassLoader cl = contribution.getClassLoader();
-        if (!(cl instanceof GroovyClassLoader)) {
-            // replace the contribution class loader with a Groovy one
-        	// If the contribution does not have a ClassLoader, use this ClassLoader as parent
-        	if (cl == null) cl = this.getClass().getClassLoader();            
-            cl = new GroovyClassLoader(cl);
-            contribution.setClassLoader(cl);
-        }
-        try {
-
-            ((GroovyClassLoader)cl).parseClass(((GroovyArtifact)model).getArtifactURL().openStream());
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Object removeModel(Object arg0) {
-        return null;
-    }
-
-    public <T> T resolveModel(Class<T> arg0, T arg1) {
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index f9dbee53bb..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ /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.contribution.groovy.GroovyArtifactProcessor;type=.groovy,model=org.apache.tuscany.sca.contribution.groovy.GroovyArtifact
-
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 86434ac4bf..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/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.groovy.GroovyModelResolver;model=org.apache.tuscany.sca.contribution.groovy.GroovyArtifact

diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
deleted file mode 100644
index 788c42f07d..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.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.contribution.groovy;
-
-/**
- * HelloWorld Service interface used for testing.
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorld {
-
-    String sayHello(String s);
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
deleted file mode 100644
index 02be3acd23..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/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 org.apache.tuscany.sca.contribution.groovy;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-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
- *
- * @version $Rev$ $Date$
- */
-public class HelloWorldTestCase {
-
-    private static HelloWorld helloWorld;
-    private static SCADomain scaDomain;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/contribution/groovy/helloworld.composite");
-        helloWorld = scaDomain.getService(HelloWorld.class, "HelloWolrdComponent");
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-
-    @Test
-    public void testCalculator() throws Exception {
-        Assert.assertEquals("Hello Petra", helloWorld.sayHello("Petra"));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
deleted file mode 100644
index c172528538..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
+++ /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.contribution.groovy

-

-class HelloWorldImpl implements org.apache.tuscany.sca.contribution.groovy.HelloWorld {

- 

-   String sayHello(String you) {

-      return "Hello $you"

-   }

-

-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
deleted file mode 100644
index 0d4c17a15b..0000000000
--- a/tags/java/sca/1.3/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/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://sample"

-           xmlns:sample="http://sample"

-           name="HelloWorld">

-

-    <component name="HelloWolrdComponent">

-		<implementation.java class="org.apache.tuscany.sca.contribution.groovy.HelloWorldImpl"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/contribution-impl/LICENSE b/tags/java/sca/1.3/modules/contribution-impl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution-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/tags/java/sca/1.3/modules/contribution-impl/NOTICE b/tags/java/sca/1.3/modules/contribution-impl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/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/tags/java/sca/1.3/modules/contribution-impl/pom.xml b/tags/java/sca/1.3/modules/contribution-impl/pom.xml
deleted file mode 100644
index ec0ae2190f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-impl</artifactId>
-    <name>Apache Tuscany SCA Contribution Model Implementation</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.impl</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
deleted file mode 100644
index ab056e3214..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.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.contribution.processor.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-
-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.contribution.service.ContributionReadException;
-
-/**
- * Folder contribution package processor.
- * 
- * @version $Rev$ $Date$
- */
-public class FolderContributionProcessor implements PackageProcessor {
-
-    public FolderContributionProcessor() {
-    }
-
-    public String getPackageType() {
-        return PackageType.FOLDER;
-    }
-
-    /**
-     * Recursively traverse a root directory
-     * 
-     * @param fileList
-     * @param file
-     * @param root
-     * @throws IOException
-     */
-    private static void traverse(List<URI> fileList, final File file, final File root) throws IOException {
-        // Allow privileged access to test file. Requires FilePermissions in security policy file.
-        Boolean isFile = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-            public Boolean run() {
-                return file.isFile();
-            }
-        });
-        if (isFile) {
-            fileList.add(AccessController.doPrivileged(new PrivilegedAction<URI>() {
-                public URI run() {
-                    return root.toURI().relativize(file.toURI());
-                }
-            }));
-        } else {
-            // Allow privileged access to test file. Requires FilePermissions in security policy
-            // file.
-            Boolean isDirectory = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                public Boolean run() {
-                    return file.isDirectory();
-                }
-            });
-            if (isDirectory) {
-                String uri = AccessController.doPrivileged(new PrivilegedAction<URI>() {
-                    public URI run() {
-                        return root.toURI().relativize(file.toURI());
-                    }
-                }).toString();
-
-                if (uri.endsWith("/")) {
-                    uri = uri.substring(0, uri.length() - 1);
-                }
-                fileList.add(URI.create(uri));
-
-                // Allow privileged access to list files. Requires FilePermission in security
-                // policy.
-                File[] files = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
-                    public File[] run() {
-                        return file.listFiles();
-                    }
-                });
-                for (File f : files) {
-                    if (!f.getName().startsWith(".")) {
-                        traverse(fileList, f, root);
-                    }
-                }
-            }
-        }
-    }
-    
-    public URL getArtifactURL(URL sourceURL, URI artifact) throws MalformedURLException {
-        return new URL(sourceURL, artifact.toString());
-    }
-
-    public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,
-        IOException {
-        if (packageSourceURL == null) {
-            throw new IllegalArgumentException("Invalid null package source URL.");
-        }
-
-        List<URI> artifacts = new ArrayList<URI>();
-
-        try {
-            // Assume the root is a jar file
-            final File rootFolder = new File(packageSourceURL.toURI());
-            // Allow privileged access to test file. Requires FilePermissions in security policy
-            // file.
-            Boolean isDirectory = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                public Boolean run() {
-                    return rootFolder.isDirectory();
-                }
-            });
-            if (isDirectory) {
-                // Allow privileged access to test file. Requires FilePermissions in security policy
-                // file.
-                Boolean folderExists = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                    public Boolean run() {
-                        return rootFolder.exists();
-                    }
-                });
-                if (!folderExists) {
-                    throw new ContributionReadException(rootFolder.getAbsolutePath());
-                }
-
-                // Security consideration. This method gathers URIs of enclosed
-                // artifacts. The URIs are protected by the policy when a user
-                // yries to open those URLs.
-                traverse(artifacts, rootFolder, rootFolder);
-            }
-
-        } catch (URISyntaxException e) {
-            throw new ContributionReadException(packageSourceURL.toExternalForm(), e);
-        }
-
-        return artifacts;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
deleted file mode 100644
index 3df275a7a1..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.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.contribution.processor.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.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;
-
-/**
- * Jar Contribution package processor.
- * 
- * @version $Rev$ $Date$
- */
-public class JarContributionProcessor implements PackageProcessor {
-
-    public JarContributionProcessor() {
-    }
-
-    public String getPackageType() {
-        return PackageType.JAR;
-    }
-
-    public URL getArtifactURL(URL sourceURL, URI artifact) throws MalformedURLException {
-        if (sourceURL.toString().startsWith("jar:")) {
-            return new URL(sourceURL, artifact.toString());
-        } else {
-            return new URL("jar:" + sourceURL.toExternalForm() + "!/" + artifact);
-        }
-    }
-
-    public List<URI> getArtifacts(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(".")) {
-                    
-                    // Trim trailing /
-                    if (name.endsWith("/")) {
-                        name = name.substring(0, name.length() - 1);
-                    }
-
-                    // Add the entry name
-                    if (!names.contains(name)) {
-                        names.add(name);
-                        
-                        // Add parent folder names to the list too
-                        for (;;) {
-                            int s = name.lastIndexOf('/');
-                            if (s == -1) {
-                                name = "";
-                            } else {
-                                name = name.substring(0, s);
-                            }
-                            if (!names.contains(name)) {
-                                names.add(name);
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            
-            // Return list of URIs
-            List<URI> artifacts = new ArrayList<URI>();
-            for (String name: names) {
-                artifacts.add(URI.create(name));
-            }
-            return artifacts;
-            
-        } finally {
-            jar.close();
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
deleted file mode 100644
index 9375cb917f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.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.contribution.service.impl;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * The default implementation of ContributionRepository
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionRepositoryImpl implements ContributionRepository {
-    private static final String NS = "http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";
-    private static final String DOMAIN_INDEX_FILENAME = "sca-domain.xml";
-    private final File rootFile;
-    private Map<String, String> contributionLocations = new HashMap<String, String>();
-    
-    private Map<String, Contribution> contributionMap = new HashMap<String, Contribution>();
-    private List<Contribution> contributions = new ArrayList<Contribution>();
-
-    private URI domain;
-    private XMLInputFactory factory;
-    private 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(), "contribution-impl-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(), "contribution-impl-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 = new ProblemImpl(this.getClass().getName(), "contribution-impl-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	}
-    }
-
-    /**
-     * Constructor with repository root
-     * 
-     * @param repository
-     * @param factory
-     */
-    public ContributionRepositoryImpl(final String repository, XMLInputFactory factory, Monitor monitor) throws IOException {
-        this.monitor = monitor;
-    	String root = repository;
-        if (repository == null) {
-            root = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    // Default to <user.home>/.tuscany/domains/local/
-                    String userHome = System.getProperty("user.home");
-                    String slash = File.separator;
-                    return userHome + slash + ".tuscany" + slash + "domains" + slash + "local" + slash;
-                }
-            });
-        }
-
-        // Allow privileged access to File. Requires FilePermission in security policy file.
-        final String finalRoot = root;
-        this.rootFile = AccessController.doPrivileged(new PrivilegedAction<File>() {
-            public File run() {
-                return new File(finalRoot);
-            }
-        });           
-
-        // Allow privileged access to File. Requires FilePermission in security policy file.
-        this.domain = AccessController.doPrivileged(new PrivilegedAction<URI>() {
-            public URI run() {
-                return rootFile.toURI();
-            }
-        });           
-
-        // Allow privileged access to mkdir. Requires FilePermission in security policy file.
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws IOException {
-                    FileHelper.forceMkdir(rootFile);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-        	error("PrivilegedActionException", rootFile, (IOException)e.getException());
-            throw (IOException)e.getException();
-        }
-            
-        // Allow privileged access to test file. Requires FilePermissions in security policy file.
-        Boolean notDirectory = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-            public Boolean run() {
-                return (!rootFile.exists() || !rootFile.isDirectory() || !rootFile.canRead());
-            }
-        });           
-        if (notDirectory) {
-        	error("RootNotDirectory", rootFile, repository);
-            throw new IOException("The root is not a directory: " + repository);
-        }
-        this.factory = factory;
-    }
-
-    public URI getDomain() {
-        return domain;
-    }
-
-    /**
-     * Resolve contribution location in the repository -> root repository /
-     * contribution file -> contribution group id / artifact id / version
-     * 
-     * @param contribution
-     * @return
-     */
-    private File mapToFile(URL sourceURL) {
-        String fileName = FileHelper.toFile(sourceURL).getName();
-        return new File(rootFile, "contributions" + File.separator + fileName);
-    }
-
-    /**
-     * Write a specific source InputStream to a file on disk
-     * 
-     * @param source contents of the file to be written to disk
-     * @param target file to be written
-     * @throws IOException
-     */
-    public static void copy(InputStream source, File target) throws IOException {
-        BufferedOutputStream out = null;
-        BufferedInputStream in = null;
-
-        try {
-            out = new BufferedOutputStream(new FileOutputStream(target));
-            in = new BufferedInputStream(source);
-            IOHelper.copy(in, out);
-        } finally {
-            IOHelper.closeQuietly(out);
-            IOHelper.closeQuietly(in);
-        }
-    }
-
-    public URL store(final String contribution, URL sourceURL, InputStream contributionStream) throws IOException {
-        // where the file should be stored in the repository
-        final File location = mapToFile(sourceURL);
-        FileHelper.forceMkdir(location.getParentFile());
-
-        copy(contributionStream, location);
-
-        // add contribution to repositoryContent
-        // Allow ability to read user.dir property. Requires PropertyPermission in security policy.
-        URL contributionURL;
-        try {
-            contributionURL= AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {
-                public URL run() throws IOException {
-                    URL contributionURL = location.toURL();
-                    URI relative = rootFile.toURI().relativize(location.toURI());
-                    contributionLocations.put(contribution, relative.toString());
-                    return contributionURL;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-        	error("PrivilegedActionException", location, (IOException)e.getException());
-            throw (IOException)e.getException();
-        }
-        saveMap();
-
-        return contributionURL;
-    }
-
-    public URL store(String contribution, URL sourceURL) throws IOException {
-        // where the file should be stored in the repository
-        File location = mapToFile(sourceURL);
-        File source = FileHelper.toFile(sourceURL);
-        if (source == null || source.isFile()) {
-            URLConnection connection = sourceURL.openConnection();
-            connection.setUseCaches(false);
-            InputStream is = connection.getInputStream();
-            try {
-                return store(contribution, sourceURL, is);
-            } finally {
-                IOHelper.closeQuietly(is);
-            }
-        }
-
-        FileHelper.forceMkdir(location);
-        FileHelper.copyDirectory(source, location);
-
-        // add contribution to repositoryContent
-        URI relative = rootFile.toURI().relativize(location.toURI());
-        contributionLocations.put(contribution, relative.toString());
-        saveMap();
-
-        return location.toURL();
-    }
-
-    public URL find(String contribution) {
-        if (contribution == null) {
-            return null;
-        }
-        String location = contributionLocations.get(contribution);
-        if (location == null) {
-            return null;
-        }
-        try {
-            return new File(rootFile, location).toURL();
-        } catch (MalformedURLException e) {
-            // Should not happen
-        	error("MalformedURLException", location, new AssertionError(e));
-            throw new AssertionError(e);
-        }
-    }
-
-    public void remove(String contribution) {
-        URL contributionURL = this.find(contribution);
-        if (contributionURL != null) {
-            // remove
-            try {
-                FileHelper.forceDelete(FileHelper.toFile(contributionURL));
-                this.contributionLocations.remove(contribution);
-                saveMap();
-            } catch (IOException ioe) {
-                // handle file could not be removed
-            }
-        }
-    }
-
-    public List<String> list() {
-        return new ArrayList<String>(contributionLocations.keySet());
-    }
-
-    public void init() {
-        File domainFile = new File(rootFile, "sca-domain.xml");
-        if (!domainFile.isFile()) {
-            return;
-        }
-        FileInputStream is;
-        try {
-            is = new FileInputStream(domainFile);
-        } catch (FileNotFoundException e) {
-        	warning("DomainFileNotFound", domainFile, domainFile.getAbsolutePath());
-            return;
-        }
-        try {
-            XMLStreamReader reader = factory.createXMLStreamReader(new InputStreamReader(is, "UTF-8"));
-            while (reader.hasNext()) {
-                switch (reader.getEventType()) {
-                    case XMLStreamConstants.START_ELEMENT:
-                        String name = reader.getName().getLocalPart();
-                        if ("domain".equals(name)) {
-                            String uri = reader.getAttributeValue(null, "uri");
-                            if (uri != null) {
-                                domain = URI.create(uri);
-                            }
-                        }
-                        if ("contribution".equals(name)) {
-                            String uri = reader.getAttributeValue(null, "uri");
-                            String location = reader.getAttributeValue(null, "location");
-                            contributionLocations.put(uri, location);
-                        }
-                        break;
-                    default:
-                        break;
-                }
-                reader.next();
-            }
-        } catch (Exception e) {
-            // Ignore
-        } finally {
-            IOHelper.closeQuietly(is);
-        }
-    }
-
-    private void saveMap() {
-        File domainFile = new File(rootFile, DOMAIN_INDEX_FILENAME);
-        FileOutputStream os = null;
-        try {
-            os = new FileOutputStream(domainFile);
-            PrintWriter writer = new PrintWriter(new OutputStreamWriter(os, "UTF-8"));
-            writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            writer.println("<domain uri=\"" + getDomain() + "\" xmlns=\"" + NS + "\">");
-            for (Map.Entry<String, String> e : contributionLocations.entrySet()) {
-                writer.println("    <contribution uri=\"" + e.getKey() + "\" location=\"" + e.getValue() + "\"/>");
-            }
-            writer.println("</domain>");
-            writer.flush();
-        } catch (IOException e) {
-        	IllegalArgumentException ae = new IllegalArgumentException(e);
-        	error("IllegalArgumentException", os, ae);
-            throw ae;
-        } finally {
-            IOHelper.closeQuietly(os);
-        }
-    }
-
-    public void destroy() {
-    }
-    
-    public void addContribution(Contribution contribution) {
-        contributionMap.put(contribution.getURI(), contribution);
-        contributions.add(contribution);
-    }
-    
-    public void removeContribution(Contribution contribution) {
-        contributionMap.remove(contribution.getURI());
-        contributions.remove(contribution);
-    }
-    
-    public void updateContribution(Contribution contribution) {
-        Contribution oldContribution = contributionMap.remove(contribution.getURI());
-        contributions.remove(oldContribution);
-        contributionMap.put(contribution.getURI(), contribution);
-        contributions.add(contribution);
-    }
-    
-    public Contribution getContribution(String uri) {
-        return contributionMap.get(uri);
-    }
-    
-    public List<Contribution> getContributions() {
-        return Collections.unmodifiableList(contributions);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
deleted file mode 100644
index 0e39174497..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.service.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-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.ContributionException;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-import org.apache.tuscany.sca.contribution.xml.ContributionMetadataDocumentProcessor;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-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.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Service interface that manages artifacts contributed to a Tuscany runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionServiceImpl implements ContributionService {
-
-    /**
-     * Repository where contributions are stored. Usually set by injection.
-     */
-    private ContributionRepository contributionRepository;
-
-    /**
-     * Registry of available package processors.
-     */
-    private PackageProcessor packageProcessor;
-
-    /**
-     * Registry of available artifact processors
-     */
-
-    private URLArtifactProcessor artifactProcessor;
-
-    /**
-     * Registry of available StAX processors,
-     * used for loading contribution metadata in a extensible way
-     */
-    private StAXArtifactProcessor staxProcessor;
-
-    /**
-     * Event listener for contribution operations
-     */
-    private ExtensibleContributionListener contributionListener;
-
-    /**
-     * Registry of available model resolvers
-     */
-
-    private ModelResolverExtensionPoint modelResolvers;
-
-    /**
-     * Model factory extension point
-     */
-
-    private ModelFactoryExtensionPoint modelFactories;
-
-    /**
-     * XML factory used to create reader instance to load contribution metadata
-     */
-    private XMLInputFactory xmlFactory;
-
-    /**
-     * Assembly factory
-     */
-    private AssemblyFactory assemblyFactory;
-
-    /**
-     * Contribution model factory
-     */
-    private ContributionFactory contributionFactory;
-    
-    
-    private ModelResolver policyDefinitionsResolver;
-
-    private List policyDefinitions; 
-    
-    private Monitor monitor;
-    
-    private String COMPOSITE_FILE_EXTN = ".composite";    
-
-    public ContributionServiceImpl(ContributionRepository repository,
-                                   PackageProcessor packageProcessor,
-                                   URLArtifactProcessor documentProcessor,
-                                   StAXArtifactProcessor staxProcessor,
-                                   ExtensibleContributionListener contributionListener,
-                                   ModelResolver policyDefinitionsResolver,
-                                   ModelResolverExtensionPoint modelResolvers,
-                                   ModelFactoryExtensionPoint modelFactories,
-                                   AssemblyFactory assemblyFactory,
-                                   ContributionFactory contributionFactory,
-                                   XMLInputFactory xmlFactory,
-                                   List<SCADefinitions> policyDefinitions,
-                                   Monitor monitor) {
-        super();
-        this.contributionRepository = repository;
-        this.packageProcessor = packageProcessor;
-        this.artifactProcessor = documentProcessor;
-        this.staxProcessor = staxProcessor;
-        this.contributionListener = contributionListener;
-        this.modelResolvers = modelResolvers;
-        this.modelFactories = modelFactories;
-        this.xmlFactory = xmlFactory;
-        this.assemblyFactory = assemblyFactory;
-        this.contributionFactory = contributionFactory;
-        this.policyDefinitionsResolver = policyDefinitionsResolver;
-        this.policyDefinitions = policyDefinitions;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-impl-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    public Contribution contribute(String contributionURI, URL sourceURL, boolean storeInRepository)
-        throws ContributionException, IOException {
-        if (contributionURI == null) {
-        	error("ContributionURINull", contributionURI);
-            throw new IllegalArgumentException("URI for the contribution is null");
-        }
-        if (sourceURL == null) {
-        	error("SourceURLNull", sourceURL);
-            throw new IllegalArgumentException("Source URL for the contribution is null");
-        }
-        return addContribution(contributionURI, sourceURL, null, null, storeInRepository);
-    }
-
-    public Contribution contribute(String contributionURI,
-                                   URL sourceURL,
-                                   ModelResolver modelResolver,
-                                   boolean storeInRepository) throws ContributionException, IOException {
-        if (contributionURI == null) {
-        	error("ContributionURINull", contributionURI);
-            throw new IllegalArgumentException("URI for the contribution is null");
-        }
-        if (sourceURL == null) {
-        	error("SourceURLNull", sourceURL);
-            throw new IllegalArgumentException("Source URL for the contribution is null");
-        }
-
-        return addContribution(contributionURI, sourceURL, null, modelResolver, storeInRepository);
-    }
-
-    public Contribution contribute(String contributionURI, URL sourceURL, InputStream input)
-        throws ContributionException, IOException {
-
-        return addContribution(contributionURI, sourceURL, input, null, true);
-    }
-
-    public Contribution contribute(String contributionURI, URL sourceURL, InputStream input, ModelResolver modelResolver)
-        throws ContributionException, IOException {
-
-        return addContribution(contributionURI, sourceURL, input, modelResolver, true);
-    }
-
-    public Contribution getContribution(String uri) {
-        return this.contributionRepository.getContribution(uri);
-    }
-
-    /**
-     * Remove a contribution and notify listener that contribution was removed
-     */
-    public void remove(String uri) throws ContributionException {
-        Contribution contribution = contributionRepository.getContribution(uri);
-        this.contributionRepository.removeContribution(contribution);
-        this.contributionListener.contributionRemoved(this.contributionRepository, contribution);
-    }
-
-    /**
-     * Add a composite model to the contribution
-     */
-    public void addDeploymentComposite(Contribution contribution, Composite composite) throws ContributionException {
-        Artifact artifact = this.contributionFactory.createArtifact();
-        artifact.setURI(composite.getURI());
-        artifact.setModel(composite);
-
-        contribution.getArtifacts().add(artifact);
-
-        contribution.getDeployables().add(composite);
-    }
-
-    /**
-     * Utility/Helper methods for contribution service
-     */
-
-    /**
-     * Perform read of the contribution metadata loader (sca-contribution.xml and sca-contribution-generated.xml)
-     * When the two metadata files are available, the information provided are merged, and the sca-contribution has priorities
-     * 
-     * @param sourceURL
-     * @return Contribution
-     * @throws ContributionException
-     */
-    private Contribution readContributionMetadata(URL sourceURL) throws ContributionException {
-        Contribution contributionMetadata = contributionFactory.createContribution();
-
-        ContributionMetadataDocumentProcessor metadataDocumentProcessor =
-            new ContributionMetadataDocumentProcessor(modelFactories, staxProcessor, monitor);
-        
-        final URL[] urls = {sourceURL};
-        // Allow access to create classloader. Requires RuntimePermission in security policy.
-        URLClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
-            public URLClassLoader run() {
-                return new URLClassLoader(urls, null);
-            }
-        });           
-        for (String path: new String[]{
-                                       Contribution.SCA_CONTRIBUTION_GENERATED_META,
-                                       Contribution.SCA_CONTRIBUTION_META}) {
-            URL url = cl.getResource(path);
-            if (url != null) {
-                ContributionMetadata contribution = metadataDocumentProcessor.read(sourceURL, URI.create(path), url);
-                contributionMetadata.getImports().addAll(contribution.getImports());
-                contributionMetadata.getExports().addAll(contribution.getExports());
-                contributionMetadata.getDeployables().addAll(contribution.getDeployables());
-            }
-        }
-        
-        // For debugging purposes, write it back to XML
-        //        if (contributionMetadata != null) {
-        //            try {
-        //                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        //                XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        //                outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-        //                staxProcessor.write(contributionMetadata, outputFactory.createXMLStreamWriter(bos));
-        //                Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().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);
-        //            } catch (Exception e) {
-        //                e.printStackTrace();
-        //            }
-        //        }
-
-        return contributionMetadata;
-    }
-
-    /**
-     * Note:
-     * 
-     * @param contributionURI ContributionID
-     * @param sourceURL contribution location
-     * @param contributionStream contribution content
-     * @param storeInRepository flag if we store the contribution into the
-     *            repository or not
-     * @return the contribution model representing the contribution 
-     * @throws IOException
-     * @throws DeploymentException
-     */
-    private Contribution addContribution(String contributionURI,
-                                         URL sourceURL,
-                                         InputStream contributionStream,
-                                         ModelResolver modelResolver,
-                                         boolean storeInRepository) throws IOException, ContributionException {
-
-        if (contributionStream == null && sourceURL == null) {
-        	error("ContributionContentNull", contributionStream);
-            throw new IllegalArgumentException("The content of the contribution is null.");
-        }
-
-        // store the contribution in the contribution repository
-        URL locationURL = sourceURL;
-        if (contributionRepository != null && storeInRepository) {
-            if (contributionStream == null) {
-                locationURL = contributionRepository.store(contributionURI, sourceURL);
-            } else {
-                locationURL = contributionRepository.store(contributionURI, sourceURL, contributionStream);
-            }
-        }
-
-        //initialize contribution based on it's metadata if available
-        Contribution contribution = readContributionMetadata(locationURL);
-
-        // Create contribution model resolver
-        if (modelResolver == null) {
-            //FIXME Remove this domain resolver, visibility of policy declarations should be handled by
-            // the contribution import/export mechanism instead of this domainResolver hack.
-            modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories, policyDefinitionsResolver);
-        }
-
-        //set contribution initial information
-        contribution.setURI(contributionURI);
-        contribution.setLocation(locationURL.toString());
-        contribution.setModelResolver(modelResolver);
-        
-        List<URI> contributionArtifacts = null;
-
-        //NOTE: if a contribution is stored on the repository
-        //the stream would be consumed at this point
-        if (storeInRepository || contributionStream == null) {
-            URLConnection connection = sourceURL.openConnection();
-            connection.setUseCaches(false);
-            // Allow access to open URL stream. Add FilePermission to added to security policy file.
-            final URLConnection finalConnection = connection;
-            try {
-                contributionStream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-                    public InputStream run() throws IOException {
-                        return finalConnection.getInputStream();
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                throw (IOException)e.getException();
-            }
-            
-            try {
-                // process the contribution
-                contributionArtifacts = this.packageProcessor.getArtifacts(locationURL, contributionStream);
-            } finally {
-                IOHelper.closeQuietly(contributionStream);
-                contributionStream = null;
-            }
-        } else {
-            // process the contribution
-            contributionArtifacts = this.packageProcessor.getArtifacts(locationURL, contributionStream);
-        }
-        
-        // Read all artifacts in the contribution
-        try {
-        	// Allow access to read system properties. Requires PropertyPermission in security policy.
-        	// Any security exceptions are caught and wrapped as ContributionException.
-            processReadPhase(contribution, contributionArtifacts);
-        } catch ( Exception e ) {
-            throw new ContributionException(e);
-        }
-
-        //
-        this.contributionListener.contributionAdded(this.contributionRepository, contribution);
-
-        // Resolve them
-        processResolvePhase(contribution);
-
-        // Add all composites under META-INF/sca-deployables to the
-        // list of deployables
-        String prefix = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
-        for (Artifact artifact : contribution.getArtifacts()) {
-            if (artifact.getModel() instanceof Composite) {
-                if (artifact.getURI().startsWith(prefix)) {
-                    Composite composite = (Composite)artifact.getModel();
-                    if (!contribution.getDeployables().contains(composite)) {
-                        contribution.getDeployables().add(composite);
-                    }
-                }
-            }
-        }
-
-        // store the contribution on the registry
-        this.contributionRepository.addContribution(contribution);
-
-        return contribution;
-    }
-
-    /**
-     * This utility method process each artifact and delegates to proper 
-     * artifactProcessor to read the model and generate the in-memory representation
-     *  
-     * @param contribution
-     * @param artifacts
-     * @throws ContributionException
-     * @throws MalformedURLException
-     */
-    private void processReadPhase(Contribution contribution, List<URI> artifacts) throws ContributionException,
-        MalformedURLException, XMLStreamException {
-
-        ModelResolver modelResolver = contribution.getModelResolver();
-        URL contributionURL = new URL(contribution.getLocation());
-        
-        List<URI> compositeUris = new ArrayList<URI>();
-        
-        Object model = null;
-        for (URI anArtifactUri : artifacts) {
-            if ( anArtifactUri.toString().endsWith(COMPOSITE_FILE_EXTN)) {
-                compositeUris.add(anArtifactUri);
-            } else {
-                URL artifactURL = packageProcessor.getArtifactURL(new URL(contribution.getLocation()), anArtifactUri);
-
-                // Add the deployed artifact model to the resolver
-                Artifact artifact = this.contributionFactory.createArtifact();
-                artifact.setURI(anArtifactUri.toString());
-                artifact.setLocation(artifactURL.toString());
-                contribution.getArtifacts().add(artifact);
-                modelResolver.addModel(artifact);
-                
-                model = this.artifactProcessor.read(contributionURL, anArtifactUri, artifactURL);
-                
-                if (model != null) {
-                    artifact.setModel(model);
-
-                    // Add the loaded model to the model resolver
-                    modelResolver.addModel(model);
-                    
-                    // Add policy definitions to the list of policy definitions
-                    if (model instanceof SCADefinitions) { 
-                        policyDefinitions.add(model);
-                        
-                        SCADefinitions definitions = (SCADefinitions)model;
-                        for (Intent intent : definitions.getPolicyIntents() ) {
-                            policyDefinitionsResolver.addModel(intent);
-                        }
-                        
-                        for (PolicySet policySet : definitions.getPolicySets() ) {
-                            policyDefinitionsResolver.addModel(policySet);
-                        }
-                        
-                        for (IntentAttachPointType attachPointType : definitions.getBindingTypes() ) {
-                            policyDefinitionsResolver.addModel(attachPointType);
-                        }
-                        
-                        for (IntentAttachPointType attachPointType : definitions.getImplementationTypes() ) {
-                            policyDefinitionsResolver.addModel(attachPointType);
-                        }
-                    }
-                }
-            }
-        }
-        
-        for (URI anArtifactUri : compositeUris) {
-            URL artifactURL = packageProcessor.getArtifactURL(new URL(contribution.getLocation()), anArtifactUri);
-
-            // Add the deployed artifact model to the resolver
-            Artifact artifact = this.contributionFactory.createArtifact();
-            artifact.setURI(anArtifactUri.toString());
-            artifact.setLocation(artifactURL.toString());
-            contribution.getArtifacts().add(artifact);
-            modelResolver.addModel(artifact);
-            
-            model = this.artifactProcessor.read(contributionURL, anArtifactUri, artifactURL);
-            if (model != null) {
-                artifact.setModel(model);
-                // Add the loaded model to the model resolver
-                modelResolver.addModel(model);
-            }
-        }
-    }
-
-    /**
-     * This utility method process each artifact and delegates to proper 
-     * artifactProcessor to resolve the model references
-     * 
-     * @param contribution
-     * @throws ContributionException
-     */
-    @SuppressWarnings("unchecked")
-    private void processResolvePhase(Contribution contribution) throws ContributionException {
-        List<Artifact> composites = new ArrayList<Artifact>();
-
-        // for each artifact that was processed on the contribution
-        for (Artifact artifact : contribution.getArtifacts()) {
-            //leave the composites to be resolved at the end
-            if (artifact.getURI().endsWith(".composite")) {
-                composites.add(artifact);
-            } else {
-                // resolve the model object
-                if (artifact.getModel() != null) {
-                    // System.out.println("Processing Resolve Phase : " + artifact.getURI());
-                    this.artifactProcessor.resolve(artifact.getModel(), contribution.getModelResolver());
-                }
-            }
-        }
-
-        //process each composite file
-        for (Artifact artifact : composites) {
-            // resolve the model object
-            if (artifact.getModel() != null) {
-                this.artifactProcessor.resolve(artifact.getModel(), contribution.getModelResolver());
-            }
-        }
-
-        //resolve deployables from contribution metadata
-        List<Composite> resolvedDeployables = new ArrayList<Composite>();
-        for (Composite deployableComposite : contribution.getDeployables()) {
-            Composite resolvedDeployable =
-                contribution.getModelResolver().resolveModel(Composite.class, deployableComposite);
-
-            resolvedDeployables.add(resolvedDeployable);
-        }
-        contribution.getDeployables().clear();
-        contribution.getDeployables().addAll(resolvedDeployables);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
deleted file mode 100644
index 9f04c4af27..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.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.contribution.service.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.service.TypeDescriber;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-
-/**
- * Implementation of the content describer for contribution packages
- * 
- * @version $Rev$ $Date$
- */
-public class PackageTypeDescriberImpl implements TypeDescriber {
-    private final Map<String, String> contentTypeRegistry = new HashMap<String, String>();
-
-    public PackageTypeDescriberImpl() {
-        super();
-        init();
-    }
-
-    /**
-     * Initialize contentType registry with know types based on known file extensions
-     */
-    private void init() {
-        contentTypeRegistry.put("JAR", PackageType.JAR);
-        contentTypeRegistry.put("WAR", PackageType.JAR);
-    }
-
-    protected String resolveContentyTypeByExtension(URL resourceURL) {
-        String artifactExtension = FileHelper.getExtension(resourceURL.getPath());
-        if (artifactExtension == null) {
-            return null;
-        }
-        return contentTypeRegistry.get(artifactExtension.toUpperCase());
-    }
-
-    /**
-     * Build contentType for a specific resource. We first check if the file is a supported one
-     * (looking into our registry based on resource extension) If not found, we try to check file
-     * contentType Or we return defaultContentType provided
-     * 
-     * @param resourceURL The artifact URL
-     * @param defaultContentType The default content type if we can't find the correct one
-     * @return The content type
-     */
-    public String getType(URL resourceURL, String defaultContentType) {
-        URLConnection connection = null;
-        String contentType = defaultContentType;
-        final String urlProtocol = resourceURL.getProtocol();
-
-        if (urlProtocol.equals("file")) {
-            final File fileOrDir = FileHelper.toFile(resourceURL);
-            // Allow privileged access to test file. Requires FilePermissions in security policy.
-            Boolean isDirectory = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                public Boolean run() {
-                    return fileOrDir.isDirectory();
-                }
-            });
-            if (isDirectory) {
-                // Special case : contribution is a folder
-                contentType = PackageType.FOLDER;
-            }
-            
-            String type = resolveContentyTypeByExtension(resourceURL);
-            if (type != null) {
-                return type;
-            }
-        } else if (urlProtocol.equals("bundle") || urlProtocol.equals("bundleresource")) {
-            contentType = PackageType.BUNDLE;
-        } else {
-            contentType = resolveContentyTypeByExtension(resourceURL);
-            if (contentType == null) {
-                try {
-                    connection = resourceURL.openConnection();
-                    connection.setUseCaches(false);
-                    contentType = connection.getContentType();
-
-                    if (contentType == null || contentType.equals("content/unknown")) {
-                        // here we couldn't figure out from our registry or from URL and it's not a
-                        // special file
-                        // return defaultContentType if provided
-                        contentType = defaultContentType;
-                    }
-                } catch (IOException io) {
-                    // could not access artifact, just ignore and we will return
-                    // null contentType
-                }
-            }
-        }
-        return contentType == null ? defaultContentType : contentType;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
deleted file mode 100644
index cd5e87ca42..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ /dev/null
@@ -1,701 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.service.util;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.regex.Pattern;
-
-public class FileHelper {
-    /**
-     * The extension separator character.
-     */
-    private static final char EXTENSION_SEPARATOR = '.';
-
-    /**
-     * The Unix separator character.
-     */
-    private static final char UNIX_SEPARATOR = '/';
-
-    /**
-     * The Windows separator character.
-     */
-    private static final char WINDOWS_SEPARATOR = '\\';
-
-    /**
-     * Returns the index of the last directory separator character.
-     * <p>
-     * This method will handle a file in either Unix or Windows format. The
-     * position of the last forward or backslash is returned.
-     * <p>
-     * The output will be the same irrespective of the machine that the code is
-     * running on.
-     * 
-     * @param filename the filename to find the last path separator in, null
-     *            returns -1
-     * @return the index of the last separator character, or -1 if there is no
-     *         such character
-     */
-    public static int indexOfLastSeparator(String filename) {
-        if (filename == null) {
-            return -1;
-        }
-        int lastUnixPos = filename.lastIndexOf(UNIX_SEPARATOR);
-        int lastWindowsPos = filename.lastIndexOf(WINDOWS_SEPARATOR);
-        return Math.max(lastUnixPos, lastWindowsPos);
-    }
-
-    /**
-     * Returns the index of the last extension separator character, which is a
-     * dot.
-     * <p>
-     * This method also checks that there is no directory separator after the
-     * last dot. To do this it uses {@link #indexOfLastSeparator(String)} which
-     * will handle a file in either Unix or Windows format.
-     * <p>
-     * The output will be the same irrespective of the machine that the code is
-     * running on.
-     * 
-     * @param filename the filename to find the last path separator in, null
-     *            returns -1
-     * @return the index of the last separator character, or -1 if there is no
-     *         such character
-     */
-    public static int indexOfExtension(String filename) {
-        if (filename == null) {
-            return -1;
-        }
-        int extensionPos = filename.lastIndexOf(EXTENSION_SEPARATOR);
-        int lastSeparator = indexOfLastSeparator(filename);
-        return lastSeparator > extensionPos ? -1 : extensionPos;
-    }
-
-    /**
-     * Gets the name minus the path from a full filename.
-     * <p>
-     * This method will handle a file in either Unix or Windows format. The text
-     * after the last forward or backslash is returned.
-     * 
-     * <pre>
-     * a/b/c.txt --&gt; c.txt
-     * a.txt     --&gt; a.txt
-     * a/b/c     --&gt; c
-     * a/b/c/    --&gt; &quot;&quot;
-     * </pre>
-     * 
-     * <p>
-     * The output will be the same irrespective of the machine that the code is
-     * running on.
-     * 
-     * @param fileName the filename to query, null returns null
-     * @return the name of the file without the path, or an empty string if none
-     *         exists
-     */
-    public static String getName(String fileName) {
-        if (fileName == null) {
-            return null;
-        }
-        int index = indexOfLastSeparator(fileName);
-        return fileName.substring(index + 1);
-    }
-
-    /**
-     * Gets the extension of a filename.
-     * <p>
-     * This method returns the textual part of the filename after the last dot.
-     * There must be no directory separator after the dot.
-     * 
-     * <pre>
-     * foo.txt      --&gt; &quot;txt&quot;
-     * a/b/c.jpg    --&gt; &quot;jpg&quot;
-     * a/b.txt/c    --&gt; &quot;&quot;
-     * a/b/c        --&gt; &quot;&quot;
-     * </pre>
-     * 
-     * <p>
-     * The output will be the same irrespective of the machine that the code is
-     * running on.
-     * 
-     * @param filename the filename to retrieve the extension of.
-     * @return the extension of the file or an empty string if none exists.
-     */
-    public static String getExtension(String filename) {
-        if (filename == null) {
-            return null;
-        }
-        int index = indexOfExtension(filename);
-        if (index == -1) {
-            return "";
-        } else {
-            return filename.substring(index + 1);
-        }
-    }
-
-    /**
-     * Make a directory, including any necessary but nonexistent parent
-     * directories. If there already exists a file with specified name or the
-     * directory cannot be created then an exception is thrown.
-     * 
-     * @param directory directory to create, not null
-     * @throws NullPointerException if the directory is null
-     * @throws IOException if the directory cannot be created
-     */
-    public static void forceMkdir(File directory) throws IOException {
-        if (directory.exists()) {
-            if (directory.isFile()) {
-                String message =
-                    "File " + directory + " exists and is " + "not a directory. Unable to create directory.";
-                throw new IOException(message);
-            }
-        } else {
-            if (!directory.mkdirs()) {
-                String message = "Unable to create directory " + directory;
-                throw new IOException(message);
-            }
-        }
-    }
-
-    /**
-     * Delete a file. If file is a directory, delete it and all sub-directories.
-     * <p>
-     * The difference between File.delete() and this method are:
-     * <ul>
-     * <li>A directory to be deleted does not have to be empty.</li>
-     * <li>You get exceptions when a file or directory cannot be deleted.
-     * (java.io.File methods returns a boolean)</li>
-     * </ul>
-     * 
-     * @param file file or directory to delete, not null
-     * @throws NullPointerException if the directory is null
-     * @throws IOException in case deletion is unsuccessful
-     */
-    public static void forceDelete(File file) throws IOException {
-        if (file.isDirectory()) {
-            deleteDirectory(file);
-        } else {
-            if (!file.exists()) {
-                throw new FileNotFoundException("File does not exist: " + file);
-            }
-            if (!file.delete()) {
-                String message = "Unable to delete file: " + file;
-                throw new IOException(message);
-            }
-        }
-    }
-
-    /**
-     * Convert from a <code>URL</code> to a <code>File</code>.
-     * <p>
-     * From version 1.1 this method will decode the URL. Syntax such as
-     * <code>file:///my%20docs/file.txt</code> will be correctly decoded to
-     * <code>/my docs/file.txt</code>.
-     * 
-     * @param url the file URL to convert, null returns null
-     * @return the equivalent <code>File</code> object, or <code>null</code>
-     *         if the URL's protocol is not <code>file</code>
-     * @throws IllegalArgumentException if the file is incorrectly encoded
-     */
-    public static File toFile(URL url) {
-        if (url == null || !url.getProtocol().equals("file")) {
-            return null;
-        } else {
-            String filename = url.getFile().replace('/', File.separatorChar);
-            int pos = 0;
-            while ((pos = filename.indexOf('%', pos)) >= 0) { // NOPMD
-                if (pos + 2 < filename.length()) {
-                    String hexStr = filename.substring(pos + 1, pos + 3);
-                    char ch = (char)Integer.parseInt(hexStr, 16);
-                    filename = filename.substring(0, pos) + ch + filename.substring(pos + 3);
-                }
-            }
-            return new File(filename);
-        }
-    }
-
-    public static FileFilter getFileFilter(String regExp, boolean ignoreCase) {
-        return new RegExpFilter(regExp, ignoreCase);
-    }
-
-    /**
-     * A regular-expression based resource filter
-     */
-    public static class RegExpFilter implements FileFilter {
-        private Pattern pattern;
-
-        public RegExpFilter(Pattern pattern) {
-            this.pattern = pattern;
-        }
-
-        public RegExpFilter(String patternStr, boolean ignoreCase) {
-            this.pattern = Pattern.compile(patternStr, ignoreCase ? Pattern.CASE_INSENSITIVE : 0);
-        }
-
-        public boolean accept(File file) {
-            return pattern.matcher(file.getName()).matches();
-        }
-
-        /**
-         * Convert wildcard into a regex pattern
-         * 
-         * @param str
-         * @return
-         */
-        public static RegExpFilter getWildcardFilter(String str, boolean ignoreCase) {
-            StringBuffer buffer = new StringBuffer();
-            for (int i = 0; i < str.length(); i++) {
-                char ch = str.charAt(i);
-                if (ch == '?') {
-                    buffer.append('.');
-                } else if (ch == '*') {
-                    buffer.append(".*");
-                } else {
-                    buffer.append(ch);
-                }
-            }
-            return new RegExpFilter(buffer.toString(), ignoreCase);
-        }
-
-    }
-
-    /**
-     * Clean a directory without deleting it.
-     * 
-     * @param directory directory to clean
-     * @throws IOException in case cleaning is unsuccessful
-     */
-    public static void cleanDirectory(File directory) throws IOException {
-        if (!directory.exists()) {
-            String message = directory + " does not exist";
-            throw new IllegalArgumentException(message);
-        }
-
-        if (!directory.isDirectory()) {
-            String message = directory + " is not a directory";
-            throw new IllegalArgumentException(message);
-        }
-
-        File[] files = directory.listFiles();
-        if (files == null) { // null if security restricted
-            throw new IOException("Failed to list contents of " + directory);
-        }
-
-        IOException exception = null;
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
-            try {
-                forceDelete(file);
-            } catch (IOException ioe) {
-                exception = ioe;
-            }
-        }
-
-        if (null != exception) {
-            throw exception;
-        }
-    }
-
-    /**
-     * Clean a directory without deleting it.
-     * 
-     * @param directory directory to clean, must not be <code>null</code>
-     * @throws NullPointerException if the directory is <code>null</code>
-     * @throws IOException in case cleaning is unsuccessful
-     */
-    private static void cleanDirectoryOnExit(File directory) throws IOException {
-        if (!directory.exists()) {
-            String message = directory + " does not exist";
-            throw new IllegalArgumentException(message);
-        }
-
-        if (!directory.isDirectory()) {
-            String message = directory + " is not a directory";
-            throw new IllegalArgumentException(message);
-        }
-
-        File[] files = directory.listFiles();
-        if (files == null) { // null if security restricted
-            throw new IOException("Failed to list contents of " + directory);
-        }
-
-        IOException exception = null;
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
-            try {
-                forceDeleteOnExit(file);
-            } catch (IOException ioe) {
-                exception = ioe;
-            }
-        }
-
-        if (null != exception) {
-            throw exception;
-        }
-    }
-
-    /**
-     * Copies a whole directory to a new location preserving the file dates.
-     * <p>
-     * This method copies the specified directory and all its child directories
-     * and files to the specified destination. The destination is the new
-     * location and name of the directory.
-     * <p>
-     * The destination directory is created if it does not exist. If the
-     * destination directory did exist, then this method merges the source with
-     * the destination, with the source taking precedence.
-     * 
-     * @param srcDir an existing directory to copy, must not be
-     *            <code>null</code>
-     * @param destDir the new directory, must not be <code>null</code>
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @since Commons IO 1.1
-     */
-    public static void copyDirectory(File srcDir, File destDir) throws IOException {
-        copyDirectory(srcDir, destDir, true);
-    }
-
-    /**
-     * Copies a whole directory to a new location.
-     * <p>
-     * This method copies the contents of the specified source directory to
-     * within the specified destination directory.
-     * <p>
-     * The destination directory is created if it does not exist. If the
-     * destination directory did exist, then this method merges the source with
-     * the destination, with the source taking precedence.
-     * 
-     * @param srcDir an existing directory to copy, must not be
-     *            <code>null</code>
-     * @param destDir the new directory, must not be <code>null</code>
-     * @param preserveFileDate true if the file date of the copy should be the
-     *            same as the original
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @since Commons IO 1.1
-     */
-    public static void copyDirectory(File srcDir, File destDir, boolean preserveFileDate) throws IOException {
-        if (srcDir == null) {
-            throw new NullPointerException("Source must not be null");
-        }
-        if (destDir == null) {
-            throw new NullPointerException("Destination must not be null");
-        }
-        if (!srcDir.exists()) {
-            throw new FileNotFoundException("Source '" + srcDir + "' does not exist");
-        }
-        if (!srcDir.isDirectory()) {
-            throw new IOException("Source '" + srcDir + "' exists but is not a directory");
-        }
-        if (srcDir.getCanonicalPath().equals(destDir.getCanonicalPath())) {
-            throw new IOException("Source '" + srcDir + "' and destination '" + destDir + "' are the same");
-        }
-        doCopyDirectory(srcDir, destDir, preserveFileDate);
-    }
-
-    // -----------------------------------------------------------------------
-    /**
-     * Copies a directory to within another directory preserving the file dates.
-     * <p>
-     * This method copies the source directory and all its contents to a
-     * directory of the same name in the specified destination directory.
-     * <p>
-     * The destination directory is created if it does not exist. If the
-     * destination directory did exist, then this method merges the source with
-     * the destination, with the source taking precedence.
-     * 
-     * @param srcDir an existing directory to copy, must not be
-     *            <code>null</code>
-     * @param destDir the directory to place the copy in, must not be
-     *            <code>null</code>
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @since Commons IO 1.2
-     */
-    public static void copyDirectoryToDirectory(File srcDir, File destDir) throws IOException {
-        if (srcDir == null) {
-            throw new NullPointerException("Source must not be null");
-        }
-        if (!(srcDir.exists() && srcDir.isDirectory())) {
-            throw new IllegalArgumentException("Source '" + destDir + "' is not a directory");
-        }
-        if (destDir == null) {
-            throw new NullPointerException("Destination must not be null");
-        }
-        if (!(destDir.exists() && destDir.isDirectory())) {
-            throw new IllegalArgumentException("Destination '" + destDir + "' is not a directory");
-        }
-        copyDirectory(srcDir, new File(destDir, srcDir.getName()), true);
-    }
-
-    /**
-     * Copies a file to a new location preserving the file date.
-     * <p>
-     * This method copies the contents of the specified source file to the
-     * specified destination file. The directory holding the destination file is
-     * created if it does not exist. If the destination file exists, then this
-     * method will overwrite it.
-     * 
-     * @param srcFile an existing file to copy, must not be <code>null</code>
-     * @param destFile the new file, must not be <code>null</code>
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @see #copyFileToDirectory(File, File)
-     */
-    public static void copyFile(File srcFile, File destFile) throws IOException {
-        copyFile(srcFile, destFile, true);
-    }
-
-    /**
-     * Copies a file to a new location.
-     * <p>
-     * This method copies the contents of the specified source file to the
-     * specified destination file. The directory holding the destination file is
-     * created if it does not exist. If the destination file exists, then this
-     * method will overwrite it.
-     * 
-     * @param srcFile an existing file to copy, must not be <code>null</code>
-     * @param destFile the new file, must not be <code>null</code>
-     * @param preserveFileDate true if the file date of the copy should be the
-     *            same as the original
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @see #copyFileToDirectory(File, File, boolean)
-     */
-    public static void copyFile(File srcFile, File destFile, boolean preserveFileDate) throws IOException {
-        if (srcFile == null) {
-            throw new NullPointerException("Source must not be null");
-        }
-        if (destFile == null) {
-            throw new NullPointerException("Destination must not be null");
-        }
-        if (!srcFile.exists()) {
-            throw new FileNotFoundException("Source '" + srcFile + "' does not exist");
-        }
-        if (srcFile.isDirectory()) {
-            throw new IOException("Source '" + srcFile + "' exists but is a directory");
-        }
-        if (srcFile.getCanonicalPath().equals(destFile.getCanonicalPath())) {
-            throw new IOException("Source '" + srcFile + "' and destination '" + destFile + "' are the same");
-        }
-        if (!(destFile.getParentFile() != null && destFile.getParentFile().exists())) {
-            if (!destFile.getParentFile().mkdirs()) { //NOPMD
-                throw new IOException("Destination '" + destFile + "' directory cannot be created");
-            }
-        }
-        if (!(destFile.exists() && destFile.canWrite())) {
-            throw new IOException("Destination '" + destFile + "' exists but is read-only");
-        }
-        doCopyFile(srcFile, destFile, preserveFileDate);
-    }
-
-    // -----------------------------------------------------------------------
-    /**
-     * Copies a file to a directory preserving the file date.
-     * <p>
-     * This method copies the contents of the specified source file to a file of
-     * the same name in the specified destination directory. The destination
-     * directory is created if it does not exist. If the destination file
-     * exists, then this method will overwrite it.
-     * 
-     * @param srcFile an existing file to copy, must not be <code>null</code>
-     * @param destDir the directory to place the copy in, must not be
-     *            <code>null</code>
-     * @throws NullPointerException if source or destination is null
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @see #copyFile(File, File, boolean)
-     */
-    public static void copyFileToDirectory(File srcFile, File destDir) throws IOException {
-        copyFileToDirectory(srcFile, destDir, true);
-    }
-
-    /**
-     * Copies a file to a directory optionally preserving the file date.
-     * <p>
-     * This method copies the contents of the specified source file to a file of
-     * the same name in the specified destination directory. The destination
-     * directory is created if it does not exist. If the destination file
-     * exists, then this method will overwrite it.
-     * 
-     * @param srcFile an existing file to copy, must not be <code>null</code>
-     * @param destDir the directory to place the copy in, must not be
-     *            <code>null</code>
-     * @param preserveFileDate true if the file date of the copy should be the
-     *            same as the original
-     * @throws NullPointerException if source or destination is
-     *             <code>null</code>
-     * @throws IOException if source or destination is invalid
-     * @throws IOException if an IO error occurs during copying
-     * @see #copyFile(File, File, boolean)
-     * @since Commons IO 1.3
-     */
-    public static void copyFileToDirectory(File srcFile, File destDir, boolean preserveFileDate) throws IOException {
-        if (destDir == null) {
-            throw new NullPointerException("Destination must not be null");
-        }
-        if (!(destDir.exists() && destDir.isDirectory())) {
-            throw new IllegalArgumentException("Destination '" + destDir + "' is not a directory");
-        }
-        copyFile(srcFile, new File(destDir, srcFile.getName()), preserveFileDate);
-    }
-
-    // -----------------------------------------------------------------------
-    /**
-     * Recursively delete a directory.
-     * 
-     * @param directory directory to delete
-     * @throws IOException in case deletion is unsuccessful
-     */
-    public static void deleteDirectory(File directory) throws IOException {
-        if (!directory.exists()) {
-            return;
-        }
-
-        cleanDirectory(directory);
-        if (!directory.delete()) {
-            String message = "Unable to delete directory " + directory + ".";
-            throw new IOException(message);
-        }
-    }
-
-    /**
-     * Recursively schedule directory for deletion on JVM exit.
-     * 
-     * @param directory directory to delete, must not be <code>null</code>
-     * @throws NullPointerException if the directory is <code>null</code>
-     * @throws IOException in case deletion is unsuccessful
-     */
-    private static void deleteDirectoryOnExit(File directory) throws IOException {
-        if (!directory.exists()) {
-            return;
-        }
-
-        cleanDirectoryOnExit(directory);
-        directory.deleteOnExit();
-    }
-
-    /**
-     * Internal copy directory method.
-     * 
-     * @param srcDir the validated source directory, must not be
-     *            <code>null</code>
-     * @param destDir the validated destination directory, must not be
-     *            <code>null</code>
-     * @param preserveFileDate whether to preserve the file date
-     * @throws IOException if an error occurs
-     * @since Commons IO 1.1
-     */
-    private static void doCopyDirectory(File srcDir, File destDir, boolean preserveFileDate) throws IOException {
-        if (destDir.exists()) {
-            if (!destDir.isDirectory()) {
-                throw new IOException("Destination '" + destDir + "' exists but is not a directory");
-            }
-        } else {
-            if (!destDir.mkdirs()) {
-                throw new IOException("Destination '" + destDir + "' directory cannot be created");
-            }
-            if (preserveFileDate) {
-                destDir.setLastModified(srcDir.lastModified());
-            }
-        }
-        if (!destDir.canWrite()) {
-            throw new IOException("Destination '" + destDir + "' cannot be written to");
-        }
-        // recurse
-        File[] files = srcDir.listFiles();
-        if (files == null) { // null if security restricted
-            throw new IOException("Failed to list contents of " + srcDir);
-        }
-        for (int i = 0; i < files.length; i++) {
-            File copiedFile = new File(destDir, files[i].getName());
-            if (files[i].isDirectory()) {
-                doCopyDirectory(files[i], copiedFile, preserveFileDate);
-            } else {
-                doCopyFile(files[i], copiedFile, preserveFileDate);
-            }
-        }
-    }
-
-    /**
-     * Internal copy file method.
-     * 
-     * @param srcFile the validated source file, must not be <code>null</code>
-     * @param destFile the validated destination file, must not be
-     *            <code>null</code>
-     * @param preserveFileDate whether to preserve the file date
-     * @throws IOException if an error occurs
-     */
-    private static void doCopyFile(File srcFile, File destFile, boolean preserveFileDate) throws IOException {
-        if (destFile.exists() && destFile.isDirectory()) {
-            throw new IOException("Destination '" + destFile + "' exists but is a directory");
-        }
-
-        FileInputStream input = new FileInputStream(srcFile);
-        try {
-            FileOutputStream output = new FileOutputStream(destFile);
-            try {
-                IOHelper.copy(input, output);
-            } finally {
-                IOHelper.closeQuietly(output);
-            }
-        } finally {
-            IOHelper.closeQuietly(input);
-        }
-
-        if (srcFile.length() != destFile.length()) {
-            throw new IOException("Failed to copy full contents from '" + srcFile + "' to '" + destFile + "'");
-        }
-        if (preserveFileDate) {
-            destFile.setLastModified(srcFile.lastModified());
-        }
-    }
-
-    /**
-     * Schedule a file to be deleted when JVM exits. If file is directory delete
-     * it and all sub-directories.
-     * 
-     * @param file file or directory to delete, must not be <code>null</code>
-     * @throws NullPointerException if the file is <code>null</code>
-     * @throws IOException in case deletion is unsuccessful
-     */
-    public static void forceDeleteOnExit(File file) throws IOException {
-        if (file.isDirectory()) {
-            deleteDirectoryOnExit(file);
-        } else {
-            file.deleteOnExit();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
deleted file mode 100644
index 630d1f6bf4..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.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.contribution.service.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.jar.JarFile;
-
-public class IOHelper {
-    /**
-     * The default buffer size to use.
-     */
-    private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
-    
-    /**
-     * Unconditionally close an <code>InputStream</code>.
-     * <p>
-     * Equivalent to {@link InputStream#close()}, except any exceptions will be ignored.
-     * This is typically used in finally blocks.
-     *
-     * @param input  the InputStream to close, may be null or already closed
-     */
-    public static void closeQuietly(InputStream input) {
-        try {
-            if (input != null) {
-                input.close();
-            }
-        } catch (IOException ioe) {
-            // ignore
-        }
-    }
-    
-    /**
-     * Unconditionally close an <code>OutputStream</code>.
-     * <p>
-     * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored.
-     * This is typically used in finally blocks.
-     *
-     * @param output  the OutputStream to close, may be null or already closed
-     */
-    public static void closeQuietly(OutputStream output) {
-        try {
-            if (output != null) {
-                output.close();
-            }
-        } catch (IOException ioe) {
-            // ignore
-        }
-    }
-    
-    /**
-     * Copy bytes from an <code>InputStream</code> to an
-     * <code>OutputStream</code>.
-     * <p>
-     * This method buffers the input internally, so there is no need to use a
-     * <code>BufferedInputStream</code>.
-     *
-     * @param input  the <code>InputStream</code> to read from
-     * @param output  the <code>OutputStream</code> to write to
-     * @return the number of bytes copied
-     * @throws NullPointerException if the input or output is null
-     * @throws IOException if an I/O error occurs
-     * @since Commons IO 1.1
-     */
-    public static int copy(InputStream input, OutputStream output) throws IOException {
-        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-        int count = 0;
-        int n = 0;
-        while (-1 != (n = input.read(buffer))) { // NOPMD
-            output.write(buffer, 0, n);
-            count += n;
-        }
-        return count;
-    }
-    
-    public static InputStream getInputStream(URL url) throws IOException {
-        return new SafeURLInputStream(url);
-    }
-    
-    /**
-     * This class is a workaround for URL stream issue as illustrated below.
-     * InputStream is=url.getInputStream(); is.close(); // This line doesn't close
-     * the JAR file if the URL is a jar entry like "jar:file:/a.jar!/my.composite" We
-     * also need to turn off the JarFile cache.
-     * 
-     * @see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4950148
-     * 
-     * @version $Rev$ $Date$
-     */
-    public static class SafeURLInputStream extends InputStream {
-        private JarFile jarFile;
-        private InputStream is;
-
-        public SafeURLInputStream(URL url) throws IOException {
-            String protocol = url.getProtocol();
-            if (protocol != null && (protocol.equals("jar"))) {
-                JarURLConnection connection = (JarURLConnection)url.openConnection();
-                // We cannot use cache
-                connection.setUseCaches(false);
-                try {
-                    is = connection.getInputStream();
-                } catch (IOException e) {
-                    throw e;
-                }
-                jarFile = connection.getJarFile();
-            } else {
-                URLConnection connection = url.openConnection();
-                connection.setUseCaches(false);
-                is = connection.getInputStream();
-            }
-        }
-
-        public SafeURLInputStream(JarURLConnection connection) throws IOException {
-            // We cannot use cache
-            connection.setUseCaches(false);
-            is = connection.getInputStream();
-            jarFile = connection.getJarFile();
-        }
-
-        @Override
-        public int available() throws IOException {
-            return is.available();
-        }
-
-        @Override
-        public void close() throws IOException {
-            is.close();
-            // We need to close the JAR file
-            if (jarFile != null) {
-                jarFile.close();
-            }
-        }
-
-        @Override
-        public synchronized void mark(int readlimit) {
-            is.mark(readlimit);
-        }
-
-        @Override
-        public boolean markSupported() {
-            return is.markSupported();
-        }
-
-        @Override
-        public int read() throws IOException {
-            return is.read();
-        }
-
-        @Override
-        public int read(byte[] b, int off, int len) throws IOException {
-            return is.read(b, off, len);
-        }
-
-        @Override
-        public int read(byte[] b) throws IOException {
-            return is.read(b);
-        }
-
-        @Override
-        public synchronized void reset() throws IOException {
-            is.reset();
-        }
-
-        @Override
-        public long skip(long n) throws IOException {
-            return is.skip(n);
-        }
-    }   
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
deleted file mode 100644
index b644709266..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ /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.processor.impl.FolderContributionProcessor;type=application/vnd.tuscany.folder

-org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;type=application/x-compressed

diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties b/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
deleted file mode 100644
index 158ee2102d..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
+++ /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.
-#
-#
-ContributionURINull =URI for the contribution is null
-SourceURLNull = Source URL for the contribution is null
-ContributionContentNull = The content of the contribution is null
-PrivilegedActionException = Exception occured due to FilePermissions in security policy file
-RootNotDirectory = The root is not a directory {0}
-IllegalArgumentException = IllegalArgumentException occured due to :
-DomainFileNotFound = Domain file "sca-domain.xml" not found ({0})
-MalformedURLException = MalformedURLException occured due to : 
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
deleted file mode 100644
index c33b31b550..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.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.processor;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
-
-/**
- * Folder Package Processor test case
- * Verifies proper handle of File System structured contributions
- * 
- * @version $Rev$ $Date$
- */
-public class FolderContributionPackageProcessorTestCase extends TestCase {
-    private static final String FOLDER_CONTRIBUTION = ".";
-    
-    public final void testProcessPackageArtifacts() throws Exception {
-        FolderContributionProcessor folderProcessor = new FolderContributionProcessor();
-        URL contributionURL = new File(FOLDER_CONTRIBUTION).toURL().toURI().toURL();
-
-        List<URI> artifacts = folderProcessor.getArtifacts(contributionURL, null);
-        assertNotNull(artifacts);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
deleted file mode 100644
index 9b3dce7029..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.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.contribution.processor;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-
-/**
- * JAR Package Processor test case
- * Verifies proper handle of JAR Archives contributions
- * 
- * @version $Rev$ $Date$
- */
-
-public class JarContributionPackageProcessorTestCase extends TestCase {
-    private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
-    
-    public final void testProcessPackageArtifacts() throws Exception {
-        JarContributionProcessor jarProcessor = new JarContributionProcessor();
-
-        URL jarURL = getClass().getResource(JAR_CONTRIBUTION);
-        InputStream jarStream = jarURL.openStream();
-        List<URI> artifacts = null;
-        try {
-            artifacts = jarProcessor.getArtifacts(jarURL, jarStream);
-        } finally {
-            IOHelper.closeQuietly(jarStream);
-        }
-        
-        assertNotNull(artifacts);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
deleted file mode 100644
index 46b4183380..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.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.contribution.processor;
-
-import java.net.URI;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-
-/**
- * URL Artifact Processor Extension Point test case
- * Verifies the right registration and lookup for processors that handle filename and file types
- * 
- * @version $Rev$ $Date$
- */
-public class URLartifactProcessorExtensionPointTestCase extends TestCase {
-    
-    private URLArtifactProcessorExtensionPoint artifactProcessors;
-    
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        artifactProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
-        artifactProcessors.addArtifactProcessor(new FileTypeArtifactProcessor());
-        artifactProcessors.addArtifactProcessor(new FileNameArtifactProcessor());
-    }
-    
-    
-    public final void testFileTypeProcessor() {
-        assertNotNull(artifactProcessors.getProcessor(".m1"));
-    }
-    
-    
-    public final void testFileNameProcessor() {
-        assertNotNull(artifactProcessors.getProcessor("file.m2"));
-        
-    }
-    
-    /**
-     * Internal mock classes
-     *
-     */
-    
-    private class M1 {
-    }
-    
-    private class M2 {
-    }
-    
-    private class FileTypeArtifactProcessor implements URLArtifactProcessor<M1> {
-        public FileTypeArtifactProcessor() {
-        }
-
-        public M1 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
-            return null;
-        }
-        
-        public void resolve(M1 m1, ModelResolver resolver) throws ContributionResolveException {
-        }
-
-        public String getArtifactType() {
-            return ".m1";
-        }
-        
-        public Class<M1> getModelType() {
-            return M1.class;
-        }        
-    }
-    
-    private class FileNameArtifactProcessor implements URLArtifactProcessor<M2> {
-        public FileNameArtifactProcessor() {
-        }
-
-        public M2 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
-            return null;
-        }
-        
-        public void resolve(M2 m2, ModelResolver resolver) throws ContributionResolveException {
-        }
-
-        public String getArtifactType() {
-            return "file.m2";
-        }
-        
-        public Class<M2> getModelType() {
-            return M2.class;
-        }        
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
deleted file mode 100644
index 98852e951c..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.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.resolver;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
-
-/**
- * Test the default model resolver implementation.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultModelResolverTestCase extends TestCase {
-    
-    private ModelResolver resolver;
-    private ContributionFactory factory;
-    
-    @Override
-    protected void setUp() throws Exception {
-        resolver = new DefaultModelResolver();
-        factory = new DefaultContributionFactory();
-    }
-    
-    public void testResolved() {
-        Model a = new Model("a");
-        resolver.addModel(a);
-        Model x = new Model("a");
-        x = resolver.resolveModel(Model.class, x);
-        assertTrue(x == a);
-    }
-    
-    public void testUnresolved() {
-        Model x = new Model("a");
-        Model y = resolver.resolveModel(Model.class, x);
-        assertTrue(x == y);
-    }
-        
-    public void testResolvedArtifact() {
-        Artifact artifact = factory.createArtifact();
-        artifact.setURI("foo/bar");
-        resolver.addModel(artifact);
-        Artifact x = factory.createArtifact();
-        x.setURI("foo/bar");
-        x = resolver.resolveModel(Artifact.class, x);
-        assertTrue(x == artifact);
-    }
-    
-    class Model {
-        private String name;
-        
-        Model(String name) {
-            this.name = name;
-        }
-        
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-        
-        @Override
-        public boolean equals(Object obj) {
-            return name.equals(((Model)obj).name);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
deleted file mode 100644
index 01083cc6a6..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.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.contribution.resolver;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-
-/**
- * Test DefaultArtifactResolver.
- *
- * @version $Rev$ $Date$
- */
-public class ExtensibleModelResolverTestCase extends TestCase {
-    private ExtensibleModelResolver resolver;
-    
-    private ContributionFactory factory;
-    
-    @Override
-    protected void setUp() throws Exception {
-        
-        ModelResolverExtensionPoint resolvers = new DefaultModelResolverExtensionPoint();
-        resolvers.addResolver(Model.class, TestModelResolver.class);
-        
-        ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
-        
-        resolver = new ExtensibleModelResolver(null, resolvers, factories, null);
-
-        factory = new DefaultContributionFactory();
-    }
-    
-    public void testResolvedDefault() {
-        OtherModel a = new OtherModel("a");
-        resolver.addModel(a);
-        OtherModel x = new OtherModel("a");
-        x = resolver.resolveModel(OtherModel.class, x);
-        assertTrue(x == a);
-    }
-
-    public void testResolvedRegisteredClass() {
-        Model a = new Model("a");
-        resolver.addModel(a);
-        Model x = new Model("a");
-        x = resolver.resolveModel(Model.class, x);
-        assertTrue(x == a);
-    }
-
-    public void testUnresolvedDefault() {
-        OtherModel x = new OtherModel("a");
-        OtherModel y = resolver.resolveModel(OtherModel.class, x);
-        assertTrue(x == y);
-    }
-    
-    public void testUnresolved() {
-        Model x = new Model("a");
-        Model y = resolver.resolveModel(Model.class, x);
-        assertTrue(x == y);
-    }
-    
-    public void testResolvedArtifact() {
-        Artifact artifact = factory.createArtifact();
-        artifact.setURI("foo/bar");
-        resolver.addModel(artifact);
-        Artifact x = factory.createArtifact();
-        x.setURI("foo/bar");
-        x = resolver.resolveModel(Artifact.class, x);
-        assertTrue(x == artifact);
-    }
-    
-    private class Model {
-        private String name;
-        
-        Model(String name) {
-            this.name = name;
-        }
-        
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-        
-        @Override
-        public boolean equals(Object obj) {
-            return name.equals(((Model)obj).name);
-        }
-    }
-
-    private class OtherModel {
-        private String name;
-        
-        OtherModel(String name) {
-            this.name = name;
-        }
-        
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-        
-        @Override
-        public boolean equals(Object obj) {
-            return name.equals(((OtherModel)obj).name);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
deleted file mode 100644
index 66ecd33da6..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.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.resolver;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-
-/**
- * A test implementation of a model resolver, based on a map.
- * 
- * @version $Rev$ $Date$
- */
-public class TestModelResolver implements ModelResolver {
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    public TestModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-    }
-    
-    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);
-        } 
-        // 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/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
deleted file mode 100644
index 2e5354fb96..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.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.contribution.services;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-
-public class ContributionRepositoryTestCase extends TestCase {
-    private ContributionRepositoryImpl repository;
-
-    @Override
-    protected void setUp() throws Exception {
-        // create repository (this should re-create the root directory)
-        this.repository = new ContributionRepositoryImpl("target/repository/", XMLInputFactory.newInstance(), null);
-        repository.init();
-    }
-
-    public void testStore() throws Exception {
-        String resourceLocation = "/repository/sample-calculator.jar";
-        String contribution = "sample-calculator.jar";
-        URL contributionLocation = getClass().getResource(resourceLocation);
-        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
-        repository.store(contribution, contributionLocation, contributionStream);
-
-        URL contributionURL = repository.find(contribution);
-        assertNotNull(contributionURL);
-    }
-
-    public void testRemove() throws Exception {
-        String resourceLocation = "/repository/sample-calculator.jar";
-        String contribution = "sample-calculator.jar";
-        URL contributionLocation = getClass().getResource(resourceLocation);
-        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
-        repository.store(contribution, contributionLocation, contributionStream);
-
-        repository.remove(contribution);
-        URL contributionURL = repository.find(contribution);
-        assertNull(contributionURL);
-    }
-
-    public void testList() throws Exception {
-        String resourceLocation = "/repository/sample-calculator.jar";
-        String contribution = "sample-calculator.jar";
-        URL contributionLocation = getClass().getResource(resourceLocation);
-        InputStream contributionStream = getClass().getResourceAsStream(resourceLocation);
-        repository.store(contribution, contributionLocation, contributionStream);
-
-        assertEquals(1, repository.list().size());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        FileHelper.deleteDirectory(new File("target/repository"));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
deleted file mode 100644
index dfb600153e..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.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.contribution.services;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.PackageType;
-import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
-
-public class PackageTypeDescriberImplTestCase extends TestCase {
-    private PackageTypeDescriberImpl packageTypeDescriber;
-
-    public void testResolveArchivePackageType() throws Exception {
-        URL artifactURL = getClass().getResource("/deployables/sample-calculator.jar");
-        assertEquals(PackageType.JAR, this.packageTypeDescriber.getType(artifactURL, null));
-    }
-
-    public void testResolveFolderPackageType() throws Exception {
-        URL artifactURL = getClass().getResource("/deployables/");
-        assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
-    }
-
-    public void testResolveFolder2PackageType() throws Exception {
-        URL artifactURL = getClass().getResource("/deployables");
-        assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
-    }
-
-    
-    public void testResolveUnknownPackageType() throws Exception {
-        URL artifactURL = getClass().getResource("/test.ext");
-        assertNull(this.packageTypeDescriber.getType(artifactURL, null));
-    }
-    
-    public void testDefaultPackageType() throws Exception {
-        URL artifactURL = getClass().getResource("/test.ext");
-        assertEquals("application/vnd.tuscany.ext", 
-                packageTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext"));        
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        packageTypeDescriber = new PackageTypeDescriberImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 9c46c679d2..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.composite b/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.composite
deleted file mode 100644
index 1e09549194..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.composite
+++ /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.

--->

-<composite>

-    This file just needs to exist

-</composite>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.ext b/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.ext
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tags/java/sca/1.3/modules/contribution-impl/src/test/resources/test.ext
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/contribution-java/LICENSE b/tags/java/sca/1.3/modules/contribution-java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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/tags/java/sca/1.3/modules/contribution-java/NOTICE b/tags/java/sca/1.3/modules/contribution-java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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/tags/java/sca/1.3/modules/contribution-java/pom.xml b/tags/java/sca/1.3/modules/contribution-java/pom.xml
deleted file mode 100644
index dfe98c7081..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-java</artifactId>
-    <name>Apache Tuscany SCA Java Import/Export Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.java</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.java*</Export-Package>
-                        <DynamicImport-Package>org.apache.tuscany.sca.contribution.osgi.impl</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
deleted file mode 100644
index 886c61c00a..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.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.contribution.java;
-
-import org.apache.tuscany.sca.contribution.java.impl.JavaImportExportFactoryImpl;
-
-/**
- * Default Java Import/Export Factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultJavaImportExportFactory extends JavaImportExportFactoryImpl implements JavaImportExportFactory {
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
deleted file mode 100644
index 41e93ec148..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.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.java;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-/**
- * Base Java Export model interface
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaExport extends Export {
-    /**
-     * Get java package that identifies the import
-     * 
-     * @return The package name
-     */
-    String getPackage();
-
-    /**
-     * Set java package that identifies the import
-     * 
-     * @param packageName The package name
-     */
-    void setPackage(String packageName);
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
deleted file mode 100644
index d3568f6283..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.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.java;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * Base Java Import model interface
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaImport 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 java package that identifies the import
-     * 
-     * @return The package name
-     */
-    String getPackage();
-
-    /**
-     * Set java package that identifies the import
-     * 
-     * @param packageName The package name
-     */
-    void setPackage(String packageName);
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
deleted file mode 100644
index af2ca9cd57..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.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.java;

-

-/**

- * Base Java Import/Export model factory

- * 

- * @version $Rev$ $Date$

- */

-public interface JavaImportExportFactory {

-

-    /**

-     * Create a java import model object

-     * 

-     * @return The new JavaImport model object

-     */

-    JavaImport createJavaImport();

-    

-    /**

-     * Create a java export model object

-     * 

-     * @return The new JavaExport model object

-     */

-    JavaExport createJavaExport();

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
deleted file mode 100644
index d9dde0f8ee..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.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.contribution.java.impl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-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.java.JavaImport;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.DefaultDelegatingModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for ClassReferences.
- *
- * @version $Rev$ $Date$
- */
-public class ClassLoaderModelResolver extends URLClassLoader implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, ModelResolver> importResolvers = new HashMap<String, ModelResolver>();
-    
-    private static ClassLoader contextClassLoader() {
-        return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-            public ClassLoader run() {
-                return Thread.currentThread().getContextClassLoader();
-            }
-        });           
-    }
-    
-    public ClassLoaderModelResolver(final Contribution contribution, ModelFactoryExtensionPoint modelFactories) throws MalformedURLException {
-        super(new URL[] {new URL(contribution.getLocation())}, contextClassLoader());
-        this.contribution = contribution;
-        
-        // Index Java import resolvers by package name
-        Map<String, List<ModelResolver>> resolverMap = new HashMap<String, List<ModelResolver>>();
-        for (Import import_: this.contribution.getImports()) {
-            if (import_ instanceof JavaImport) {
-                JavaImport javaImport = (JavaImport)import_;
-                List<ModelResolver> resolvers = resolverMap.get(javaImport.getPackage());
-                if (resolvers == null) {
-                    resolvers = new ArrayList<ModelResolver>();
-                    resolverMap.put(javaImport.getPackage(), resolvers);
-                }
-                resolvers.add(javaImport.getModelResolver());
-            }
-        }
-        
-        // Create a delegating model resolver for each imported package
-        for (Map.Entry<String, List<ModelResolver>> entry: resolverMap.entrySet()) {
-            importResolvers.put(entry.getKey(), new DefaultDelegatingModelResolver(entry.getValue()));
-        }
-    }
-
-    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) {
-        if (!(unresolved instanceof ClassReference)) {
-            return unresolved;
-        }
-        
-        try {
-            
-            // Load the class and return a class reference for it
-            String className = ((ClassReference)unresolved).getClassName();
-            Class<?> clazz = Class.forName(className, true, this);
-            return modelClass.cast(new ClassReference(clazz));
-            
-        } catch (ClassNotFoundException e) {
-            return unresolved;
-        } catch (NoClassDefFoundError e) {
-            return unresolved;
-        }
-    }
-    
-    @Override
-    public URL findResource(String name) {
-        
-        //TODO delegate to the Java import resolvers
-        
-        URL url = super.findResource(name);
-        return url;
-    }
-
-    @Override
-    public Enumeration<URL> findResources(String name) throws IOException {
-        
-        //TODO delegate to the Java import resolvers
-        //Enumeration<URL> importedResources;
-        
-        Enumeration<URL> resources = super.findResources(name);
-        List<URL> allResources = new ArrayList<URL>(); 
-        //for (; importedResources.hasMoreElements(); ) {
-        //    allResources.add(importedResources.nextElement());
-        //}
-        for (; resources.hasMoreElements(); ) {
-            allResources.add(resources.nextElement());
-        }
-        return Collections.enumeration(allResources);
-    }
-    
-    @Override
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
-        
-        // Extract the package name
-        int d = name.lastIndexOf('.');
-        String packageName;
-        if (d != -1) {
-            packageName = name.substring(0, d);
-        } else {
-            packageName = null;
-        }
-        
-        // First try to load the class using the Java import resolvers
-        ModelResolver importResolver = importResolvers.get(packageName);
-        if (importResolver != null) {
-            ClassReference classReference = importResolver.resolveModel(ClassReference.class, new ClassReference(name));
-            if (!classReference.isUnresolved()) {
-                return classReference.getJavaClass();
-            }
-        }
-
-        // Next, try to load the class from the current contribution
-        Class<?> clazz = super.findClass(name);
-        return clazz;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
deleted file mode 100644
index 716abf4602..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.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.contribution.java.impl;

-

-import java.lang.ref.WeakReference;

-import java.lang.reflect.Constructor;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ClassReference;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-

-/**

- * A Model Resolver for ClassReferences.

- *

- * @version $Rev: 557916 $ $Date: 2007-07-20 01:04:40 -0700 (Fri, 20 Jul 2007) $

- */

-public class ClassReferenceModelResolver implements ModelResolver {

-    private Contribution contribution;

-    private WeakReference<ClassLoader> classLoader;

-    private Map<String, ClassReference> map = new HashMap<String, ClassReference>();

-

-    private ModelResolver osgiResolver;

-

-    public ClassReferenceModelResolver(final Contribution contribution, ModelFactoryExtensionPoint modelFactories) {

-        this.contribution = contribution;

-        if (this.contribution != null) {

-            // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-            // ClassLoader cl = contribution.getClassLoader();

-            ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                public ClassLoader run() {

-                    return contribution.getClassLoader();

-                }

-            });           

-

-            if (cl == null) {

-                // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-                ClassLoader contextClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                    public ClassLoader run() {

-                        return Thread.currentThread().getContextClassLoader();

-                    }

-                });           

-                cl = new ContributionClassLoader(contribution, contextClassLoader);

-                contribution.setClassLoader(cl);

-            }

-            this.classLoader = new WeakReference<ClassLoader>(cl);

-        } else {

-            // This path should be used only for unit testing.

-            // Allow privileged access to get ClassLoader. Requires RuntimePermission in security policy.

-            // this.classLoader = new WeakReference<ClassLoader>(this.getClass().getClassLoader());

-            ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-                public ClassLoader run() {

-                    return this.getClass().getClassLoader();

-                }

-            });           

-            this.classLoader = new WeakReference<ClassLoader>( cl );

-        }

-

-        try {

-            Class<?> osgiResolverClass =

-                Class.forName("org.apache.tuscany.sca.contribution.osgi.impl.OSGiClassReferenceModelResolver");

-            if (osgiResolverClass != null) {

-                Constructor constructor =

-                    osgiResolverClass.getConstructor(Contribution.class, ModelFactoryExtensionPoint.class);

-                this.osgiResolver = (ModelResolver)constructor.newInstance(contribution, modelFactories);

-            }

-        } catch (Throwable e) {

-            // Ignore error, non-OSGi classloading is used in this case

-        }

-    }

-

-    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());

-    }

-

-  

-

-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {

-        if (!(unresolved instanceof ClassReference)) {

-            return unresolved;

-        }

-        Object resolved = map.get(((ClassReference)unresolved).getClassName());

-

-        if (resolved != null) {

-            return modelClass.cast(resolved);

-        }

-

-        //Load a class on demand

-        Class clazz = null;

-        

-        if (osgiResolver != null) {

-            resolved = osgiResolver.resolveModel(modelClass, unresolved);

-            clazz = ((ClassReference)resolved).getJavaClass();

-        }

-        

-        if (clazz == null) {

-            try {

-            	// Search contribution ClassLoader (which has visibility of classes in the contribution

-            	// as well as explicitly imported packages from other contributions)

-                clazz = Class.forName(((ClassReference)unresolved).getClassName(), true, classLoader.get());

-            } catch (ClassNotFoundException e) {

-            } catch (NoClassDefFoundError e) {

-            }

-        }

-

-        if (clazz != null) {

-            //if we load the class            

-            // Store a new ClassReference wrapping the loaded class

-            ClassReference classReference = new ClassReference(clazz);

-            map.put(clazz.getName(), classReference);

-

-            // Return the resolved ClassReference

-            return modelClass.cast(classReference);

-        } else {

-            return unresolved;

-        }

-

-    }

-

-    

-    /***************

-     * Helper methods

-     ***************/

-

-    private String getPackageName(ClassReference clazz) {

-        int pos = clazz.getClassName().lastIndexOf(".");

-        return clazz.getClassName().substring(0, pos);

-    }

-    

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
deleted file mode 100644
index 60bf7f223b..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.java.impl;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.net.URLClassLoader;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Enumeration;

-import java.util.HashSet;

-

-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.JavaImport;

-

-

-public class ContributionClassLoader extends URLClassLoader {

-// public class ContributionClassLoader  {

-    

-    private Contribution contribution;

-    // private b urlClassLoader;

-    

-    /**

-     * Constructor for contribution ClassLoader 

-     * 

-     * @param contribution

-     * @param parent

-     * @throws MalformedURLException

-     */

-    public ContributionClassLoader(Contribution contribution, final ClassLoader parent) {

-        super(new URL[0], parent);

-        // Note that privileged use of getContextClassLoader have been promoted to callers.

-        // super(new URL[0], parent == null?Thread.currentThread().getContextClassLoader(): null);

-        this.contribution = contribution;

-        if (contribution.getLocation() != null) {

-            try {

-                this.addURL(new URL(contribution.getLocation()));

-            } catch (MalformedURLException e) {

-                throw new RuntimeException(e);

-            }

-        }

-    }

-

-    /*

-     * @return the context ClassLoader of the current thread.

-     */

-    protected static ClassLoader getContextClassLoader() {

-       ClassLoader contextClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-            public ClassLoader run() {

-                return Thread.currentThread().getContextClassLoader();

-            }

-        });           

-       return contextClassLoader;

-    }

-    

-    /*

-     * Return the ClassLoader corresponding to a contribution providing an export

-     * Create a new ClassLoader for the contribution if one does not exist

-     */

-    private ClassLoader getExportClassLoader(Contribution exportingContribution) {

-    	ClassLoader cl = exportingContribution.getClassLoader();

-        if (!(cl instanceof ContributionClassLoader)) {

-            if (cl == null) {

-                cl = getContextClassLoader();

-            }

-

-            cl = new ContributionClassLoader(exportingContribution, cl);

-            exportingContribution.setClassLoader(cl);

-        }

-        return cl;

-    }

-    

-    /* (non-Javadoc)

-     * @see java.net.URLClassLoader#findClass(java.lang.String)

-     * 

-     * Search path for class:

-     *     This contribution

-     *     Imported contributions

-     */

-    @Override   

-    protected Class<?> findClass(String className) throws ClassNotFoundException {

-        

-        Class<?> clazz = null;

-        try {

-            clazz = findClassFromContribution(className);

-        } catch (ClassNotFoundException e) {

-                

-            for (Import import_ : this.contribution.getImports()) {

-                if (classNameMatchesImport(className, import_)) {

-                    // Delegate the resolution to the imported contribution

-                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                    

-                        ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                        if (exportClassLoader instanceof ContributionClassLoader) {

-                            

-                            for (Export export : exportingContribution.getExports()) {

-                                try {

-                                    if (import_.match(export)) {

-                                        clazz = ((ContributionClassLoader)exportClassLoader).findClassFromContribution(className);

-                                        break;

-                                    }

-                                } catch (ClassNotFoundException e1) { 

-                                    continue;

-                                }

-                                    

-                            }

-                            if (clazz != null)  break;

-                        }

-                    }

-                    if (clazz != null) break;

-                }

-            }

-

-            if (clazz == null) throw e;

-        }

-        return clazz;

-    }

-

-    

-    /* (non-Javadoc)

-     * @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)

-     * 

-     * Search path for class:

-     *     Parent ClassLoader

-     *     This contribution

-     *     Imported contributions

-     *     

-     */

-    @Override

-    protected synchronized Class<?> loadClass(String className, boolean resolveClass) 

-        throws ClassNotFoundException {

-       

-        Class<?> clazz = null;

-        try {

-            

-            if (this.getParent() != null)

-                clazz = this.getParent().loadClass(className);

-            

-        } catch (ClassNotFoundException e) {

-        }

-

-        if (clazz == null)

-            clazz = findClass(className);

-

-

-        if (resolveClass)

-            this.resolveClass(clazz);

-        return clazz;

-        

-    }

-

-

-   

-    /*

-     * (non-Javadoc)

-     * 

-     * @see java.net.URLClassLoader#findResource(java.lang.String)

-     */

-    @Override

-    public URL findResource(String name) {

-        

-        URL url = findResourceFromContribution(name);

-        

-        if (url == null) {

-            for (Import import_ : this.contribution.getImports()) {

-                if (resourceNameMatchesImport(name, import_)) {

-                    // Delegate the resolution to the imported contribution

-                    for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                

-                        ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                        if (exportClassLoader instanceof ContributionClassLoader) {

-

-                            for (Export export : exportingContribution.getExports()) {

-                                if (import_.match(export)) {

-                                    url = ((ContributionClassLoader)exportClassLoader).findResourceFromContribution(name);

-                                    if (url != null) break;

-                                }

-                            }

-                            if (url != null)  break;

-                        }

-                    }

-                    if (url != null) break;

-                }

-            }

-

-        }

-        return url;

-    }

-

-

-    /* (non-Javadoc)

-     * @see java.net.URLClassLoader#findResources(java.lang.String)

-     */

-    @Override

-    public Enumeration<URL> findResources(String name) throws IOException {

-              

-        return Collections.enumeration(findResourceSet(name));

-    }

-    

-    

-

-    

-    /* (non-Javadoc)

-     * @see java.lang.ClassLoader#getResource(java.lang.String)

-     * 

-     * Find a resource. 

-     * Search path for resource:

-     *     Parent ClassLoader

-     *     This contribution

-     *     Imported contributions

-     */

-    @Override

-    public URL getResource(String resName) {

- 

-        URL resource  = null;

-        

-        if (this.getParent() != null) {

-            resource  = this.getParent().getResource(resName);

-        }        

-        if (resource == null)

-            resource  = findResource(resName);

-        

-        return resource;

-    }

-

-

-    

-    /* (non-Javadoc)

-     * @see java.lang.ClassLoader#getResources(java.lang.String)

-     * 

-     * Return list of resources from this contribution, resources

-     * imported through imported contributions and resources from parent 

-     * ClassLoader.

-     */

-    @Override

-    public Enumeration<URL> getResources(String resName) throws IOException {

-       

-        HashSet<URL> resourceSet = findResourceSet(resName);

-        addEnumerationToCollection(resourceSet, super.getResources(resName));

-        

-        return Collections.enumeration(resourceSet);

-    }

-    

-

-    /*

-     * Find set of resources

-     */

-    private HashSet<URL> findResourceSet(String name) throws IOException {

-        

-        HashSet<URL> resources = new HashSet<URL>();

-

-        addEnumerationToCollection(resources, super.findResources(name));

-        

-        for (Import import_ : this.contribution.getImports()) {

-            if (!(import_ instanceof JavaImport)) {

-                continue;

-            }

-            if (resourceNameMatchesImport(name, import_)) {

-                // Delegate the resolution to the imported contribution

-                for (Contribution exportingContribution : ((JavaImportModelResolver)import_.getModelResolver()).getExportContributions()) {

-                                

-                    ClassLoader exportClassLoader = getExportClassLoader(exportingContribution);

-                    if (exportClassLoader instanceof ContributionClassLoader) {

-

-                        for (Export export : exportingContribution.getExports()) {

-                            if (import_.match(export)) {

-                                addEnumerationToCollection(resources,

-                                        ((ContributionClassLoader)exportClassLoader).findResources(name));

-                            }

-                        }

-                    }

-                }

-            }

-         }

-

-        return resources;

-    }

-

-

-    /*

-     * Find class from contribution. If class has already been loaded, return loaded class.

-     */

-    private Class<?> findClassFromContribution(String className) throws ClassNotFoundException {

-        

-        Class<?> clazz = findLoadedClass(className);

-        if (clazz == null)

-            clazz =  super.findClass(className);

-        return clazz;

-       

-    }

-    

-    /*

-     * Find resource from contribution.

-     */

-    private URL findResourceFromContribution(String name) {

-        

-        return super.findResource(name);

-    }

-    

-    /**

-     * Check if a class name matches an import statement.

-     * Class matches if the package name used in <import.java/> matches

-     * 

-     * @param name    Name of class 

-     * @param import_ SCA contribution import

-     * @return true if this is a matching import

-     */

-    private boolean classNameMatchesImport(String name, Import import_) {

-        

-        if (import_ instanceof JavaImport && name != null && name.lastIndexOf('.') > 0) {

-            JavaImport javaImport = (JavaImport) import_;

-                

-            String packageName = name.substring(0, name.lastIndexOf('.'));

-            if (javaImport.getPackage().endsWith(".*")) {

-                String prefix = javaImport.getPackage().substring(0, javaImport.getPackage().length() -1);

-                 if (packageName.startsWith(prefix)) {

-                    return true;

-                }

-            } else {

-                return packageName.equals(javaImport.getPackage());

-            }

-        }

-        

-        return false;

-    }

-    

-    /**

-     * Check if a resource name matches an import statement.

-     * Resource matches if package/namespace match the directory of resource.

-     * 

-     * @param name    Name of resource

-     * @param import_ SCA contribution import

-     * @return true if this is a matching import

-     */

-    private boolean resourceNameMatchesImport(String name, Import import_) {

-        

-       

-        if (name == null || name.lastIndexOf('/') <= 0)

-            return false;

-        else if (import_ instanceof JavaImport) {

-            JavaImport javaImport = (JavaImport) import_;

-            

-            if (javaImport.getPackage().endsWith(".*")) {

-                String packageName = name.substring(0, name.lastIndexOf('/')).replace('/', '.');

-                String prefix = javaImport.getPackage().substring(0, javaImport.getPackage().length() -1);

-                if (packageName.startsWith(prefix)) {

-                    return true;

-                }

-            } else {

-                // 'name' is a resource : contains "/" as separators

-                // Get package name from resource name

-                String packageName = name.substring(0, name.lastIndexOf('/'));

-                 return packageName.equals(javaImport.getPackage().replaceAll("\\.", "/"));

-            }

-        } 

-        return false;

-    }

-    

-    /*

-     * Add an enumeration to a Collection

-     */

-    private <T extends Object> void addEnumerationToCollection(Collection<T> collection, Enumeration<T> enumeration) {

-        

-        while (enumeration.hasMoreElements())

-            collection.add(enumeration.nextElement());

-    }

-    

-    

-    @Override

-    public String toString() {

-        return "SCA contribution classloader for : " + contribution.getLocation();

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
deleted file mode 100644
index f35f35ac4c..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.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.java.impl;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * Implementation of a Java Import model
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportImpl implements JavaExport {
-    private ModelResolver modelResolver;
-
-    /**
-     * Java package being exported
-     */
-    private String packageName;
-
-    public JavaExportImpl() {
-        super();
-    }
-
-    public String getPackage() {
-        return this.packageName;
-    }
-
-    public void setPackage(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
deleted file mode 100644
index 8d5412f6d7..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.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.contribution.java.impl;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A model resolver for Java exports.
- *
- * @version $Rev$ $Date$
- */
-public class JavaExportModelResolver implements ModelResolver {
-
-    private JavaExport export;
-    private ModelResolver resolver;
-    
-    public JavaExportModelResolver(JavaExport 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) {
-        if (!(unresolved instanceof ClassReference)) {
-            return unresolved;
-        }
-        
-        // Filter package name
-        ClassReference classReference = (ClassReference)unresolved;
-        String className = classReference.getClassName();
-        int d = className.lastIndexOf('.');
-        String packageName;
-        if (d != -1) {
-            packageName = className.substring(0, d);
-        } else {
-            packageName = "";
-        }
-        if (export.getPackage().equals(packageName)) {
-            
-            // Package matches the exported package, delegate to the
-            // contribution's resolver
-            return resolver.resolveModel(modelClass, unresolved);
-        } else {
-            
-            // Package is not exported, return the unresolved object 
-            return unresolved;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
deleted file mode 100644
index 9f6ff52289..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.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.contribution.java.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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
-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;
-
-/**
- * Artifact processor for Java Export
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName EXPORT_JAVA = new QName(SCA10_NS, "export.java");
-    
-    private static final String PACKAGE = "package";
-    
-    private final JavaImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public JavaExportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super();
-        this.factory = modelFactories.getFactory(JavaImportExportFactory.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 = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-
-    public QName getArtifactType() {
-        return EXPORT_JAVA;
-    }
-    
-    public Class<JavaExport> getModelType() {
-        return JavaExport.class;
-    }
-    
-    /**
-     * Process <export package=""/>
-     */
-    public JavaExport read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JavaExport javaExport = this.factory.createJavaExport();
-        QName element = null;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    element = reader.getName();
-                    
-                    // Read <export.java>
-                    if (EXPORT_JAVA.equals(element)) {
-                        String packageName = reader.getAttributeValue(null, PACKAGE);
-                        if (packageName == null) {
-                        	error("AttributePackageMissing", reader);
-                            //throw new ContributionReadException("Attribute 'package' is missing");
-                        } else                        
-                            javaExport.setPackage(packageName);
-                    }
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if (EXPORT_JAVA.equals(reader.getName())) {
-                        return javaExport;
-                    }
-                    break;        
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        
-        return javaExport;
-    }
-
-    public void write(JavaExport javaExport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <export.java>
-        writer.writeStartElement(EXPORT_JAVA.getNamespaceURI(), EXPORT_JAVA.getLocalPart());
-        
-        if (javaExport.getPackage() != null) {
-            writer.writeAttribute(PACKAGE, javaExport.getPackage());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    public void resolve(JavaExport javaExport, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (javaExport.getPackage() != null)
-            // Initialize the export resolver
-            javaExport.setModelResolver(new JavaExportModelResolver(javaExport, resolver));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
deleted file mode 100644
index e5dc397f4e..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.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.java.impl;

-

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;

-

-/**

- * Java Import/Export Factory implementation

- * 

- * @version $Rev$ $Date$

- */

-public class JavaImportExportFactoryImpl implements JavaImportExportFactory {

-

-    public JavaImport createJavaImport() {

-        return new JavaImportImpl();

-    }

-    

-    public JavaExport createJavaExport() {

-        return new JavaExportImpl();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
deleted file mode 100644
index 47cdc9767b..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.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.contribution.java.impl;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.Export;

-import org.apache.tuscany.sca.contribution.Import;

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.resolver.DefaultImportAllModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionListener;

-import org.apache.tuscany.sca.contribution.service.ContributionRepository;

-

-/**

- * Java 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 JavaImportExportListener implements ContributionListener {

-    

-    private ContributionFactory contributionFactory;

-    

-    /**

-     * Constructs a new JavaImportExportListener

-     */

-    public JavaImportExportListener(ModelFactoryExtensionPoint modelFactories) {

-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-    }

-    

-    /**

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

-     * Also set the exporting contributions used by contribution ClassLoaders to 

-     * match import/export for class loading.

-     */

-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {

-        

-        // If the contribution does not contain sca-contribution.xml metadata

-        // (for example it's an existing JAR developed before SCA existed)

-        // export all its Java packages

-        ModelResolver modelResolver = contribution.getModelResolver();

-        

-        // Look for META-INF/sca-contribution.xml

-        Artifact artifact = contributionFactory.createArtifact();

-        artifact.setURI(Contribution.SCA_CONTRIBUTION_META);

-        artifact = modelResolver.resolveModel(Artifact.class, artifact);

-        if (artifact.getLocation() == null) {

-

-            // Look for META-INF/sca-contribution-generated.xml

-            artifact.setURI(Contribution.SCA_CONTRIBUTION_GENERATED_META);

-            artifact = modelResolver.resolveModel(Artifact.class, artifact);

-            if (artifact.getLocation() == null) {

-                

-                // No contribution metadata file was found, default to export all the

-                // Java packages found in the contribution

-                Set<String> packages = new HashSet<String>();

-                for (Artifact a: contribution.getArtifacts()) {

-                    String uri = a.getURI();

-                    if (uri.endsWith(".class")) {

-                        uri = uri.substring(0, uri.length() - 6);

-                        int d = uri.lastIndexOf('/');

-                        if (d != -1) {

-                            packages.add(uri.substring(0, d).replace('/', '.'));

-                        }

-                    }

-                }

-                

-                // Add Java export model objects for all the packages we found

-                for (String pkg: packages) {

-                    JavaExport export = new JavaExportImpl();

-                    export.setPackage(pkg);

-                    contribution.getExports().add(export);

-                }

-            }

-        }

-        

-        // Initialize the contribution exports

-        for (Export export: contribution.getExports()) {

-            export.setModelResolver(contribution.getModelResolver());

-        }

-        

-        // Initialize the contribution imports

-        for (Import import_: contribution.getImports()) {

-            boolean initialized = false;

-            

-            if(import_ instanceof JavaImport) {

-                JavaImport javaImport = (JavaImport) import_;

-                

-                //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 (javaImport.getPackage().equals(javaExport.getPackage())) {

-                                    List<Contribution> exportingContributions = new ArrayList<Contribution>();

-                                    exportingContributions.add(targetContribution);

-                                    javaImport.setModelResolver(new JavaImportModelResolver(exportingContributions, javaExport.getModelResolver()));

-                                    initialized = true;

-                                    break;

-                                }

-                            }

-                        }

-                    }                    

-                }

-

-                //if no location was specified, try to resolve with any contribution

-                if (!initialized) {

-                    //Use a resolver that will consider all contributions

-                    import_.setModelResolver(new JavaImportModelResolver(repository.getContributions(), new DefaultImportAllModelResolver(import_, repository.getContributions())));

-                }

-            }

-        }

-    }

-

-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {

-

-    }

-

-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {

-

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
deleted file mode 100644
index cc18d5f798..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.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.contribution.java.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.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * Implementation of a Java Import model
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportImpl implements JavaImport {
-    private ModelResolver modelResolver;
-    private List<Contribution> contributions;
-    /**
-     * Java package name being imported
-     */
-    private String packageName;
-    /**
-     * Contribution URI where the artifact is imported from
-     */
-    private String location;
-    
-    public JavaImportImpl() {
-        super();
-    }
-
-    public String getLocation() {
-        return this.location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getPackage() {
-        return this.packageName;
-    }
-
-    public void setPackage(String packageName) {
-        this.packageName = packageName;
-    }
-
-    public ModelResolver getModelResolver() {
-        return this.modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    public List<Contribution> getExportContributions() {
-        return contributions;
-    }
-
-    public void setExportContributions(List<Contribution> contributions) {
-        this.contributions = contributions;
-    }
-
-    /**
-     * Match a JavaImport to a given JavaExport based on :
-     *    location is not provided
-     *    import and export packages match
-     */
-    public boolean match(Export export) {
-        if(export instanceof JavaExport) {
-            JavaExport javaExport = (JavaExport)export;
-            String exportedPackage = javaExport.getPackage();
-            if (packageName.equals(exportedPackage)) {
-                return true;
-            } else {
-                if (packageName.endsWith(".*")) {
-                    String prefix = packageName.substring(0, packageName.length() - 1);
-                    if (exportedPackage.startsWith(prefix)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        
-        return false;
-    }
-    
-    @Override
-    public String toString() {
-        return String.valueOf(packageName);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
deleted file mode 100644
index 484eddd222..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.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.contribution.java.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A JavaImport specific model resolver. This model resolver is temporary
- * and provides the ContributionClassLoader with the list of exporting
- * contributions that it currently needs.
- * 
- * FIXME Remove this class after the ContributionClassLoader is simplified
- * and cleaned up.
- *
- * @version $Rev$ $Date$
- */
-public class JavaImportModelResolver implements ModelResolver {
-
-    private ModelResolver modelResolver;
-    private List<Contribution> contributions;
-    
-    public JavaImportModelResolver(List<Contribution> contributions, ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-        this.contributions = contributions;
-    }
-
-    public List<Contribution> getExportContributions() {
-        return contributions;
-    }
-    
-    public void addModel(Object resolved) {
-        modelResolver.addModel(resolved);
-    }
-
-    public Object removeModel(Object resolved) {
-        return modelResolver.removeModel(resolved);
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        return modelResolver.resolveModel(modelClass, unresolved);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
deleted file mode 100644
index d027d75b32..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.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.contribution.java.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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
-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;
-
-/**
- * Artifact Processor for Java Imports
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportProcessor  implements StAXArtifactProcessor<JavaImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName IMPORT_JAVA = new QName(SCA10_NS, "import.java");
-
-    private static final String PACKAGE = "package";
-    private static final String LOCATION = "location";
-    
-    private final JavaImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public JavaImportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super();
-        this.factory = modelFactories.getFactory(JavaImportExportFactory.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 = new ProblemImpl(this.getClass().getName(), "contribution-java-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-    
-    public QName getArtifactType() {
-        return IMPORT_JAVA;
-    }
-    
-    public Class<JavaImport> getModelType() {
-        return JavaImport.class;
-    }
-
-    /**
-     * Process <import.java package="" location=""/>
-     */
-    public JavaImport read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JavaImport javaImport = this.factory.createJavaImport();
-        QName element = null;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    element = reader.getName();
-
-                    // Read <import.java>
-                    if (IMPORT_JAVA.equals(element)) {
-                        String packageName = reader.getAttributeValue(null, PACKAGE);
-                        if (packageName == null) {
-                        	error("AttributePackageMissing", reader);
-                            //throw new ContributionReadException("Attribute 'package' is missing");
-                        } else
-                        	javaImport.setPackage(packageName);
-                        
-                        String location = reader.getAttributeValue(null, LOCATION);                        
-                        javaImport.setLocation(location);
-                    }
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if (IMPORT_JAVA.equals(reader.getName())) {
-                        return javaImport;
-                    }
-                    break;        
-            }
-            
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        
-        return javaImport;
-    }
-
-    public void write(JavaImport javaImport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <import.java>
-        writer.writeStartElement(IMPORT_JAVA.getNamespaceURI(), IMPORT_JAVA.getLocalPart());
-        
-        if (javaImport.getPackage() != null) {
-            writer.writeAttribute(PACKAGE, javaImport.getPackage());
-        }
-        if (javaImport.getLocation() != null) {
-            writer.writeAttribute(LOCATION, javaImport.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(JavaImport model, ModelResolver resolver) throws ContributionResolveException {
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
deleted file mode 100644
index a293330a57..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ /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.java.impl.JavaImportExportFactoryImpl

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ac1fa9aade..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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.java.impl.JavaImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import.java,model=org.apache.tuscany.sca.contribution.java.JavaImport
-org.apache.tuscany.sca.contribution.java.impl.JavaExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export.java,model=org.apache.tuscany.sca.contribution.java.JavaExport
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index c69eb40636..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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.java.impl.ClassReferenceModelResolver;model=org.apache.tuscany.sca.contribution.resolver.ClassReference

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/tags/java/sca/1.3/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 7debb3d3c6..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/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.java.impl.JavaImportExportListener

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/tags/java/sca/1.3/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
deleted file mode 100644
index 70b58f75c0..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/main/resources/contribution-java-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.
-#
-#
-AttributePackageMissing = Attribute 'package' is missing
-
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
deleted file mode 100644
index 1405ad4bd5..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.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.contribution.java.impl;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ClassReference;

-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;

-

-/**

- * Test ClassReferenceArtifactResolver.

- *

- * @version $Rev: 560435 $ $Date: 2007-07-27 18:26:55 -0700 (Fri, 27 Jul 2007) $

- */

-public class ClassReferenceArtifactResolverTestCase extends TestCase {

-    private ExtensibleModelResolver resolver;

-    

-    @Override

-    protected void setUp() throws Exception {

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        

-        ModelResolverExtensionPoint resolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);

-        resolvers.addResolver(ClassReference.class, ClassReferenceModelResolver.class);

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

-        resolver = new ExtensibleModelResolver(null, resolvers, modelFactories);

-    }

-    

-    /**

-     * Test ClassReference resolution

-     * 

-     */

-    public void testResolveClass() {

-        ClassReference ref = new ClassReference(getClass().getName());

-        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);

-        assertFalse(clazz.isUnresolved());

-        assertTrue(clazz.getJavaClass() == getClass());

-    }

-    

-    /**

-     * Test ClassReference resolution of inexistent class

-     *

-     */

-    public void testUnresolvedClass() {

-        ClassReference ref = new ClassReference("NonExistentClass");

-        ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);

-        assertTrue(clazz.isUnresolved());

-        assertTrue(clazz.getJavaClass() == null);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
deleted file mode 100644
index 3ae161642d..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * 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.java.impl;

-

-import java.io.File;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-

-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.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;

-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Test;

-

-

-/**

- * Test ContributionClassLoader.

- *

- */

-public class ContributionClassLoaderTestCase  {

-    

-    private ContributionFactory contributionFactory;

-    private JavaImportExportFactory javaImportExportFactory;

-    

-    @Before

-    public void setUp() throws Exception {

-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);

-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-        javaImportExportFactory = modelFactories.getFactory(JavaImportExportFactory.class);

-    }

-    

-    private Contribution createContribution(String fileName) throws MalformedURLException {

-        Contribution contrib = contributionFactory.createContribution();

-        File contribDir = new File(fileName);        

-        contrib.setLocation(contribDir.toURI().toURL().toString());

-        ClassLoader contextClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {

-            public ClassLoader run() {

-                return Thread.currentThread().getContextClassLoader();

-            }

-        });           

-        contrib.setClassLoader(new ContributionClassLoader(contrib, contextClassLoader));

-        return contrib;

-    }

-    

-   

-    @Test

-    public void testClassLoadingFromContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        // Class present in contribution, also in parent. Class is loaded from parent

-        Class<?> testClassA = contribA.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassA);

-        Assert.assertSame(this.getClass(), testClassA);

-        

-        // Class not present in contribution, but present in parent ClassLoader

-        Class<?> testClassB = contribB.getClassLoader().loadClass(this.getClass().getName());

-        Assert.assertNotNull(testClassB);

-        Assert.assertSame(this.getClass(), testClassB);

-        

-        // Class present in contribution, but not in parent

-        Class<?> testClassC = contribC.getClassLoader().loadClass("calculator.AddService");        

-        Assert.assertNotNull(testClassC);

-        

-        // Class not present in contribution or in parent

-        try {

-            contribA.getClassLoader().loadClass("NonExistent");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-        

-        

-    }

-    

-    @Test

-    public void testResourceLoadingFromContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        // Resource present in contribution, and in parent

-        URL resA = contribA.getClassLoader().getResource("deployables/sample-calculator.jar");

-        Assert.assertNotNull(resA);

-        

-        // Resource not present in contribution, but present in parent ClassLoader

-        URL resB = contribB.getClassLoader().getResource("deployables/sample-calculator.jar");

-        Assert.assertNotNull(resB);

-        

-        // Resource present in contribution, but not in parent

-        URL resC = contribC.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNotNull(resC);        

-        

-        // Load Java class as resource from parent

-        String classResName = this.getClass().getName().replaceAll("\\.", "/") + ".class";

-        URL classResA = contribA.getClassLoader().getResource(classResName);

-        Assert.assertNotNull(classResA);

-               

-        // Non-existent resource

-        URL res = contribA.getClassLoader().getResource("deployables/NonExistent");

-        Assert.assertNull(res);

-        

-    }

-    

-    private static String getPackageName(Class<?> cls) {

-        String name = cls.getName();

-        int index = name.lastIndexOf('.');

-        return index == -1 ? "" : name.substring(0, index);

-    }

-

-    @Test

-    public void testClassLoadingFromImportedContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        ArrayList<Contribution> exportContribList = new ArrayList<Contribution>();

-        exportContribList.add(contribA);

-        exportContribList.add(contribC);

-        

-        JavaImport import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage(getPackageName(getClass()));

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage("calculator");

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        

-        JavaExport export = javaImportExportFactory.createJavaExport();

-        export.setPackage(getPackageName(getClass()));

-        contribA.getExports().add(export);

-        export = javaImportExportFactory.createJavaExport();

-        export.setPackage("calculator");

-        contribC.getExports().add(export);        

-        

-        // Load class from parent, class is also present in imported contribution. Class should

-        // be loaded from parent

-        Class<?> testClassB = contribB.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassB);

-        Assert.assertSame(this.getClass(), testClassB);

-        

-        // Load class from parent, class is also present in parent. Class should be loaded

-        // from parent.

-        Class<?> testClassA = contribA.getClassLoader().loadClass(this.getClass().getName());        

-        Assert.assertNotNull(testClassA);

-        Assert.assertSame(this.getClass(), testClassA);

-        

-        // Imported class should be the same as the one loaded by the exporting contribution

-        Assert.assertSame(testClassA, testClassB);

-        

-        // Load class from imported contribution, class is not present in parent

-        Class<?> testClassB1 = contribB.getClassLoader().loadClass("calculator.AddService");

-        Assert.assertNotNull(testClassB1);

-        

-        // Imported class should be the same as the one loaded by the exporting contribution

-        Class<?> testClassC = contribC.getClassLoader().loadClass("calculator.AddService");

-        Assert.assertNotNull(testClassC);        

-        Assert.assertSame(testClassC, testClassB1);

-        

-

-        // Try to load class from package which is not explicitly imported - should throw ClassNotFoundException

-        try {

-            contribA.getClassLoader().loadClass("calculator.AddService");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-        // Try to load non-existent class from imported package - should throw ClassNotFoundException

-        try {

-            contribB.getClassLoader().loadClass(getPackageName(getClass()) + ".NonExistentClass");

-            

-            Assert.assertTrue("ClassNotFoundException not thrown as expected", false);

-            

-        } catch (ClassNotFoundException e) {

-        }

-        

-    }

-

-    @Test

-    public void testResourceLoadingFromImportedContribution() throws ClassNotFoundException, MalformedURLException {

-        

-        Contribution contribA = createContribution("target/test-classes");

-        Contribution contribB = createContribution("target");

-        Contribution contribC = createContribution("target/test-classes/deployables/sample-calculator.jar");

-        

-        ArrayList<Contribution> exportContribList = new ArrayList<Contribution>();

-        exportContribList.add(contribA);

-        exportContribList.add(contribC);

-        

-        JavaImport import_ = javaImportExportFactory.createJavaImport();

-        import_.setPackage(getPackageName(getClass()));

-        import_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import_);

-        JavaImport import1_ = javaImportExportFactory.createJavaImport();

-        import1_.setPackage("calculator");

-        import1_.setModelResolver(new JavaImportModelResolver(exportContribList, null));

-        contribB.getImports().add(import1_);

-        

-        JavaExport export = javaImportExportFactory.createJavaExport();

-        export.setPackage(getPackageName(getClass()));

-        contribA.getExports().add(export);

-        JavaExport export1 = javaImportExportFactory.createJavaExport();

-        export1.setPackage("calculator");

-        contribC.getExports().add(export1);

-

-        

-        // Load resource from parent

-        URL resB = contribB.getClassLoader().getResource("deployables/sample-calculator.jar"); 

-        Assert.assertNotNull(resB);

-        

-        // Load Java class as resource from imported contribution with JavaImport

-        String classResName = this.getClass().getName().replaceAll("\\.", "/") + ".class";               

-        URL classResB = contribB.getClassLoader().getResource(classResName);

-        Assert.assertNotNull(classResB);

-        

-        // Load Java class as resource from imported contribution with JavaImport

-        URL classResB1 = contribB.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNotNull(classResB1);

-        

-        // Try to load resource not explicitly imported by contribution

-        URL classResA1 = contribA.getClassLoader().getResource("calculator/AddService.class");

-        Assert.assertNull(classResA1);

-        

-        

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
deleted file mode 100644
index 0ec5bfba39..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.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.contribution.java.impl;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-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.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.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test JavaExportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class JavaExportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        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
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        JavaExport javaExport = (JavaExport)staxProcessor.read(reader);
-        assertEquals("org.apache.tuscany.sca.contribution.java", javaExport.getPackage());
-    }
-
-    /**
-     * Test loading an INVALID export element from a contribution metadata stream
-     * @throws Exception
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
deleted file mode 100644
index 9e43b744cf..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.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.contribution.java.impl;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-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.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.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test JavaImportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" package=\"org.apache.tuscany.sca.contribution.java\" location=\"sca://contributions/001\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import.java  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        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
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        JavaImport javaImport = (JavaImport)staxProcessor.read(reader);
-        
-        assertEquals("org.apache.tuscany.sca.contribution.java", javaImport.getPackage());
-        assertEquals("sca://contributions/001", javaImport.getLocation());
-    }
-
-    /**
-     * Test loading a INVALID import element from a contribution metadata stream
-     * @throws Exception
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributePackageMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.3/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
--- a/tags/java/sca/1.3/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/LICENSE b/tags/java/sca/1.3/modules/contribution-namespace/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/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/tags/java/sca/1.3/modules/contribution-namespace/NOTICE b/tags/java/sca/1.3/modules/contribution-namespace/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/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/tags/java/sca/1.3/modules/contribution-namespace/pom.xml b/tags/java/sca/1.3/modules/contribution-namespace/pom.xml
deleted file mode 100644
index 40ea8cc386..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-namespace</artifactId>
-    <name>Apache Tuscany SCA Namespace Import/Export Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.namespace</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.namespace*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
deleted file mode 100644
index a71fa61a54..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.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.contribution.namespace;
-
-import org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportExportFactoryImpl;
-
-/**
- * Default Namespace Import/Export model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultNamespaceImportExportFactory extends NamespaceImportExportFactoryImpl implements NamespaceImportExportFactory {
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
deleted file mode 100644
index c68aee8521..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.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.namespace;
-
-import org.apache.tuscany.sca.contribution.Export;
-
-
-/**
- * The representation of an XML namespace export.
- * 
- * @version $Rev$ $Date$
- */
-public interface NamespaceExport extends Export {
-
-    /**
-     * Get Namespace that identifies the export
-     * 
-     * @return The exported namespace
-     */
-    String getNamespace();
-
-    /**
-     * Set Namespace that identifies the export
-     * 
-     * @param namespace The exported namespace
-     */
-    void setNamespace(String namespace);
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
deleted file mode 100644
index 8af36d7da0..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.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.namespace;
-
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * The representation of an XML namespace import.
- * 
- * @version $Rev$ $Date$
- */
-public interface NamespaceImport 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 Namespace that identifies the import
-     * 
-     * @return The namespace
-     */
-    String getNamespace();
-
-    /**
-     * Set Namespace that identifies the import
-     * 
-     * @param namespace The namespace
-     */
-    void setNamespace(String namespace);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
deleted file mode 100644
index cfbac8bb1f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.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.namespace;
-
-/**
- * Base Namespace import/export model factory
- * 
- * @version $Rev$ $Date$
- */
-public interface NamespaceImportExportFactory {
-
-    /**
-     * Create a namespace import model object
-     * 
-     * @return The new NamespaceImport model object
-     */
-    NamespaceImport createNamespaceImport();
-    
-    /**
-     * Create a namespace export model object
-     * 
-     * @return The new NamespaceExport model object
-     */
-    NamespaceExport createNamespaceExport();
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
deleted file mode 100644
index 8991585d32..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.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.contribution.namespace.impl;
-
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an export for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceExportImpl implements NamespaceExport {
-    private String namespace; 
-    private ModelResolver modelResolver;
-    
-    protected NamespaceExportImpl() {
-        super();
-    }
-    
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
deleted file mode 100644
index 5c5ae22f77..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.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.contribution.namespace.impl;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A model resolver for namespace exports.
- *
- * @version $Rev$ $Date$
- */
-public class NamespaceExportModelResolver implements ModelResolver {
-
-    private ModelResolver resolver;
-    
-    public NamespaceExportModelResolver(ModelResolver resolver) {
-        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) {
-        
-        // Just delegate to the contribution's model resolver, namespace
-        // based filtering is implemented in the model specific model
-        // resolver, which know how to get the namespace of the particular
-        // type of model that they handle 
-        return resolver.resolveModel(modelClass, unresolved);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
deleted file mode 100644
index 64862301c1..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.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.contribution.namespace.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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-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;
-
-/**
- * Artifact processor for Namespace export
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceExportProcessor implements StAXArtifactProcessor<NamespaceExport> {
-
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final QName EXPORT = new QName(SCA10_NS, "export");
-    private static final String NAMESPACE = "namespace";
-    
-    private final NamespaceImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public NamespaceExportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(NamespaceImportExportFactory.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 = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-
-    public QName getArtifactType() {
-        return EXPORT;
-    }
-    
-    public Class<NamespaceExport> getModelType() {
-        return NamespaceExport.class;
-    }
-    
-    /**
-     * Process <export namespace=""/>
-     */
-    public NamespaceExport read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        NamespaceExport namespaceExport = this.factory.createNamespaceExport();
-        QName element = null;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    element = reader.getName();
-                    
-                    // Read <export>
-                    if (EXPORT.equals(element)) {
-                        String ns = reader.getAttributeValue(null, NAMESPACE);
-                        if (ns == null) {
-                        	error("AttributeNameSpaceMissing", reader);
-                            //throw new ContributionReadException("Attribute 'namespace' is missing");
-                        } else
-                            namespaceExport.setNamespace(ns);
-                    } 
-                    
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if (EXPORT.equals(reader.getName())) {
-                        return namespaceExport;
-                    }
-                    break;        
-            }
-            
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        
-        return namespaceExport;
-    }
-
-    public void write(NamespaceExport namespaceExport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <export>
-        writer.writeStartElement(EXPORT.getNamespaceURI(), EXPORT.getLocalPart());
-        
-        if (namespaceExport.getNamespace() != null) {
-            writer.writeAttribute(NAMESPACE, namespaceExport.getNamespace());
-        }
-        
-        writer.writeEndElement();
-    }
-
-    public void resolve(NamespaceExport namespaceExport, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (namespaceExport.getNamespace() != null)
-            // Initialize the export's resolver
-            namespaceExport.setModelResolver(new NamespaceExportModelResolver(resolver));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
deleted file mode 100644
index 1146e593a9..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.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.namespace.impl;
-
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-
-/**
- * Namespace Import/Export model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceImportExportFactoryImpl implements NamespaceImportExportFactory {
-
-    public NamespaceImport createNamespaceImport() {
-        return new NamespaceImportImpl();
-    }
-    
-    public NamespaceExport createNamespaceExport() {
-        return new NamespaceExportImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
deleted file mode 100644
index 7ea09a47c7..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.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.contribution.namespace.impl;
-
-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.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.DefaultImportAllModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionListener;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-
-/**
- * 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 NamespaceImportExportListener implements ContributionListener {
-
-    /**
-     * 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
-     * Also set the exporting contributions used by contribution ClassLoaders to 
-     * match import/export for class loading.
-     */    
-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {
-        // Initialize the contribution exports
-        for (Export export: contribution.getExports()) {
-            export.setModelResolver(contribution.getModelResolver());
-        }
-        
-        // Initialize the contribution imports
-        for (Import import_: contribution.getImports()) {
-            boolean initialized = false;
-
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                
-                // Find a matching contribution
-                if (namespaceImport.getLocation() != null) {
-                    Contribution targetContribution = repository.getContribution(namespaceImport.getLocation());
-                    if (targetContribution != null) {
-                    
-                        // Find a matching contribution export
-                        for (Export export: targetContribution.getExports()) {
-                            if (export instanceof NamespaceExport) {
-                                NamespaceExport namespaceExport = (NamespaceExport)export;
-                                if (namespaceImport.getNamespace().equals(namespaceExport.getNamespace())) {
-                                    namespaceImport.setModelResolver(namespaceExport.getModelResolver());
-                                    initialized = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                } 
-                
-                //if no location was specified, try to resolve with any contribution            
-                if( !initialized ) {
-                    // Use a resolver that will consider all contributions
-                    import_.setModelResolver(new DefaultImportAllModelResolver(import_, repository.getContributions()));
-                }
-            } 
-        }
-
-    }
-
-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {
-
-    }
-
-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
deleted file mode 100644
index 6d2a31f702..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.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.contribution.namespace.impl;
-
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an import for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceImportImpl implements NamespaceImport {
-    private ModelResolver modelResolver;
-
-    /**
-     * The namespace to be imported
-     */
-    private String namespace; 
-    /**
-     * Optional location URI pointing to a Contribution that exports the namespace
-     */
-    private String location;
-
-    
-    protected NamespaceImportImpl() {
-        super();
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-    
-    /**
-     * Match a NamespaceImport to a given NamespaceExport based on :
-     *    location is not provided
-     *    import and export namespaces match
-     */
-    public boolean match(Export export) {
-        if (export instanceof NamespaceExport) {
-            if (this.getNamespace().equals(((NamespaceExport)export).getNamespace())) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    @Override
-    public String toString() {
-        return String.valueOf(namespace);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
deleted file mode 100644
index 829e5fa43f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.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.contribution.namespace.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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-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;
-
-/**
- * Artifact processor for Namespace import
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceImportProcessor  implements StAXArtifactProcessor<NamespaceImport> {
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName IMPORT = new QName(SCA10_NS, "import");
-
-    private static final String NAMESPACE = "namespace";
-    private static final String LOCATION = "location";
-    
-    private final NamespaceImportExportFactory factory;
-    private final Monitor monitor;
-    
-    public NamespaceImportProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(NamespaceImportExportFactory.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 = new ProblemImpl(this.getClass().getName(), "contribution-namespace-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-    
-    public QName getArtifactType() {
-        return IMPORT;
-    }
-    
-    public Class<NamespaceImport> getModelType() {
-        return NamespaceImport.class;
-    }
-
-    /**
-     * Process <import namespace="" location=""/>
-     */
-    public NamespaceImport read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        NamespaceImport namespaceImport = this.factory.createNamespaceImport();
-        QName element;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    element = reader.getName();
-
-                    // Read <import>
-                    if (IMPORT.equals(element)) {
-                        String ns = reader.getAttributeValue(null, NAMESPACE);
-                        if (ns == null) {
-                        	error("AttributeNameSpaceMissing", reader);
-                            //throw new ContributionReadException("Attribute 'namespace' is missing");
-                        } else 
-                            namespaceImport.setNamespace(ns);
-
-                        String location = reader.getAttributeValue(null, LOCATION);
-                        if (location != null) {
-                            namespaceImport.setLocation(location);
-                        }
-                    }
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if (IMPORT.equals(reader.getName())) {
-                        return namespaceImport;
-                    }
-                    break;        
-            }
-            
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        
-        return namespaceImport;
-    }
-
-    public void write(NamespaceImport namespaceImport, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <import>
-        writer.writeStartElement(IMPORT.getNamespaceURI(), IMPORT.getLocalPart());
-        
-        if (namespaceImport.getNamespace() != null) {
-            writer.writeAttribute(NAMESPACE, namespaceImport.getNamespace());
-        }
-        if (namespaceImport.getLocation() != null) {
-            writer.writeAttribute(LOCATION, namespaceImport.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-
-
-    public void resolve(NamespaceImport model, ModelResolver resolver) throws ContributionResolveException {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
deleted file mode 100644
index 095866fb6f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ /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.namespace.impl.NamespaceImportExportFactoryImpl

diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 86f199368b..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/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.namespace.impl.NamespaceImportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#import,model=org.apache.tuscany.sca.contribution.namespace.NamespaceImport
-org.apache.tuscany.sca.contribution.namespace.impl.NamespaceExportProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#export,model=org.apache.tuscany.sca.contribution.namespace.NamespaceExport
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index cdf16a383f..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/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.namespace.impl.NamespaceImportExportListener

diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties b/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
deleted file mode 100644
index c7ddba3c3d..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/main/resources/contribution-namespace-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.
-#
-#
-AttributeNameSpaceMissing = Attribute 'namespace' is missing
-
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
deleted file mode 100644
index 1f508d6a4a..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.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.contribution.namespace.impl;
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.namespace.NamespaceExport;
-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.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.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test NamespaceExportProcessorTestCase
- *  
- * @version $Rev$ $Date$
- */
-public class NamespaceExportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" namespace=\"http://foo\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<export xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }        
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);
-    }
-
-    /**
-     * Test loading a valid export element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        NamespaceExport namespaceExport = (NamespaceExport)staxProcessor.read(reader);
-        assertEquals("http://foo", namespaceExport.getNamespace());
-    }
-
-    /**
-     * Test loading an INVALID export element from a contribution metadata stream
-     * @throws Exception
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
deleted file mode 100644
index 71ac33bf68..0000000000
--- a/tags/java/sca/1.3/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.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.contribution.namespace.impl;
-
-
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-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.service.ContributionReadException;
-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.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test NamespaceImportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class NamespaceImportProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" namespace=\"http://foo\" location=\"sca://contributions/001\"/>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<import  xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\" location=\"sca://contributions/001\"/>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor);
-    }
-
-    /**
-     * Test loading a valid import element from a contribution metadata stream
-     * @throws Exception
-     */
-    public void testLoad() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        NamespaceImport namespaceImport = (NamespaceImport)staxProcessor.read(reader);
-        
-        assertEquals("http://foo", namespaceImport.getNamespace());
-        assertEquals("sca://contributions/001", namespaceImport.getLocation());
-    }
-
-    /**
-     * Test loading a INVALID import element from a contribution metadata stream
-     * @throws Exception
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-osgi/LICENSE b/tags/java/sca/1.3/modules/contribution-osgi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/NOTICE b/tags/java/sca/1.3/modules/contribution-osgi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-osgi/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/tags/java/sca/1.3/modules/contribution-osgi/pom.xml b/tags/java/sca/1.3/modules/contribution-osgi/pom.xml
deleted file mode 100644
index b2d9ad309c..0000000000
--- a/tags/java/sca/1.3/modules/contribution-osgi/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</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.1</version>
-            <scope>runtime</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.contribution.osgi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.osgi*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
deleted file mode 100644
index 0bbb8b707a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
deleted file mode 100644
index 5033d7eefc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
deleted file mode 100644
index b3c2302f60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
deleted file mode 100644
index 07e80f66f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
deleted file mode 100644
index 528a287328..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
deleted file mode 100644
index 15ad0bd948..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/tags/java/sca/1.3/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
deleted file mode 100644
index e624b1d3b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
deleted file mode 100644
index 632d135cb5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 02e8b411eb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/tags/java/sca/1.3/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 8dec190930..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/pom.xml b/tags/java/sca/1.3/modules/contribution-resource/pom.xml
deleted file mode 100644
index 52b33fc564..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.resource</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.resource*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
deleted file mode 100644
index 0bd30c19dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
deleted file mode 100644
index 07eac9d843..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
deleted file mode 100644
index 4119c344ce..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
deleted file mode 100644
index e614b47fc7..0000000000
--- a/tags/java/sca/1.3/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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-
-/**
- * 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, ModelFactoryExtensionPoint 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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
deleted file mode 100644
index c2d525dfef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
deleted file mode 100644
index fd568e533d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
deleted file mode 100644
index 68d5d4761e..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.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.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.assembly.builder.impl.ProblemImpl;
-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.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-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;
-
-/**
- * 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(ModelFactoryExtensionPoint 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 = new ProblemImpl(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        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, XMLStreamException {
-    	ResourceExport resourceExport = this.factory.createResourceExport();
-        QName element = null;
-        
-        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();
-            }
-        }
-        
-        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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
deleted file mode 100644
index 880f5f5786..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
deleted file mode 100644
index e7aecad786..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.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.contribution.resource.impl;
-
-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.DefaultImportAllModelResolver;
-import org.apache.tuscany.sca.contribution.resource.ResourceExport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.service.ContributionListener;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-
-/**
- * Resource 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 ResourceImportExportListener implements ContributionListener {
-
-    /**
-     * 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
-     * Also set the exporting contributions used by contribution ClassLoaders to 
-     * match import/export for class loading.
-     */    
-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {
-        // Initialize the contribution exports
-        for (Export export: contribution.getExports()) {
-            export.setModelResolver(contribution.getModelResolver());
-        }
-        
-        // Initialize the contribution imports
-        for (Import import_: contribution.getImports()) {
-            boolean initialized = false;
-
-            if (import_ instanceof ResourceImport) {
-                ResourceImport resourceImport = (ResourceImport)import_;
-                
-                // Find a matching contribution
-                if (resourceImport.getLocation() != null) {
-                    Contribution targetContribution = repository.getContribution(resourceImport.getLocation());
-                    if (targetContribution != null) {
-                    
-                        // Find a matching contribution export
-                        for (Export export: targetContribution.getExports()) {
-                            if (export instanceof ResourceExport) {
-                                ResourceExport resourceExport = (ResourceExport)export;
-                                if (resourceImport.getURI().equals(resourceExport.getURI())) {
-                                	resourceImport.setModelResolver(resourceExport.getModelResolver());
-                                    initialized = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                } 
-                
-                //if no location was specified, try to resolve with any contribution            
-                if( !initialized ) {
-                    // Use a resolver that will consider all contributions
-                    import_.setModelResolver(new DefaultImportAllModelResolver(import_, repository.getContributions()));
-                }
-            } 
-        }
-    }
-
-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {
-
-    }
-
-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
deleted file mode 100644
index cd33f1290f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
deleted file mode 100644
index 8b2fc44a1c..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.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.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.assembly.builder.impl.ProblemImpl;
-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.resource.ResourceImport;
-import org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory;
-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;
-
-/**
- * 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(ModelFactoryExtensionPoint 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 = new ProblemImpl(this.getClass().getName(), "contribution-resource-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        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, XMLStreamException {
-    	ResourceImport resourceImport = this.factory.createResourceImport();
-        QName element;
-        
-        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();
-            }
-        }
-        
-        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/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 14eb81546d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 08d2b1c338..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
deleted file mode 100644
index d39a5065c2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index f4751db9aa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/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.resource.impl.ResourceImportExportListener

diff --git a/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
deleted file mode 100644
index 58ee8153f8..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/main/resources/contribution-resource-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.
-#
-#
-AttributeURIMissing = Attribute 'uri' is missing
-
diff --git a/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
deleted file mode 100644
index ea44cb506b..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.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.contribution.resource.impl;
-
-
-import java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-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.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test NamespaceExportProcessorTestCase
- *  
- * @version $Rev$ $Date$
- */
-public class ResourceExportProcessorTestCase extends TestCase {
-
-    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 XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        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
-     */
-    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
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
deleted file mode 100644
index 1ff931c162..0000000000
--- a/tags/java/sca/1.3/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.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 java.io.StringReader;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-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.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test NamespaceImportProcessorTestCase
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceImportProcessorTestCase extends TestCase {
-
-    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 XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        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
-     */
-    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
-     */
-    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 = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeURIMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-xml/LICENSE b/tags/java/sca/1.3/modules/contribution-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/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/tags/java/sca/1.3/modules/contribution-xml/NOTICE b/tags/java/sca/1.3/modules/contribution-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/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/tags/java/sca/1.3/modules/contribution-xml/pom.xml b/tags/java/sca/1.3/modules/contribution-xml/pom.xml
deleted file mode 100644
index 97da855e0c..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-xml</artifactId>
-    <name>Apache Tuscany SCA XML Contribution Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
deleted file mode 100644
index 256d50c191..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.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.contribution.xml;
-
-import javax.xml.stream.XMLInputFactory;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * URLArtifactProcessor that handles sca-contribution-generated.xml files.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionGeneratedMetadataDocumentProcessor extends ContributionMetadataDocumentProcessor {
-
-    public ContributionGeneratedMetadataDocumentProcessor(XMLInputFactory inputFactory, 
-    													  StAXArtifactProcessor staxProcessor,
-    													  Monitor monitor) {
-        super(inputFactory, staxProcessor, monitor);
-    }
-    
-    public ContributionGeneratedMetadataDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    													  StAXArtifactProcessor staxProcessor,
-    													  Monitor monitor) {
-        super(modelFactories, staxProcessor, monitor);
-    }
-    
-    public String getArtifactType() {
-        return "sca-contribution-generated.xml";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
deleted file mode 100644
index e2e97239e0..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.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.contribution.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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * URLArtifactProcessor that handles sca-contribution.xml files.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionMetadataDocumentProcessor implements URLArtifactProcessor<ContributionMetadata>{
-    private final StAXArtifactProcessor staxProcessor;
-    private final XMLInputFactory inputFactory;
-    private final Monitor monitor;
-
-    public ContributionMetadataDocumentProcessor(XMLInputFactory inputFactory, 
-    											 StAXArtifactProcessor staxProcessor,
-    											 Monitor monitor) {
-        this.inputFactory = inputFactory;
-        this.staxProcessor = staxProcessor;
-        this.monitor = monitor;
-    }
-    
-    public ContributionMetadataDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    											 StAXArtifactProcessor staxProcessor,
-    											 Monitor monitor) {
-        this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        this.staxProcessor = staxProcessor;
-        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 = new ProblemImpl(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	}
-    }
-    
-    public String getArtifactType() {
-        return "sca-contribution.xml";
-    }
-    
-    public Class<ContributionMetadata> getModelType() {
-        return ContributionMetadata.class;
-    }
-    
-    public ContributionMetadata 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 contribution model
-            ContributionMetadata contribution = (ContributionMetadata)staxProcessor.read(reader);
-
-            return contribution;
-            
-        } catch (XMLStreamException e) {
-        	ContributionReadException ex = new ContributionReadException(e);
-        	error("XMLStreamException", inputFactory, ex);
-        	throw ex;
-        } catch (IOException e) {
-        	ContributionReadException ex = new ContributionReadException(e);
-        	error("IOException", inputFactory, ex);
-            throw ex;
-        } finally {
-            try {
-                if (urlStream != null) {
-                    urlStream.close();
-                    urlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(ContributionMetadata contribution, ModelResolver resolver) throws ContributionResolveException {
-        staxProcessor.resolve(contribution, resolver);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
deleted file mode 100644
index 3f5aacb541..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-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;
-
-/**
- * Processor for contribution metadata
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<ContributionMetadata> {
-    
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    
-    private static final QName CONTRIBUTION_QNAME = new QName(SCA10_NS, "contribution");
-    private static final QName DEPLOYABLE_QNAME = new QName(SCA10_NS, "deployable");
-    
-    private final AssemblyFactory assemblyFactory;
-    private final ContributionFactory contributionFactory;
-    
-    private final StAXArtifactProcessor<Object> extensionProcessor;
-    private Monitor monitor;
-
-    public ContributionMetadataProcessor(AssemblyFactory assemblyFactory, 
-    									 ContributionFactory contributionFactory, 
-    									 StAXArtifactProcessor<Object> extensionProcessor,
-    									 Monitor monitor) {
-        this.assemblyFactory = assemblyFactory;
-        this.contributionFactory = contributionFactory;
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-    public ContributionMetadataProcessor(ModelFactoryExtensionPoint modelFactories, 
-    									 StAXArtifactProcessor<Object> extensionProcessor,
-    									 Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    
-    public QName getArtifactType() {
-        return CONTRIBUTION_QNAME;
-    }
-
-    public Class<ContributionMetadata> getModelType() {
-        return ContributionMetadata.class;
-    }
-
-    public ContributionMetadata read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ContributionMetadata contribution = null;
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    name = reader.getName();
-                    
-                    if (CONTRIBUTION_QNAME.equals(name)) {
-
-                        // Read <contribution>
-                        contribution = this.contributionFactory.createContributionMetadata();
-                        contribution.setUnresolved(true);
-                        
-                    } else if (DEPLOYABLE_QNAME.equals(name)) {                        
-                        
-                        // Read <deployable>
-                        QName compositeName = getQName(reader, "composite");
-                        if (compositeName == null) {
-                        	error("AttributeCompositeMissing", reader);
-                            //throw new ContributionReadException("Attribute 'composite' is missing");
-                        } else {
-                            if (contribution != null) {
-                                Composite composite = assemblyFactory.createComposite();
-                                composite.setName(compositeName);
-                                composite.setUnresolved(true);
-                                contribution.getDeployables().add(composite);                         
-                            }
-                        }
-                    } else {
-
-                        // Read an extension element
-                        Object extension = extensionProcessor.read(reader);
-                        if (extension != null && contribution != null) {
-                            if (extension instanceof Import) {
-                                contribution.getImports().add((Import)extension);
-                            } else if (extension instanceof Export) {
-                                contribution.getExports().add((Export)extension);
-                            }
-                        }
-                    }
-                    break;
-                    
-                case XMLStreamConstants.END_ELEMENT:
-                    if (CONTRIBUTION_QNAME.equals(reader.getName())) {
-                        return contribution;
-                    }
-                    break;        
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        
-        return contribution;
-    }
-
-    public void write(ContributionMetadata contribution, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write <contribution>
-        writeStartDocument(writer, CONTRIBUTION_QNAME.getNamespaceURI(), CONTRIBUTION_QNAME.getLocalPart());
-
-        // Write <import>
-        for (Import imp: contribution.getImports()) {
-            extensionProcessor.write(imp, writer);
-        }
-        
-        // Write <export>
-        for (Export export: contribution.getExports()) {
-            extensionProcessor.write(export, writer);
-        }
-    
-        // Write <deployable>
-        for (Composite deployable: contribution.getDeployables()) {
-            writeStart(writer, DEPLOYABLE_QNAME.getNamespaceURI(), DEPLOYABLE_QNAME.getLocalPart(),
-                       new XAttr("composite", deployable.getName()));
-            writeEnd(writer);
-        }
-        
-        writeEndDocument(writer);
-    }
-
-    public void resolve(ContributionMetadata contribution, ModelResolver resolver) throws ContributionResolveException {
-               
-        // Resolve imports and exports
-        for (Export export: contribution.getExports()) {
-            extensionProcessor.resolve(export, resolver);
-        }
-        for (Import import_: contribution.getImports()) {
-            extensionProcessor.resolve(import_, resolver);
-        }
-        
-        // Resolve deployable composites
-        List<Composite> deployables = contribution.getDeployables();        
-        for (int i = 0, n = deployables.size(); i < n; i++) {
-            Composite deployable = deployables.get(i);
-            Composite resolved = (Composite)resolver.resolveModel(Composite.class, deployable);
-            if (resolved != deployable) {
-                deployables.set(i, resolved);
-            }
-        }
-        
-        contribution.setUnresolved(false);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
deleted file mode 100644
index f226dbbee3..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.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.contribution.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * A Model Resolver for Contribution models.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionModelResolver implements ModelResolver {
-
-    private Map<String, Contribution> map = new HashMap<String, Contribution>();
-    
-    public ContributionModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-    }
-
-    public void addModel(Object resolved) {
-        Contribution contribution = (Contribution)resolved;
-        map.put(contribution.getURI(), contribution);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((Contribution)resolved).getURI());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        
-        // Lookup a contribution for the given URI
-        String uri = ((Contribution)unresolved).getURI();
-        if (uri != null) {
-            Contribution resolved = (Contribution) map.get(uri);
-            if (resolved != null) {
-                return modelClass.cast(resolved);
-            }
-            return unresolved;
-        } else {
-            
-            // If no URI was specified, just return the first contribution
-            if (!map.isEmpty()) {
-                Contribution resolved = map.values().iterator().next();
-                return modelClass.cast(resolved);
-            } else {
-                return unresolved;
-            }
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index b73c380370..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/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.contribution.xml.ContributionMetadataProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 23adab56b9..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ /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.contribution.xml.ContributionMetadataDocumentProcessor;type=sca-contribution.xml,model=org.apache.tuscany.sca.contribution.ContributionMetadata
-org.apache.tuscany.sca.contribution.xml.ContributionGeneratedMetadataDocumentProcessor;type=sca-contribution-generated.xml
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 68030bf6e6..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/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.xml.ContributionModelResolver;model=org.apache.tuscany.sca.contribution.Contribution

diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties b/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
deleted file mode 100644
index 3e1a0187fe..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/main/resources/contribution-xml-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.
-#
-#
-XMLStreamException = XMLStreamException occured due to:
-IOException = IOException occured due to:
-AttributeCompositeMissing = Attribute 'composite' is missing
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/tags/java/sca/1.3/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
deleted file mode 100644
index 8f69f15cd1..0000000000
--- a/tags/java/sca/1.3/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.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.xml;
-
-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.TestCase;
-
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-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.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.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * Test the contribution metadata processor.
- * 
- * @version $Rev$ $Date$
- */
-
-public class ContributionMetadataProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" 
-            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
-            + "<deployable composite=\"ns:Composite1\"/>"
-            + "<deployable composite=\"ns:Composite2\"/>"
-            + "</contribution>";
-
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" 
-            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
-            + "<deployable composite=\"ns:Composite1\"/>"
-            + "<deployable/>"
-            + "</contribution>";
-    
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private Monitor monitor;
-
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        
-        inputFactory = XMLInputFactory.newInstance();
-        outputFactory = XMLOutputFactory.newInstance();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl();  
-        if (monitorFactory != null) {
-        	monitor = monitorFactory.createMonitor();
-        	utilities.addUtility(monitorFactory);
-        }        
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
-    }
-
-    public void testRead() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ContributionMetadata contribution = (ContributionMetadata)staxProcessor.read(reader);
-        assertNotNull(contribution);
-        assertEquals(2, contribution.getDeployables().size());
-  }
-
-    public void testReadInvalid() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(INVALID_XML));
-        /*try {
-            staxProcessor.read(reader);
-            fail("InvalidException should have been thrown");
-        } catch (ContributionReadException e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeCompositeMissing", problem.getMessageId());
-    }    
-
-    public void testWrite() throws Exception {
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_XML));
-        ContributionMetadata contribution = (ContributionMetadata)staxProcessor.read(reader);
-
-        validateContribution(contribution);
-        
-        //write the contribution metadata contents
-        StringWriter stringWriter = new StringWriter();
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(stringWriter);
-        staxProcessor.write(contribution, writer);
-        stringWriter.close();
-
-        reader = inputFactory.createXMLStreamReader(new StringReader(stringWriter.toString()));
-        contribution = (ContributionMetadata)staxProcessor.read(reader);
-        
-        validateContribution(contribution);
-  }
-    
-  private void validateContribution(ContributionMetadata contribution) {
-	  QName deployable;
-	  
-	  assertNotNull(contribution);
-	  assertEquals(2, contribution.getDeployables().size());
-	  deployable = new QName("http://ns", "Composite1");
-	  assertEquals(deployable, contribution.getDeployables().get(0).getName());
-	  deployable = new QName("http://ns", "Composite2");
-	  assertEquals(deployable, contribution.getDeployables().get(1).getName());	  
-  }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/LICENSE b/tags/java/sca/1.3/modules/contribution/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/contribution/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/tags/java/sca/1.3/modules/contribution/NOTICE b/tags/java/sca/1.3/modules/contribution/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/contribution/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/tags/java/sca/1.3/modules/contribution/pom.xml b/tags/java/sca/1.3/modules/contribution/pom.xml
deleted file mode 100644
index b4d9b5c009..0000000000
--- a/tags/java/sca/1.3/modules/contribution/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution</artifactId>
-    <name>Apache Tuscany SCA Contribution Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-            	
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.3.03</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.contribution</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
deleted file mode 100644
index 7400501d85..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.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;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-
-/**
- * Represents an artifact in an SCA contribution.
- * 
- * @version $Rev$ $Date$
- */
-public interface Artifact extends Base {
-    
-    /**
-     * Returns the URI that unique identifies the artifact inside the contribution.
-     * 
-     * @return The artifact URI
-     */
-    String getURI();
-    
-    /**
-     * Sets the URI that uniquely identifies the artifact inside the contribution.
-     * 
-     * @param uri The artifact URI
-     */
-    void setURI(String uri);
-
-    /**
-     * Returns the location of the artifact.
-     * 
-     * @return The artifact location
-     */
-    String getLocation();
-    
-    /**
-     * Set the location of the artifact.
-     * 
-     * @param location The artifact location
-     */
-    void setLocation(String location);
-
-    
-    /**
-     * Returns the in-memory model representing the artifact.
-     * 
-     * @return The model object
-     */
-    Object getModel();
-    
-    /**
-     * Sets the in-memory model representing the artifact.
-     * 
-     * @param model The model object
-     */
-    void setModel(Object model);
-
-    /**
-     * Returns the contents of the artifact cached here.
-     * @return the contents of the artifact
-     */
-    byte[] getContents();
-    
-    /**
-     * Sets the contents of the artifact.
-     * @param contents the contents of the artifact
-     */
-    void setContents(byte[] contents);
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
deleted file mode 100644
index 81b0b08b9d..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.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.contribution;
-
-/**
- * Constants for the main supported contribution package type.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public interface ContentType {
-    
-    /**
-     * Java compressed contribution package
-     */
-    String JAR = "application/x-compressed";
-
-    /**
-     * Filesystem folder contribution package
-     */
-    String FOLDER = "application/vnd.tuscany.folder";
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
deleted file mode 100644
index 743c2356d7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.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.contribution;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an SCA contribution.
- *
- * @version $Rev$ $Date$
- */
-public interface Contribution extends Artifact {
-    
-    /**
-     * Default location of contribution metadata in an SCA contribution.
-     */
-    String SCA_CONTRIBUTION_META = "META-INF/sca-contribution.xml";
-    
-    /**
-     * Default location of a generated contribution metadata in an SCA contribution.
-     */
-    String SCA_CONTRIBUTION_GENERATED_META = "META-INF/sca-contribution-generated.xml";
-    
-    /**
-     * Default location of deployable composites in an SCA contribution.
-     */
-    String SCA_CONTRIBUTION_DEPLOYABLES = "META-INF/sca-deployables/";
-
-    
-    /**
-     * Returns a list of exports based on the contribution metadata.
-     * 
-     * @return The list of exports in this contribution
-     */
-    List<Export> getExports();
-
-    /**
-     * Returns a list of imports based on the contribution metadata.
-     * 
-     * @return The list of imports in this contribution
-     */
-    List<Import> getImports();
-    
-    /**
-     * Returns the list of deployable composites in the contribution.
-     * 
-     * @return The list of deployable composites
-     */
-    List<Composite> getDeployables();
-
-    /**
-     * Returns the list of artifacts in the contribution.
-     * 
-     * @return The list of artifacts in the contribution
-     */
-    List<Artifact> getArtifacts();
-
-    /**
-     * Returns the model resolver for the models representing the artifacts
-     * visible in the scope of this contribution.
-     * 
-     * @return The model resolver
-     */
-    ModelResolver getModelResolver();
-    
-    /**
-     * Sets the model resolver for the models representing the artifacts
-     * visible in the scope of this contribution.
-     * 
-     * @param modelResolver The model resolver
-     */
-    void setModelResolver(ModelResolver modelResolver);
-    
-    /**
-     * Returns the ClassLoader used to load classes and resources from
-     * this contribution
-     * 
-     * FIXME Remove this, the base contribution model should not depend
-     * on Java ClassLoaders. 
-     * 
-     * @return The contribution ClassLoader
-     */
-    ClassLoader getClassLoader();
-    
-    /**
-     * Sets the ClassLoader used to load classes and resources from
-     * this contribution
-     * 
-     * FIXME Remove this, the base contribution model should not depend
-     * on Java ClassLoaders. 
-     * 
-     * @param classLoader the contribution class loader
-     */
-    void setClassLoader(ClassLoader classLoader);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
deleted file mode 100644
index 67c9a05a0b..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.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;
-
-
-/**
- * A factory for the contribution model.
- * 
- * @version $Rev$ $Date$
- */
-public interface ContributionFactory {
-    
-    /**
-     * Create a contribution model object
-     * 
-     * @return The new contribution model object
-     */
-    Contribution createContribution();
-        
-    /**
-     * Create a contribution metadata model object
-     * 
-     * @return The new contribution metadata model object
-     */
-    ContributionMetadata createContributionMetadata();
-        
-    /**
-     * Create a deployedArtifact model object
-     * 
-     * @return The new deployedArtifact model object
-     */
-    @Deprecated
-    DeployedArtifact createDeployedArtifact();   
-
-    /**
-     * Create an artifact model object
-     * 
-     * @return The new artifact model object
-     */
-    Artifact createArtifact();
-
-    /**
-     * Create a default import model object.
-     * 
-     * @return the new default import model object
-     */
-    DefaultImport createDefaultImport();
-
-    /**
-     * Create a default export model object.
-     * 
-     * @return the new default export model object
-     */
-    DefaultExport createDefaultExport();
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
deleted file mode 100644
index 4043fb9eda..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.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.contribution;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.Composite;
-
-/**
- * The representation of SCA contribution metadata.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionMetadata extends Base {
-    
-    /**
-     * Returns a list of exports based on the contribution metadata.
-     * 
-     * @return The list of exports
-     */
-    List<Export> getExports();
-
-    /**
-     * Returns a list of imports based on the contribution metadata.
-     * 
-     * @return The list of imports
-     */
-    List<Import> getImports();
-    
-    /**
-     * Returns the list of deployable based on the contribution metadata.
-     * 
-     * @return The list of deployable composites
-     */
-    List<Composite> getDeployables();
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
deleted file mode 100644
index 98954c288a..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.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.contribution;
-
-import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
-
-
-/**
- * Default implementation of a contribution model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultContributionFactory extends ContributionFactoryImpl {
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
deleted file mode 100644
index b2eddb8336..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.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.contribution;
-
-
-/**
- * The representation of an export that exports all artifacts in
- * a contribution.
- * 
- * @version $Rev$ $Date$
- */
-public interface DefaultExport extends Export {
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
deleted file mode 100644
index 20798dcd17..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.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.contribution;
-
-
-/**
- * The representation of a default import that imports artifacts from
- * all contributions.
- * 
- * @version $Rev$ $Date$
- */
-public interface DefaultImport extends Import {
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
deleted file mode 100644
index 555d25a2db..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.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.contribution;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-
-/**
- * Default implementation of a model factory extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultModelFactoryExtensionPoint implements ModelFactoryExtensionPoint {
-    
-    private HashMap<Class<?>, Object> factories = new HashMap<Class<?>, Object>();
-    
-    /**
-     * Constructs a new DefaultModelFactoryExtensionPoint.
-     */
-    public DefaultModelFactoryExtensionPoint() {
-    }
-
-    /**
-     * Add a model factory extension.
-     * 
-     * @param factory The factory to add
-     */
-    public void addFactory(Object factory) {
-        Class<?>[] interfaces = factory.getClass().getInterfaces();
-        if (interfaces.length == 0) {
-            Class<?> sc = factory.getClass().getSuperclass();
-            if (sc != Object.class) {
-                factories.put(sc, factory);
-            }
-        } else {
-            for (int i = 0; i<interfaces.length; i++) {
-                factories.put(interfaces[i], factory);
-            }
-        }
-    }
-
-    /**
-     * Remove a model factory.
-     *  
-     * @param factory The factory to remove
-     */
-    public void removeFactory(Object factory) {
-        Class<?>[] interfaces = factory.getClass().getInterfaces();
-        if (interfaces.length == 0) {
-            Class<?> sc = factory.getClass().getSuperclass();
-            if (sc != Object.class) {
-                factories.remove(sc);
-            }
-        } else {
-            for (int i = 0; i<interfaces.length; i++) {
-                factories.remove(interfaces[i]);
-            }
-        }
-    }
-    
-    /**
-     * Get a factory implementing the given interface.
-     * @param factoryInterface The lookup key (factory interface)
-     * @return The factory
-     */    
-    public <T> T getFactory(Class<T> factoryInterface) {
-        Object factory = factories.get(factoryInterface);
-        if (factory == null) {
-            
-            if (factoryInterface.isInterface()) {
-                
-                // Dynamically load a factory class declared under META-INF/services 
-                try {
-                	Class<?> factoryClass = ServiceDiscovery.getInstance().loadFirstServiceClass(factoryInterface);
-                    if (factoryClass != null) {
-                    	
-                        try {
-                            // Default empty constructor
-                            Constructor<?> constructor = factoryClass.getConstructor();
-                            factory = constructor.newInstance();
-                        } catch (NoSuchMethodException e) {
-                            
-                            // Constructor taking the model factory extension point
-                            Constructor<?> constructor = factoryClass.getConstructor(ModelFactoryExtensionPoint.class);
-                            factory = constructor.newInstance(this);
-                        }
-                        
-                        // Cache the loaded factory
-                        addFactory(factory);
-                    }
-                } catch (Exception e) {
-                    throw new IllegalArgumentException(e);
-                }
-            } else {
-
-                // Call the newInstance static method on the factory abstract class
-                try {
-                    Method newInstanceMethod = factoryInterface.getMethod("newInstance");
-                    factory = newInstanceMethod.invoke(null);
-                } catch (Exception e) {
-                    throw new IllegalArgumentException(e);
-                }
-                
-                // Cache the factory
-                addFactory(factory);
-            }
-        }
-        return factoryInterface.cast(factory);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
deleted file mode 100644
index ffe190132c..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.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.contribution;
-
-/**
- * Representation of a deployed artifact
- *
- * @version $Rev$ $Date$
- */
-@Deprecated
-public interface DeployedArtifact extends Artifact {
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
deleted file mode 100644
index bfa16b1ce3..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.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.contribution;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an export.
- * 
- * @version $Rev$ $Date$
- */
-public interface Export {
-
-    /**
-     * Returns the model resolver for the models representing artifacts
-     * made available by this export.
-     * 
-     * @return The model resolver
-     */
-    ModelResolver getModelResolver();
-    
-    /**
-     * Sets the model resolver for the models representing artifacts
-     * made available by this export.
-     * 
-     * @param modelResolver
-     */
-    void setModelResolver(ModelResolver modelResolver);
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
deleted file mode 100644
index 35076f55a7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.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.contribution;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * The representation of an import.
- * 
- * @version $Rev$ $Date$
- */
-public interface Import {
-
-    /**
-     * Returns the model resolver for the models representing artifacts
-     * made available by this import.
-     * 
-     * @return The model resolver
-     */
-    ModelResolver getModelResolver();
-
-    /**
-     * Sets the model resolver for the models representing artifacts
-     * made available by this import.
-     * 
-     * @param modelResolver The model resolver
-     */
-    void setModelResolver(ModelResolver modelResolver);
-    
-    /**
-     * Verify that a specific export actually exports what is being imported.
-     * 
-     * @param export The Exported being verified
-     * @return true/false
-     */
-    boolean match(Export export);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
deleted file mode 100644
index 0ada4ebec3..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.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.contribution;
-
-/**
- * An extension point for model factories. Model factories are provided to 
- * abstract the classes that represent artifacts in the assembly model away
- * from their creation mechanism. When the runtime needs to extend the model
- * as it reads in contributed artifacts it looks up the factory for the 
- * artifact required in this registry
- *
- * @version $Rev$ $Date$
- */
-public interface ModelFactoryExtensionPoint {
-    
-    /**
-     * Add a model factory extension.
-     * 
-     * @param factory The factory to add
-     */
-    void addFactory(Object factory);
-    
-    /**
-     * Remove a model factory extension.
-     *  
-     * @param factory The factory to remove
-     */
-    void removeFactory(Object factory); 
-    
-    /**
-     * Get a factory implementing the given interface.
-     * @param factoryInterface the lookup key (factory interface)
-     * @return The factory
-     */
-    <T> T getFactory(Class<T> factoryInterface);
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
deleted file mode 100644
index c0dd5431d7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.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;
-
-/**
- * Constants for the main supported contribution package types.
- * 
- * @version $Rev$ $Date$
- */
-public interface PackageType {
-    
-    /**
-     * Java compressed contribution package
-     */
-    String JAR = "application/x-compressed";
-
-    /**
-     * Filesystem folder contribution package
-     */
-    String FOLDER = "application/vnd.tuscany.folder";
-    
-    
-    String BUNDLE = "application/osgi.bundle";
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
deleted file mode 100644
index 881987f622..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.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.contribution.impl;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-
-
-/**
- * The model representing an artifact in a contribution.
- * 
- * @version $Rev$ $Date$
- */
-class ArtifactImpl implements Artifact {
-    private String uri;
-    private String location;
-    private Object model;
-    private boolean unresolved;
-    private byte[] contents;
-
-    ArtifactImpl() {
-    }
-    
-    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 Object getModel() {
-        return model;
-    }
-    
-    public void setModel(Object model) {
-        this.model = model;
-    }
-
-    public byte[] getContents() {
-        return contents;
-    }
-    
-    public void setContents(byte[] contents) {
-        this.contents = contents;
-    }
-    
-    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 == this) {
-            return true;
-        } else {
-            if (obj instanceof Artifact) {
-                return uri.equals(((Artifact)obj).getURI());
-            } else {
-                return false;
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-    	return "Artifact:" + uri + "\n" +
-    	       "at: " + location;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
deleted file mode 100644
index c678c2eaef..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.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.contribution.impl;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.DefaultExport;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-import org.apache.tuscany.sca.contribution.DeployedArtifact;
-
-
-/**
- * Default implementation of a contribution model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionFactoryImpl implements ContributionFactory {
-    
-    protected ContributionFactoryImpl() {
-    }
-    
-    public Contribution createContribution() {
-        return new ContributionImpl();
-    }
-    
-    public ContributionMetadata createContributionMetadata() {
-        return new ContributionMetadataImpl();
-    }
-
-    public Artifact createArtifact() {
-        return new ArtifactImpl();
-    }
-    
-    public DefaultExport createDefaultExport() {
-        return new DefaultExportImpl();
-    }
-    
-    public DefaultImport createDefaultImport() {
-        return new DefaultImportImpl();
-    }
-    
-    @Deprecated
-    public DeployedArtifact createDeployedArtifact() {
-        class DeployedArtifactImpl extends ArtifactImpl implements DeployedArtifact {
-        }
-        return new DeployedArtifactImpl();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
deleted file mode 100644
index fc9ae607e7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.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.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of a deployed contribution
- *
- * @version $Rev$ $Date$
- */
-class ContributionImpl implements Contribution {
-    private String uri;
-    private String location;
-    private Object model;
-    private byte[] contents;
-    private boolean unresolved;
-    private List<Export> exports = new ArrayList<Export>();
-    private List<Import> imports = new ArrayList<Import>();
-    private List<Composite> deployables = new ArrayList<Composite>();
-    private List<Artifact> artifacts = new ArrayList<Artifact>();
-    private ModelResolver modelResolver;
-    
-    // FIXME remove this dependency on Java ClassLoaders
-    private ClassLoader classLoader;
-
-    ContributionImpl() {
-    }
-    
-    public String getLocation() {
-        return this.location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    //FIXME Remove dependency on Java ClassLoaders
-    public ClassLoader getClassLoader() {
-        return classLoader;
-    }
-    
-    //FIXME Remove dependency on Java ClassLoaders
-    public void setClassLoader(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
-    
-    
-    public String getURI() {
-        return this.uri;
-    }
-    
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public Object getModel() {
-        return model;
-    }
-    
-    public void setModel(Object model) {
-        this.model = model;
-    }
-    
-    public byte[] getContents() {
-        return contents;
-    }
-    
-    public void setContents(byte[] contents) {
-        this.contents = contents;
-    }
-    
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-    public List<Export> getExports() {
-        return exports;
-    }
-
-    public List<Import> getImports() {
-        return imports;
-    }
-
-    public List<Composite> getDeployables() {
-        return deployables;
-    }
-
-    public List<Artifact> getArtifacts() {
-        return artifacts;
-    }
-
-    @Override
-    public int hashCode() {
-        return uri.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else {
-            if (obj instanceof Artifact) {
-                return uri.equals(((Artifact)obj).getURI());
-            } else {
-                return false;
-            }
-        }
-    }
-
-    @Override
-    public String toString() {
-    	return "Contribution : " + uri + " \n" +
-    	       "from: " + location;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
deleted file mode 100644
index 75b12b1260..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.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.contribution.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-
-/**
- * The representation of a deployed contribution
- *
- * @version $Rev$ $Date$
- */
-class ContributionMetadataImpl implements ContributionMetadata {
-    private boolean unresolved;
-    private List<Export> exports = new ArrayList<Export>();
-    private List<Import> imports = new ArrayList<Import>();
-    private List<Composite> deployables = new ArrayList<Composite>();
-
-    ContributionMetadataImpl() {
-    }
-    
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-    
-    public List<Export> getExports() {
-        return exports;
-    }
-
-    public List<Import> getImports() {
-        return imports;
-    }
-
-    public List<Composite> getDeployables() {
-        return deployables;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
deleted file mode 100644
index e67395337a..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.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.contribution.impl;
-
-import org.apache.tuscany.sca.contribution.DefaultExport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * The representation of an export for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultExportImpl implements DefaultExport {
-    private ModelResolver modelResolver;
-    
-    protected DefaultExportImpl() {
-        super();
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
deleted file mode 100644
index 17c09f2cbc..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.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.contribution.impl;
-
-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.resolver.ModelResolver;
-
-/**
- * The representation of an import for the contribution
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultImportImpl implements DefaultImport {
-    private ModelResolver modelResolver;
-
-    protected DefaultImportImpl() {
-        super();
-    }
-    
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-
-    
-    public boolean match(Export export) {
-        if (export instanceof DefaultExport) {
-            return true;
-        }
-        return false;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
deleted file mode 100644
index b5f536c431..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.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.contribution.processor;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-
-/**
- * Base interface for artifact processors.
- * 
- * @version $Rev$ $Date$
- */
-public interface ArtifactProcessor<M> {
-    
-    /**
-     * Resolve references from this model to other models. For example references
-     * from a composite to another one, or references from a composite to a WSDL
-     * model.
-     * 
-     * @param model The model to resolve
-     * @param resolver The resolver to use to resolve referenced models
-     */
-    void resolve(M model, ModelResolver resolver) throws ContributionResolveException;
-    
-    /**
-     * Returns the type of model handled by this artifact processor.
-     * 
-     * @return The type of model handled by this artifact processor
-     */
-    Class<M> getModelType(); 
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
deleted file mode 100644
index 029df61f0f..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.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.processor;
-
-/**
- * An extension point for artifact processors.
- * 
- * @version $Rev$ $Date$
- */
-public interface ArtifactProcessorExtensionPoint<P extends ArtifactProcessor> {
-
-    /**
-     * Add an artifact processor.
-     * 
-     * @param artifactProcessor The artifact processor to add
-     */
-    void addArtifactProcessor(P artifactProcessor);
-
-    /**
-     * Remove an artifact processor.
-     * 
-     * @param artifactProcessor The artifact processor to remove
-     */
-    void removeArtifactProcessor(P artifactProcessor);
-
-    /**
-     * Returns the processor associated with the given artifact type.
-     * 
-     * @param artifactType An artifact type
-     * @return The processor associated with the given artifact type
-     */
-    P getProcessor(Object artifactType);
-    
-    /**
-     * Returns the processor associated with the given model type.
-     * 
-     * @param modelType A model type
-     * @return The processor associated with the given model type
-     */
-    P getProcessor(Class<?> modelType);
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
deleted file mode 100644
index 68a73945c5..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.processor;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-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;
-
-
-/**
- * A base class with utility methods for the other artifact processors in this module. 
- * 
- * @version $Rev$ $Date$
- */
-public abstract class BaseStAXArtifactProcessor {
-
-    /**
-     * Returns a QName from a string.  
-     * @param reader
-     * @param value
-     * @return
-     */
-    protected 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;
-        }
-    }
-
-    /**
-     * Returns the boolean value of an attribute.
-     * @param reader
-     * @param name
-     * @return
-     */
-    protected boolean getBoolean(XMLStreamReader reader, String name) {
-        String value = reader.getAttributeValue(null, name);
-        if (value == null) {
-            return false;
-        }
-        return Boolean.valueOf(value);
-    }
-
-    /**
-     * Returns the QName value of an attribute.
-     * @param reader
-     * @param name
-     * @return
-     */
-    protected QName getQName(XMLStreamReader reader, String name) {
-        String qname = reader.getAttributeValue(null, name);
-        return getQNameValue(reader, qname);
-    }
-
-    /**
-     * Returns the value of an attribute as a list of QNames.
-     * @param reader
-     * @param name
-     * @return
-     */
-    protected List<QName> getQNames(XMLStreamReader reader, String name) {
-        String value = reader.getAttributeValue(null, name);
-        if (value != null) {
-            List<QName> qnames = new ArrayList<QName>();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                qnames.add(getQName(reader, tokens.nextToken()));
-            }
-            return qnames;
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    /**
-     * Returns the string value of an attribute.
-     * @param reader
-     * @param name
-     * @return
-     */
-    protected String getString(XMLStreamReader reader, String name) {
-        return reader.getAttributeValue(null, name);
-    }
-
-    /**
-     * Test if an attribute is explicitly set
-     * @param reader
-     * @param name
-     * @return
-     */
-    protected boolean isSet(XMLStreamReader reader, String name) {
-        return reader.getAttributeValue(null, name) != null;
-    }
-
-    /**
-     * Returns the value of xsi:type attribute
-     * @param reader The XML stream reader
-     * @return The QName of the type, if the attribute is not present, null is
-     *         returned.
-     */
-    protected QName getXSIType(XMLStreamReader reader) {
-        String qname = reader.getAttributeValue(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type");
-        return getQNameValue(reader, qname);
-    }
-
-    /**
-     * Parse the next child element.
-     * @param reader
-     * @return
-     * @throws XMLStreamException
-     */
-    protected boolean nextChildElement(XMLStreamReader reader) throws XMLStreamException {
-        while (reader.hasNext()) {
-            int event = reader.next();
-            if (event == END_ELEMENT) {
-                return false;
-            }
-            if (event == START_ELEMENT) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Advance the stream to the next END_ELEMENT event skipping any nested
-     * content.
-     * @param reader the reader to advance
-     * @throws XMLStreamException if there was a problem reading the stream
-     */
-    protected void skipToEndElement(XMLStreamReader reader) throws XMLStreamException {
-        int depth = 0;
-        while (reader.hasNext()) {
-            int event = reader.next();
-            if (event == XMLStreamConstants.START_ELEMENT) {
-                depth++;
-            } else if (event == XMLStreamConstants.END_ELEMENT) {
-                if (depth == 0) {
-                    return;
-                }
-                depth--;
-            }
-        }
-    }
-    
-    /**
-     * 
-     * @param writer
-     * @param uri
-     * @throws XMLStreamException
-     */
-    private String writeElementPrefix(XMLStreamWriter writer, String uri) throws XMLStreamException {
-        if (uri == null) {
-            return null;
-        }
-        String prefix = writer.getPrefix(uri);
-        if (prefix != null) {
-            return null;
-        } else {
-            
-            // Find an available prefix and bind it to the given URI 
-            NamespaceContext nsc = writer.getNamespaceContext();
-            for (int i=1; ; i++) {
-                prefix = "ns" + i;
-                if (nsc.getNamespaceURI(prefix) == null) {
-                    break;
-                }
-            }
-            writer.setPrefix(prefix, uri);
-            return prefix;
-        }
-        
-    }
-
-    /**
-     * Start an element.
-     * @param uri
-     * @param name
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeStart(XMLStreamWriter writer, String uri, String name, XAttr... attrs) throws XMLStreamException {
-        String prefix = writeElementPrefix(writer, uri);
-        writer.writeStartElement(uri, name);
-        if (prefix != null){
-            writer.writeNamespace(prefix,uri); 
-        }
-        writeAttributePrefixes(writer, attrs);
-        writeAttributes(writer, attrs);
-    }
-    
-    /**
-     * Start an element.
-     * @param qname
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeStart(XMLStreamWriter writer, QName qname, XAttr... attrs) throws XMLStreamException {
-        writeStart(writer, qname.getNamespaceURI(), qname.getLocalPart(), attrs);
-    }
-    
-    /**
-     * End an element. 
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void writeEnd(XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeEndElement();
-    }
-
-    /**
-     * Start a document.
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void writeStartDocument(XMLStreamWriter writer, String uri, String name, XAttr... attrs) throws XMLStreamException {
-        writer.writeStartDocument();
-        writer.setDefaultNamespace(uri);
-        writeStart(writer, uri, name, attrs);
-        writer.writeDefaultNamespace(uri);
-    }
-
-    /**
-     * Start a document.
-     * @param writer
-     * @param qname
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeStartDocument(XMLStreamWriter writer, QName qname, XAttr... attrs) throws XMLStreamException {
-        writeStartDocument(writer, qname.getNamespaceURI(), qname.getLocalPart(), attrs);
-    }
-
-    /**
-     * End a document.
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void writeEndDocument(XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeEndDocument();
-    }
-
-    /**
-     * Write attributes to the current element.
-     * @param writer
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeAttributes(XMLStreamWriter writer, XAttr... attrs) throws XMLStreamException {
-        for (XAttr attr : attrs) {
-            if (attr != null)
-                attr.write(writer);
-        }
-    }
-
-    /**
-     * Write attribute prefixes to the current element.
-     * @param writer
-     * @param attrs
-     * @throws XMLStreamException
-     */
-    protected void writeAttributePrefixes(XMLStreamWriter writer, XAttr... attrs) throws XMLStreamException {
-        for (XAttr attr : attrs) {
-            if (attr != null)
-                attr.writePrefix(writer);
-        }
-    }
-
-    /**
-     * Represents an XML attribute that needs to be written to a document.
-     */
-    public static class XAttr {
-        
-        private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-
-        private String uri = SCA10_NS;
-        private String name;
-        private Object value;
-
-        public XAttr(String uri, String name, String value) {
-            this.uri = uri;
-            this.name = name;
-            this.value = value;
-        }
-
-        public XAttr(String name, String value) {
-            this(null, name, value);
-        }
-
-        public XAttr(String uri, String name, List<?> values) {
-            this.uri = uri;
-            this.name = name;
-            this.value = values;
-        }
-
-        public XAttr(String name, List<?> values) {
-            this(null, name, values);
-        }
-
-        public XAttr(String uri, String name, Boolean value) {
-            this.uri = uri;
-            this.name = name;
-            this.value = value;
-        }
-
-        public XAttr(String name, Boolean value) {
-            this(null, name, value);
-        }
-
-        public XAttr(String uri, String name, QName value) {
-            this.uri = uri;
-            this.name = name;
-            this.value = value;
-        }
-
-        public XAttr(String name, QName value) {
-            this(null, name, value);
-        }
-
-        /**
-         * Writes a string from a QName and registers a prefix for its namespace.  
-         * @param reader
-         * @param value
-         * @return
-         */
-        private String writeQNameValue(XMLStreamWriter writer, QName qname) throws XMLStreamException {
-            if (qname != null) {
-                String prefix = qname.getPrefix();
-                String uri = qname.getNamespaceURI();
-                prefix = writer.getPrefix(uri);
-                if (prefix != null) {
-
-                    // Use the prefix already bound to the given URI
-                    if (prefix.length() > 0) {
-                        return prefix + ":" + qname.getLocalPart();
-                    } else {
-                        
-                        // Empty prefix, just return the local part of the given qname
-                        return qname.getLocalPart();
-                    }
-                    
-                } else {
-                    
-                    // Find an available prefix and bind it to the given URI 
-                    NamespaceContext nsc = writer.getNamespaceContext();
-                    for (int i=1; ; i++) {
-                        prefix = "ns" + i;
-                        if (nsc.getNamespaceURI(prefix) == null) {
-                            break;
-                        }
-                    }
-                    writer.setPrefix(prefix, uri);
-                    writer.writeNamespace(prefix, uri);
-                    return prefix + ":" + qname.getLocalPart();
-                }
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * Registers a prefix for the namespace of a QName.  
-         * @param reader
-         * @param value
-         * @return
-         */
-        private void writeQNamePrefix(XMLStreamWriter writer, QName qname) throws XMLStreamException {
-            if (qname != null) {
-                String prefix = qname.getPrefix();
-                String uri = qname.getNamespaceURI();
-                prefix = writer.getPrefix(uri);
-                if (prefix != null) {
-                    return;
-                } else {
-                    
-                    // Find an available prefix and bind it to the given URI 
-                    NamespaceContext nsc = writer.getNamespaceContext();
-                    for (int i=1; ; i++) {
-                        prefix = "ns" + i;
-                        if (nsc.getNamespaceURI(prefix) == null) {
-                            break;
-                        }
-                    }
-                    writer.setPrefix(prefix, uri);
-                    writer.writeNamespace(prefix, uri);
-                }
-            }
-        }
-
-        /**
-         * Write to document
-         * @param writer
-         * @throws XMLStreamException
-         */
-        public void write(XMLStreamWriter writer) throws XMLStreamException {
-            String str;
-            if (value instanceof QName) {
-                
-                // Write a QName
-                str = writeQNameValue(writer, (QName)value);
-                
-            } else if (value instanceof List) {
-                
-                // Write a list of values
-                List<?> values = (List<?>)value;
-                if (values.isEmpty()) {
-                    return;
-                }
-                StringBuffer buffer = new StringBuffer();
-                for (Object v: values) {
-                    if (v == null) {
-                        // Skip null values
-                        continue;
-                    }
-                    
-                    if (v instanceof XAttr) {
-                        // Write an XAttr value
-                        ((XAttr)v).write(writer);
-                        continue;
-                    }
-
-                    if (buffer.length() != 0) {
-                        buffer.append(' ');
-                    }
-                    if (v instanceof QName) {
-                        // Write a QName value
-                        buffer.append(writeQNameValue(writer, (QName)v));
-                    } else {
-                        // Write value as a string 
-                        buffer.append(String.valueOf(v));
-                    }
-                }
-                str = buffer.toString();
-                
-            } else {
-                
-                // Write a string
-                if (value == null) {
-                    return;
-                }
-                str = String.valueOf(value);
-            }
-            if (str.length() == 0) {
-                return;
-            }
-
-            // Write the attribute
-            if (uri != null && !uri.equals(SCA10_NS)) {
-                writer.writeAttribute(uri, name, str);
-            } else {
-                writer.writeAttribute(name,str);
-            }
-        }
-
-        /**
-         * Registers a prefix for the namespace of a QName or list of QNames 
-         * @param writer
-         * @throws XMLStreamException
-         */
-        public void writePrefix(XMLStreamWriter writer) throws XMLStreamException {
-            if (value instanceof QName) {
-                
-                // Write prefix for a single QName value
-                writeQNamePrefix(writer, (QName)value);
-                
-            } else if (value instanceof List) {
-                
-                // Write prefixes for a list of values
-                for (Object v: (List<?>)value) {
-                    if (v instanceof QName) {
-                        // Write prefix for a QName value
-                        writeQNamePrefix(writer, (QName)v);
-                        
-                    } else if (v instanceof XAttr) {
-                        // Write prefix for an XAttr value
-                        ((XAttr)v).writePrefix(writer);
-                    }
-                }
-            }
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
deleted file mode 100644
index 3c67a8c550..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.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.contribution.processor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The default implementation of an artifact processor extension point.
- * 
- * @version $Rev$ $Date$
- */
-abstract class DefaultArtifactProcessorExtensionPoint<P> {
-    protected final Map<Object, P> processorsByArtifactType = new HashMap<Object, P>();
-    protected final Map<Class<?>, P> processorsByModelType = new HashMap<Class<?>, P>();
-
-    /**
-     * Constructs a new loader registry.
-     */
-    DefaultArtifactProcessorExtensionPoint() {
-    }
-
-    /**
-     * Returns the processor associated with the given artifact type.
-     * 
-     * @param artifactType An artifact type
-     * @return The processor associated with the given artifact type
-     */
-    public P getProcessor(Object artifactType) {
-        return processorsByArtifactType.get(artifactType);
-    }
-
-    /**
-     * Returns the processor associated with the given model type.
-     * 
-     * @param modelType A model type
-     * @return The processor associated with the given model type
-     */
-    public P getProcessor(Class<?> modelType) {
-        Class<?>[] classes = modelType.getInterfaces();
-        for (Class<?> c : classes) {
-            P processor = processorsByModelType.get(c);
-            if (processor != null) {
-                return processor;
-            }
-        }
-        return processorsByModelType.get(modelType);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
deleted file mode 100644
index 426d7beb29..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.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.contribution.processor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of a package processor extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultPackageProcessorExtensionPoint implements PackageProcessorExtensionPoint {
-
-    private Map<String, PackageProcessor> processors = new HashMap<String, PackageProcessor>();
-    private boolean loaded;
-
-    public DefaultPackageProcessorExtensionPoint() {
-    }
-
-    public void addPackageProcessor(PackageProcessor processor) {
-        processors.put(processor.getPackageType(), processor);
-    }
-
-    public void removePackageProcessor(PackageProcessor processor) {
-        processors.remove(processor.getPackageType());
-    }
-
-    public PackageProcessor getPackageProcessor(String contentType) {
-        loadProcessors();
-        return processors.get(contentType);
-    }
-
-    private void loadProcessors() {
-        if (loaded)
-            return;
-
-        // Get the processor service declarations
-        Set<ServiceDeclaration> processorDeclarations; 
-        try {
-            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(PackageProcessor.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        for (ServiceDeclaration processorDeclaration: processorDeclarations) {
-            Map<String, String> attributes = processorDeclaration.getAttributes();
-            
-            // Load a URL artifact processor
-            String packageType = attributes.get("type");
-            
-            // Create a processor wrapper and register it
-            PackageProcessor processor = new LazyPackageProcessor(packageType, processorDeclaration);
-            addPackageProcessor(processor);
-        }
-        
-        loaded = true;
-    }
-
-    /**
-     * A facade for package processors.
-     */
-    private static class LazyPackageProcessor implements PackageProcessor {
-        
-        private ServiceDeclaration processorDeclaration;
-        private String packageType;
-        private PackageProcessor processor;
-        
-        private LazyPackageProcessor(String packageType, ServiceDeclaration processorDeclaration) {
-            this.processorDeclaration = processorDeclaration;
-            this.packageType = packageType;
-        }
-
-        public URL getArtifactURL(URL packageSourceURL, URI artifact) throws MalformedURLException {
-            return getProcessor().getArtifactURL(packageSourceURL, artifact);
-        }
-
-        public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException {
-            return getProcessor().getArtifacts(packageSourceURL, inputStream);
-        }
-
-        public String getPackageType() {
-            return packageType;
-        }
-        
-        @SuppressWarnings("unchecked")
-        private PackageProcessor getProcessor() {
-            if (processor == null) {
-                try {
-                    Class<PackageProcessor> processorClass = (Class<PackageProcessor>)processorDeclaration.loadClass();
-                    Constructor<PackageProcessor> constructor = processorClass.getConstructor();
-                    processor = constructor.newInstance();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return processor;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
deleted file mode 100644
index bfd0be4541..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.processor;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-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.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-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;
-
-/**
- * The default implementation of an extension point for StAX artifact processors.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultStAXArtifactProcessorExtensionPoint extends
-    DefaultArtifactProcessorExtensionPoint<StAXArtifactProcessor> implements StAXArtifactProcessorExtensionPoint {
-
-    private ExtensionPointRegistry extensionPoints;
-    private ModelFactoryExtensionPoint modelFactories;
-    private MonitorFactory monitorFactory;
-    private boolean loaded;
-    private StAXArtifactProcessor<Object> extensibleStAXProcessor;
-    private Monitor monitor = null;
-
-    /**
-     * Constructs a new extension point.
-     */
-    public DefaultStAXArtifactProcessorExtensionPoint(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        UtilityExtensionPoint utilities = this.extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        if (monitorFactory != null)
-        	this.monitor = monitorFactory.createMonitor();
-        this.extensibleStAXProcessor = new ExtensibleStAXArtifactProcessor(this, inputFactory, outputFactory, this.monitor);
-    }
-    
-    /**
-     * 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-validation-messages", Severity.ERROR, model, message, ex);
-    	    monitor.problem(problem);
-    	}        
-    }
-
-    public void addArtifactProcessor(StAXArtifactProcessor artifactProcessor) {
-        if (artifactProcessor.getArtifactType() != null) {
-            processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), artifactProcessor);
-        }
-        if (artifactProcessor.getModelType() != null) {
-            processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
-        }
-    }
-
-    public void removeArtifactProcessor(StAXArtifactProcessor artifactProcessor) {
-        if (artifactProcessor.getArtifactType() != null) {
-            processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
-        }
-        if (artifactProcessor.getModelType() != null) {
-            processorsByModelType.remove(artifactProcessor.getModelType());
-        }
-    }
-
-    @Override
-    public StAXArtifactProcessor getProcessor(Class<?> modelType) {
-        loadArtifactProcessors();
-        return super.getProcessor(modelType);
-    }
-
-    @Override
-    public StAXArtifactProcessor getProcessor(Object artifactType) {
-        loadArtifactProcessors();
-        return super.getProcessor(artifactType);
-    }
-
-    /**
-     * Returns a QName object from a QName expressed as {ns}name
-     * or ns#name.
-     * 
-     * @param qname
-     * @return
-     */
-    private static QName getQName(String qname) {
-        if (qname == null) {
-            return null;
-        }
-        qname = qname.trim();
-        if (qname.startsWith("{")) {
-            int h = qname.indexOf('}');
-            if (h != -1) {
-                return new QName(qname.substring(1, h), qname.substring(h + 1));
-            }
-        } else {
-            int h = qname.indexOf('#');
-            if (h != -1) {
-                return new QName(qname.substring(0, h), qname.substring(h + 1));
-            }
-        }
-        throw new IllegalArgumentException("Invalid qname: "+qname);
-    }
-
-    /**
-     * Lazily load artifact processors registered in the extension point.
-     */
-    private void loadArtifactProcessors() {
-        if (loaded)
-            return;
-
-        // Get the processor service declarations
-        Set<ServiceDeclaration> processorDeclarations;
-        try {
-            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(StAXArtifactProcessor.class);
-        } catch (IOException e) {
-        	IllegalStateException ie = new IllegalStateException(e);
-        	error("IllegalStateException", extensibleStAXProcessor, ie);
-            throw ie;
-        }
-
-        for (ServiceDeclaration processorDeclaration : processorDeclarations) {
-            Map<String, String> attributes = processorDeclaration.getAttributes();
-
-            // Load a StAX artifact processor
-
-            // Get the model QName
-            QName artifactType = getQName(attributes.get("qname"));
-
-            // Get the model class name
-            String modelTypeName = attributes.get("model");
-
-            // Get the model factory class name 
-            String factoryName = attributes.get("factory");
-
-            // Create a processor wrapper and register it
-            StAXArtifactProcessor processor =
-                new LazyStAXArtifactProcessor(artifactType, modelTypeName, factoryName,
-                                              processorDeclaration, extensionPoints, modelFactories, 
-                                              extensibleStAXProcessor, monitor);
-            addArtifactProcessor(processor);
-        }
-
-        loaded = true;
-    }
-
-    /**
-     * A wrapper around an Artifact processor class allowing lazy loading and
-     * initialization of artifact processors.
-     */
-    private static class LazyStAXArtifactProcessor implements StAXArtifactProcessor {
-
-        private ExtensionPointRegistry extensionPoints;
-        private QName artifactType;
-        private String modelTypeName;
-        private String factoryName;
-        private ServiceDeclaration processorDeclaration;
-        private StAXArtifactProcessor processor;
-        private Class<?> modelType;
-        private StAXArtifactProcessor<Object> extensionProcessor;
-        private Monitor monitor;
-
-        LazyStAXArtifactProcessor(QName artifactType,
-                                  String modelTypeName,
-                                  String factoryName,
-                                  ServiceDeclaration processorDeclaration,
-                                  ExtensionPointRegistry extensionPoints,
-                                  ModelFactoryExtensionPoint modelFactories,
-                                  StAXArtifactProcessor<Object> extensionProcessor,
-                                  Monitor monitor) {
-
-            this.extensionPoints = extensionPoints;
-            this.artifactType = artifactType;
-            this.modelTypeName = modelTypeName;
-            this.factoryName = factoryName;
-            this.processorDeclaration = processorDeclaration;
-            this.extensionProcessor = extensionProcessor;
-            this.monitor = monitor;
-        }
-
-        public QName getArtifactType() {
-            return artifactType;
-        }
-        
-        private void error(String message, Object model, Exception ex) {
-            if (monitor != null) {
-        	    Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex);
-        	    monitor.problem(problem);
-        	}        
-        }
-
-        @SuppressWarnings("unchecked")
-        private StAXArtifactProcessor getProcessor() {
-            if (processor == null) {
-
-                if (processorDeclaration.getClassName()
-                    .equals("org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor")) {
-
-                    // Specific initialization for the DefaultBeanModelProcessor
-                    ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-                    AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-                    PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
-                    try {
-                        Class<StAXArtifactProcessor> processorClass =
-                            (Class<StAXArtifactProcessor>)processorDeclaration.loadClass();
-                        Object modelFactory;
-                        if (factoryName != null) {
-                            Class<?> factoryClass = (Class<?>)processorDeclaration.loadClass(factoryName);
-                            modelFactory = modelFactories.getFactory(factoryClass);
-                        } else {
-                            modelFactory = null;
-                        }
-                        Constructor<StAXArtifactProcessor> constructor =
-                            processorClass.getConstructor(AssemblyFactory.class,
-                                                          PolicyFactory.class,
-                                                          QName.class,
-                                                          Class.class,
-                                                          Object.class,
-                                                          Monitor.class);
-                        processor =
-                            constructor.newInstance(assemblyFactory,
-                                                    policyFactory,
-                                                    artifactType,
-                                                    getModelType(),
-                                                    modelFactory,
-                                                    monitor);
-                    } catch (Exception e) {
-                    	IllegalStateException ie = new IllegalStateException(e);
-                    	error("IllegalStateException", processor, ie);
-                        throw ie;
-                    }
-                } else {
-                    ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-
-                    // Load and instantiate the processor class
-                    try {
-                        Class<StAXArtifactProcessor> processorClass =
-                            (Class<StAXArtifactProcessor>)processorDeclaration.loadClass();
-                        try {
-                            Constructor<StAXArtifactProcessor> constructor =
-                                processorClass.getConstructor(ModelFactoryExtensionPoint.class, Monitor.class);
-                            processor = constructor.newInstance(modelFactories, monitor);
-                        } catch (NoSuchMethodException e) {
-                          try {
-                              Constructor<StAXArtifactProcessor> constructor =
-                                  processorClass.getConstructor(ExtensionPointRegistry.class, Monitor.class);
-                              processor = constructor.newInstance(extensionPoints, monitor);
-                          } catch (NoSuchMethodException e1) {
-                            try {
-                                Constructor<StAXArtifactProcessor> constructor =
-                                    processorClass.getConstructor(ModelFactoryExtensionPoint.class, StAXArtifactProcessor.class, Monitor.class);
-                                processor = constructor.newInstance(modelFactories, extensionProcessor, monitor);
-                            } catch (NoSuchMethodException e2) {
-                                try {
-                                    Constructor<StAXArtifactProcessor> constructor =
-                                        processorClass.getConstructor(ExtensionPointRegistry.class, StAXArtifactProcessor.class, Monitor.class);
-                                    processor = constructor.newInstance(extensionPoints, extensionProcessor, monitor);
-                                } catch (NoSuchMethodException e3) {
-                                    try {
-                                        Constructor<StAXArtifactProcessor> constructor =
-                                            processorClass.getConstructor(ModelFactoryExtensionPoint.class);
-                                        processor = constructor.newInstance(modelFactories);
-                                    } catch (NoSuchMethodException e4) {
-                                      try {
-                                          Constructor<StAXArtifactProcessor> constructor =
-                                              processorClass.getConstructor(ExtensionPointRegistry.class);
-                                          processor = constructor.newInstance(extensionPoints);
-                                      } catch (NoSuchMethodException e4a) {
-                                        try {
-                                            Constructor<StAXArtifactProcessor> constructor =
-                                                processorClass.getConstructor(ModelFactoryExtensionPoint.class, StAXArtifactProcessor.class);
-                                            processor = constructor.newInstance(modelFactories, extensionProcessor);
-                                        } catch (NoSuchMethodException e5) {
-                                            Constructor<StAXArtifactProcessor> constructor =
-                                                processorClass.getConstructor(ExtensionPointRegistry.class, StAXArtifactProcessor.class);
-                                            processor = constructor.newInstance(extensionPoints, extensionProcessor);
-                                        }
-                                      }
-                                    }
-                                }
-                            }
-                          }
-                        }
-                    } catch (Exception e) {
-                    	IllegalStateException ie = new IllegalStateException(e);
-                    	error("IllegalStateException", processor, ie);
-                        throw ie;
-                    }
-                }
-            }
-            return processor;
-        }
-
-        public Object read(XMLStreamReader inputSource) throws ContributionReadException, XMLStreamException {
-            return getProcessor().read(inputSource);
-        }
-
-        @SuppressWarnings("unchecked")
-        public void write(Object model, XMLStreamWriter outputSource) throws ContributionWriteException,
-            XMLStreamException {
-            getProcessor().write(model, outputSource);
-        }
-
-        public Class<?> getModelType() {
-            if (modelTypeName != null && modelType == null) {
-                try {
-                    modelType = processorDeclaration.loadClass(modelTypeName);
-                } catch (Exception e) {
-                	IllegalStateException ie = new IllegalStateException(e);
-                	error("IllegalStateException", processorDeclaration, ie);
-                    throw ie;
-                }
-            }
-            return modelType;
-        }
-
-        @SuppressWarnings("unchecked")
-        public void resolve(Object model, ModelResolver resolver) throws ContributionResolveException {
-            getProcessor().resolve(model, resolver);
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
deleted file mode 100644
index b27404271e..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.processor;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.net.URI;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- * The default implementation of a URL artifact processor extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultURLArtifactProcessorExtensionPoint
-    extends DefaultArtifactProcessorExtensionPoint<URLArtifactProcessor>
-    implements URLArtifactProcessorExtensionPoint {
-    
-    private ExtensionPointRegistry extensionPoints;
-    private StAXArtifactProcessor<?> staxProcessor;
-    private boolean loaded;
-    private Monitor monitor = null;
-
-    /**
-     * Constructs a new extension point.
-     */
-    public DefaultURLArtifactProcessorExtensionPoint(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        ModelFactoryExtensionPoint modelFactories = this.extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        UtilityExtensionPoint utilities = this.extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        if (monitorFactory != null) 
-        	this.monitor = monitorFactory.createMonitor();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, this.monitor);
-    }
-    
-    /**
-     * 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-validation-messages", Severity.ERROR, model, message, ex);
-    	    monitor.problem(problem);
-    	}        
-    }
-    
-    public void addArtifactProcessor(URLArtifactProcessor artifactProcessor) {
-        if (artifactProcessor.getArtifactType() != null) {
-            processorsByArtifactType.put((Object)artifactProcessor.getArtifactType(), artifactProcessor);
-        }
-        if (artifactProcessor.getModelType() != null) {
-            processorsByModelType.put(artifactProcessor.getModelType(), artifactProcessor);
-        }
-    }
-    
-    public void removeArtifactProcessor(URLArtifactProcessor artifactProcessor) {
-        if (artifactProcessor.getArtifactType() != null) {
-            processorsByArtifactType.remove((Object)artifactProcessor.getArtifactType());
-        }
-        if (artifactProcessor.getModelType() != null) {
-            processorsByModelType.remove(artifactProcessor.getModelType());
-        }
-    }
-    
-    @Override
-    public URLArtifactProcessor getProcessor(Class<?> modelType) {
-        loadProcessors();
-        return super.getProcessor(modelType);
-    }
-    
-    @Override
-    public URLArtifactProcessor getProcessor(Object artifactType) {
-        loadProcessors();
-        return super.getProcessor(artifactType);
-    }
-
-    /**
-     * Lazily load artifact processors registered in the extension point.
-     */
-    private void loadProcessors() {
-        if (loaded)
-            return;
-
-        // Get the processor service declarations
-        Set<ServiceDeclaration> processorDeclarations; 
-        try {
-            processorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(URLArtifactProcessor.class);
-        } catch (IOException e) {
-        	IllegalStateException ie = new IllegalStateException(e);
-        	error("IllegalStateException", staxProcessor, ie);
-            throw ie;
-        }
-        
-        for (ServiceDeclaration processorDeclaration: processorDeclarations) {
-            Map<String, String> attributes = processorDeclaration.getAttributes();
-            // Load a URL artifact processor
-            String artifactType = attributes.get("type");
-            String modelTypeName = attributes.get("model");
-            
-            // Create a processor wrapper and register it
-            URLArtifactProcessor processor = new LazyURLArtifactProcessor(artifactType, modelTypeName, 
-            		processorDeclaration, extensionPoints, staxProcessor, monitor);
-            addArtifactProcessor(processor);
-        }
-        
-        loaded = true;
-    }
-
-    /**
-     * A wrapper around an Artifact processor class allowing lazy loading and
-     * initialization of artifact processors.
-     */
-    private static class LazyURLArtifactProcessor implements URLArtifactProcessor {
-
-        private ExtensionPointRegistry extensionPoints;
-        private String artifactType;
-        private String modelTypeName;
-        private ServiceDeclaration processorDeclaration;
-        private URLArtifactProcessor processor;
-        private Class<?> modelType;
-        private StAXArtifactProcessor<?> staxProcessor;
-        private Monitor monitor;
-        
-        LazyURLArtifactProcessor(String artifactType, 
-        		String modelTypeName, 
-        		ServiceDeclaration processorDeclaration,
-        		ExtensionPointRegistry extensionPoints, 
-                        StAXArtifactProcessor<?> staxProcessor,
-                        Monitor monitor) {
-            this.artifactType = artifactType;
-            this.modelTypeName = modelTypeName;
-            this.processorDeclaration = processorDeclaration;
-            this.extensionPoints = extensionPoints;
-            this.staxProcessor = staxProcessor;
-            this.monitor = monitor;
-        }
-
-        public String getArtifactType() {
-            return artifactType;
-        }
-        
-        private void error(String message, Object model, Exception ex) {
-            if (monitor != null) {
-        	    Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex);
-        	    monitor.problem(problem);
-        	}        
-        }
-        
-        @SuppressWarnings("unchecked")
-        private URLArtifactProcessor getProcessor() {
-            if (processor == null) {
-                try {
-                    ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-                    Class<URLArtifactProcessor> processorClass = (Class<URLArtifactProcessor>)processorDeclaration.loadClass();
-                    try {
-                        Constructor<URLArtifactProcessor> constructor = processorClass.getConstructor(ModelFactoryExtensionPoint.class, Monitor.class);
-                        processor = constructor.newInstance(modelFactories, monitor);
-                    } catch (NoSuchMethodException e) {
-                        try {
-                            Constructor<URLArtifactProcessor> constructor = processorClass.getConstructor(ModelFactoryExtensionPoint.class, StAXArtifactProcessor.class, Monitor.class);
-                            processor = constructor.newInstance(modelFactories, staxProcessor, monitor);
-                        } catch (NoSuchMethodException e2) {
-                            Constructor<URLArtifactProcessor> constructor = processorClass.getConstructor(ExtensionPointRegistry.class, StAXArtifactProcessor.class, Monitor.class);
-                            processor = constructor.newInstance(extensionPoints, staxProcessor, monitor);
-                        }
-                    }
-                } catch (Exception e) {
-                	IllegalStateException ie = new IllegalStateException(e);
-                	error("IllegalStateException", processor, ie);
-                    throw ie;
-                }
-            }
-            return processor;
-        }
-
-        public Object read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
-            return getProcessor().read(contributionURL, artifactURI, artifactURL);
-        }
-        
-        public Class<?> getModelType() {
-            if (modelTypeName != null && modelType == null) {
-                try {
-                    modelType = processorDeclaration.loadClass(modelTypeName);
-                } catch (ClassNotFoundException e) {
-                	IllegalStateException ie = new IllegalStateException(e);
-                	error("IllegalStateException", processorDeclaration, ie);
-                    throw ie;
-                }
-            }
-            return modelType;
-        }
-
-        @SuppressWarnings("unchecked")
-        public void resolve(Object model, ModelResolver resolver) throws ContributionResolveException {
-            getProcessor().resolve(model, resolver);
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
deleted file mode 100644
index f237ba69f2..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.processor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.List;
-
-import javax.xml.XMLConstants;
-import javax.xml.stream.EventFilter;
-import javax.xml.stream.StreamFilter;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLReporter;
-import javax.xml.stream.XMLResolver;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.util.XMLEventAllocator;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * Default implementation of an XMLInputFactory that creates validating
- * XMLStreamReaders.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory {
-    
-    private XMLInputFactory inputFactory;
-    private ValidationSchemaExtensionPoint schemas;
-    private Monitor monitor;
-    private boolean initialized;
-    private boolean hasSchemas;
-    private Schema aggregatedSchema;
-
-    /**
-     * Constructs a new XMLInputFactory.
-     * 
-     * @param inputFactory
-     * @param schemas
-     */
-    public DefaultValidatingXMLInputFactory(XMLInputFactory inputFactory, ValidationSchemaExtensionPoint schemas, Monitor monitor) {
-        this.inputFactory = inputFactory;
-        this.schemas = schemas;
-        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 = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-    
-    /**
-     * Initialize the registered schemas and create an aggregated schema for
-     * validation.
-     */
-    private void initializeSchemas() {
-        if (initialized) {
-            return;
-        }
-        initialized = true;
-        
-        // Load the XSDs registered in the validation schema extension point
-        try {
-            List<String> uris = schemas.getSchemas();
-            int n = uris.size();
-            if (n ==0) {
-                return;
-            } else {
-                hasSchemas = true;
-            }
-            final Source[] sources = new Source[n];
-            for (int i =0; i < n; i++) {
-                final String uri = uris.get(i);
-                // Allow privileged access to open URL stream. Requires FilePermission in security policy.
-                final URL url = new URL( uri );
-                InputStream urlStream;
-                try {
-                    urlStream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-                        public InputStream run() throws IOException {
-                            URLConnection connection = url.openConnection();
-                            connection.setUseCaches(false);
-                            return connection.getInputStream();
-                        }
-                    });
-                } catch (PrivilegedActionException e) {
-                	error("PrivilegedActionException", url, (IOException)e.getException());
-                    throw (IOException)e.getException();
-                }
-                sources[i] = new StreamSource(urlStream, uri);
-            }
-            
-            // Create an aggregated validation schemas from all the XSDs
-            final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            // Allow privileged access to check files. Requires FilePermission
-            // in security policy.
-            try {
-                aggregatedSchema = AccessController.doPrivileged(new PrivilegedExceptionAction<Schema>() {
-                    public Schema run() throws SAXException {
-                        return schemaFactory.newSchema(sources);
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-            	error("PrivilegedActionException", schemaFactory, (SAXException)e.getException());
-                throw (SAXException)e.getException();
-            }
-
-        } catch (Error e) {
-            // FIXME Log this, some old JDKs don't support XMLSchema validation
-            //e.printStackTrace();
-        } catch (SAXParseException e) {
-        	IllegalStateException ie = new IllegalStateException(e);
-        	error("IllegalStateException", schemas, ie);
-            throw ie;
-        } catch (Exception e) {
-            //FIXME Log this, some old JDKs don't support XMLSchema validation
-            e.printStackTrace();
-        }
-    }
-
-    public XMLEventReader createFilteredReader(XMLEventReader arg0, EventFilter arg1) throws XMLStreamException {
-        return inputFactory.createFilteredReader(arg0, arg1);
-    }
-
-    public XMLStreamReader createFilteredReader(XMLStreamReader arg0, StreamFilter arg1) throws XMLStreamException {
-        return inputFactory.createFilteredReader(arg0, arg1);
-    }
-
-    public XMLEventReader createXMLEventReader(InputStream arg0, String arg1) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0, arg1);
-    }
-
-    public XMLEventReader createXMLEventReader(InputStream arg0) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0);
-    }
-
-    public XMLEventReader createXMLEventReader(Reader arg0) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0);
-    }
-
-    public XMLEventReader createXMLEventReader(Source arg0) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0);
-    }
-
-    public XMLEventReader createXMLEventReader(String arg0, InputStream arg1) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0, arg1);
-    }
-
-    public XMLEventReader createXMLEventReader(String arg0, Reader arg1) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0, arg1);
-    }
-
-    public XMLEventReader createXMLEventReader(XMLStreamReader arg0) throws XMLStreamException {
-        return inputFactory.createXMLEventReader(arg0);
-    }
-
-    public XMLStreamReader createXMLStreamReader(InputStream arg0, String arg1) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema, monitor);
-        }else {
-            return inputFactory.createXMLStreamReader(arg0, arg1);
-        }
-    }
-
-    public XMLStreamReader createXMLStreamReader(InputStream arg0) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema, monitor);
-        } else {
-            return inputFactory.createXMLStreamReader(arg0);
-        }
-    }
-
-    public XMLStreamReader createXMLStreamReader(Reader arg0) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema, monitor);
-        } else {
-            return inputFactory.createXMLStreamReader(arg0);
-        }
-    }
-
-    public XMLStreamReader createXMLStreamReader(Source arg0) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema, monitor);
-        } else {
-            return inputFactory.createXMLStreamReader(arg0);
-        }
-    }
-
-    public XMLStreamReader createXMLStreamReader(String arg0, InputStream arg1) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema, monitor);
-        } else {
-            return inputFactory.createXMLStreamReader(arg0, arg1);
-        }
-    }
-
-    public XMLStreamReader createXMLStreamReader(String arg0, Reader arg1) throws XMLStreamException {
-        initializeSchemas();
-        if (hasSchemas) {
-            return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema, monitor);
-        } else {
-            return inputFactory.createXMLStreamReader(arg0, arg1);
-        }
-    }
-
-    public XMLEventAllocator getEventAllocator() {
-        return inputFactory.getEventAllocator();
-    }
-
-    public Object getProperty(String arg0) throws IllegalArgumentException {
-        return inputFactory.getProperty(arg0);
-    }
-
-    public XMLReporter getXMLReporter() {
-        return inputFactory.getXMLReporter();
-    }
-
-    public XMLResolver getXMLResolver() {
-        return inputFactory.getXMLResolver();
-    }
-
-    public boolean isPropertySupported(String arg0) {
-        return inputFactory.isPropertySupported(arg0);
-    }
-
-    public void setEventAllocator(XMLEventAllocator arg0) {
-        inputFactory.setEventAllocator(arg0);
-    }
-
-    public void setProperty(String arg0, Object arg1) throws IllegalArgumentException {
-        inputFactory.setProperty(arg0, arg1);
-    }
-
-    public void setXMLReporter(XMLReporter arg0) {
-        inputFactory.setXMLReporter(arg0);
-    }
-
-    public void setXMLResolver(XMLResolver arg0) {
-        inputFactory.setXMLResolver(arg0);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
deleted file mode 100644
index 1625984ed0..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.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.contribution.processor;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of an extension point for XML schemas. 
- *
- * @version $Rev$ $Date$
- */
-public class DefaultValidationSchemaExtensionPoint implements ValidationSchemaExtensionPoint {
-    
-    private List<String> schemas = new ArrayList<String>();
-    private boolean loaded;
-    
-    public void addSchema(String uri) {
-        schemas.add(uri);
-    }
-    
-    public void removeSchema(String uri) {
-        schemas.remove(uri);
-    }
-    
-    /**
-     * Load schema declarations from META-INF/services/
-     * org.apache.tuscany.sca.contribution.processor.ValidationSchema files
-     */
-    private void loadSchemas() {
-        if (loaded)
-            return;
-
-        // Get the schema declarations
-        Set<ServiceDeclaration> schemaDeclarations; 
-        try {
-            schemaDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations("org.apache.tuscany.sca.contribution.processor.ValidationSchema");
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }      
-        
-        // TODO - temp fix to ensure that the schema tuscany-sca.xsd always comes first
-        String tuscanyScaXsd = null;
-        
-        // Find each schema
-        for (ServiceDeclaration schemaDeclaration: schemaDeclarations) {
-            URL url = schemaDeclaration.getResource();
-            if (url == null) {
-                throw new IllegalArgumentException(new FileNotFoundException(schemaDeclaration.getClassName()));
-            }
-            
-            if (url.toString().contains("tuscany-sca.xsd")){
-                tuscanyScaXsd = url.toString();
-            } else {
-                schemas.add(url.toString());
-            }
-        }
-        
-        if (tuscanyScaXsd != null){
-            schemas.add(0, tuscanyScaXsd);
-        }
-        
-        loaded = true;
-    }
-    
-    public List<String> getSchemas() {
-        loadSchemas();
-        return schemas;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
deleted file mode 100644
index 7ed2d45c2f..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.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.contribution.processor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.contribution.service.TypeDescriber;
-import org.apache.tuscany.sca.contribution.service.UnsupportedPackageTypeException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Implementation of an extensible package processor.
- * 
- * Takes a package processor extension point and delegates to the proper package
- * processor from the extension point based on the package's content type.
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensiblePackageProcessor implements PackageProcessor {
-
-    private PackageProcessorExtensionPoint processors;
-    private TypeDescriber packageTypeDescriber;
-    private Monitor monitor;
-
-    public ExtensiblePackageProcessor(PackageProcessorExtensionPoint processors, 
-    								  TypeDescriber packageTypeDescriber,
-    								  Monitor monitor) {
-        this.processors = processors; 
-        this.packageTypeDescriber = packageTypeDescriber;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * 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(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	}
-    }
-
-    public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) 
-        throws ContributionException, IOException {
-        String packageType = this.packageTypeDescriber.getType(packageSourceURL, null);
-        if (packageType == null) {
-        	error("UnsupportedPackageTypeException", packageTypeDescriber, packageSourceURL.toString());
-            throw new UnsupportedPackageTypeException("Unsupported contribution package type: " + packageSourceURL.toString());
-        }
-
-        PackageProcessor packageProcessor = this.processors.getPackageProcessor(packageType);
-        if (packageProcessor == null) {
-        	error("UnsupportedPackageTypeException", packageTypeDescriber, packageType);
-            throw new UnsupportedPackageTypeException("Unsupported contribution package type: " + packageType);
-        }
-
-        return packageProcessor.getArtifacts(packageSourceURL, inputStream);
-    }
-
-    public URL getArtifactURL(URL packageSourceURL, URI artifact) throws MalformedURLException {
-        String contentType = this.packageTypeDescriber.getType(packageSourceURL, null);
-        PackageProcessor packageProcessor = this.processors.getPackageProcessor(contentType);
-        return packageProcessor.getArtifactURL(packageSourceURL, artifact);
-    }
-    
-    public String getPackageType() {
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
deleted file mode 100644
index ce706fa69c..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.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.contribution.processor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-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.builder.impl.ProblemImpl;
-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.contribution.service.UnrecognizedElementException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Implementation of an extensible StAX artifact processor.
- * 
- * Takes a StAXArtifactProcessorExtensionPoint and delegates to the proper
- * StAXArtifactProcessor by element QName
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensibleStAXArtifactProcessor
-    implements StAXArtifactProcessor<Object> {
-
-    private static final Logger logger = Logger.getLogger(ExtensibleStAXArtifactProcessor.class.getName()); 
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessorExtensionPoint processors;
-    private Monitor monitor;
-
-    /**
-     * Constructs a new ExtensibleStAXArtifactProcessor.
-     * @param processors
-     * @param inputFactory
-     * @param outputFactory
-     */
-    public ExtensibleStAXArtifactProcessor(StAXArtifactProcessorExtensionPoint processors, 
-    									   XMLInputFactory inputFactory, 
-    									   XMLOutputFactory outputFactory,
-    									   Monitor monitor) {
-        super();
-        this.processors = processors;
-        this.inputFactory = inputFactory;
-        this.outputFactory = outputFactory;
-        if (this.outputFactory != null) {
-            this.outputFactory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE);
-        }
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void warning(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	 }
-     }
-     
-     /**
-      * Report a error.
-      * 
-      * @param problems
-      * @param message
-      * @param model
-      */
-     private void error(String message, Object model, Object... messageParameters) {
-     	if (monitor != null) {
- 	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-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-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-
-    public Object read(XMLStreamReader source) throws ContributionReadException, XMLStreamException {
-        
-        // Delegate to the processor associated with the element QName
-        int event = source.getEventType();
-        if (event == XMLStreamConstants.START_DOCUMENT) {
-            source.nextTag();
-        }
-        QName name = source.getName();
-        StAXArtifactProcessor<?> processor = (StAXArtifactProcessor<?>)processors.getProcessor(name);
-        if (processor == null) {
-        	Location location = source.getLocation();
-            if (logger.isLoggable(Level.WARNING)) {                
-                logger.warning("Element " + name + " cannot be processed. (" + location + ")");
-            }
-            warning("ElementCannotBeProcessed", processors, name, location);
-            return null;
-        }
-        return processor.read(source);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public void write(Object model, XMLStreamWriter outputSource) throws ContributionWriteException, XMLStreamException {
-        
-        // Delegate to the processor associated with the model type
-        if (model != null) {
-            StAXArtifactProcessor processor = processors.getProcessor(model.getClass());
-            if (processor != null) {
-                processor.write(model, outputSource);
-            } else {
-                if (logger.isLoggable(Level.WARNING)) {
-                    logger.warning("No StAX processor is configured to handle " + model.getClass());
-                }
-                warning("NoStaxProcessor", processors, model.getClass());
-            }
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    public void resolve(Object model, ModelResolver resolver) throws ContributionResolveException {
-
-        // Delegate to the processor associated with the model type
-        if (model != null) {
-            StAXArtifactProcessor processor = processors.getProcessor(model.getClass());
-            if (processor != null) {
-                processor.resolve(model, resolver);
-            }
-        }
-    }
-    
-    /**
-     * Read a model from an InputStream.
-     * @param is The artifact InputStream
-     * @param type Model type
-     * @return The model
-     * @throws ContributionReadException
-     */
-    public <M> M read(InputStream is, Class<M> type) throws ContributionReadException {
-        try {
-            XMLStreamReader reader;
-            try {
-                reader = inputFactory.createXMLStreamReader(is);
-                try {
-                    reader.nextTag();
-                    QName name = reader.getName();
-                    Object mo = read(reader);
-                    if (type.isInstance(mo)) {
-                        return type.cast(mo);
-                    } else {
-                    	error("UnrecognizedElementException", reader, name);
-                        UnrecognizedElementException e = new UnrecognizedElementException(name);                        
-                        throw e;
-                    }
-                } catch (ContributionReadException e) {
-                    Location location = reader.getLocation();
-                    e.setLine(location.getLineNumber());
-                    e.setColumn(location.getColumnNumber());
-                    error("ContributionReadException", reader, e);
-                    throw e;
-                } finally {
-                    try {
-                        reader.close();
-                    } catch (XMLStreamException e) {
-                        // ignore
-                    }
-                }
-            } finally {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-        } catch (XMLStreamException e) {
-            ContributionReadException ce = new ContributionReadException(e);
-            error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        }
-    }
-
-    /**
-     * Write a model to an OutputStream.
-     * @param model
-     * @param os
-     * @throws ContributionWriteException
-     */
-    public void write(Object model, OutputStream os) throws ContributionWriteException {
-        try {
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(os);
-            write(model, writer);
-            writer.flush();
-            writer.close();
-        } catch (XMLStreamException e) {
-        	ContributionWriteException cw = new ContributionWriteException(e);
-        	error("ContributionWriteException", outputFactory, cw);
-            throw cw;
-        }
-    }
-
-    public QName getArtifactType() {
-        return null;
-    }
-    
-    public Class<Object> getModelType() {
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
deleted file mode 100644
index 2fa9469b93..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.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.contribution.processor;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-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.UnrecognizedElementException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * Implementation of an extensible URL artifact processor.
- * 
- * Takes a URLArtifactProcessorExtensionPoint and delegates to the proper URLArtifactProcessor
- * by either fileName or fileExtention
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensibleURLArtifactProcessor
-    implements URLArtifactProcessor<Object> {
-    
-    private URLArtifactProcessorExtensionPoint processors;
-    private Monitor monitor;
-
-    /**
-     * Constructs a new ExtensibleURLArtifactProcessor.
-     * 
-     * @param processors
-     */
-    public ExtensibleURLArtifactProcessor(URLArtifactProcessorExtensionPoint processors, Monitor monitor) {
-        this.processors = processors;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	if (monitor != null) {
-	        Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	}
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object read(URL contributionURL, URI sourceURI, URL sourceURL) throws ContributionReadException {
-        URLArtifactProcessor<Object> processor = null;
-        
-        // Delegate to the processor associated with file extension
-        String fileName = getFileName(sourceURL);
-        
-        //try to retrieve a processor for the specific filename
-        processor = (URLArtifactProcessor<Object>)processors.getProcessor(fileName);
-        
-        if (processor == null) {
-            //try to find my file type (extension)
-            String extension = sourceURL.getPath();
-            
-            int extensionStart = extension.lastIndexOf('.');
-            //handle files without extension (e.g NOTICE)
-            if (extensionStart > 0) {
-                extension = extension.substring(extensionStart);
-                processor = (URLArtifactProcessor<Object>)processors.getProcessor(extension);            
-            }
-        }
-        
-        if (processor == null) {
-            return null;
-        }
-        return processor.read(contributionURL, sourceURI, sourceURL);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void resolve(Object model, ModelResolver resolver) throws ContributionResolveException {
-
-        // Delegate to the processor associated with the model type
-        if (model != null) {
-            URLArtifactProcessor processor = processors.getProcessor(model.getClass());
-            if (processor != null) {
-                processor.resolve(model, resolver);
-            }
-        }
-    }
-    
-    public <M> M read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<M> type) 
-        throws ContributionReadException {
-        Object mo = read(contributionURL, artifactURI, artifactUrl);
-        if (type.isInstance(mo)) {
-            return type.cast(mo);
-        } else {
-            UnrecognizedElementException e = new UnrecognizedElementException(null);
-            e.setResourceURI(artifactURI.toString());
-            error("UnrecognizedElementException", processors, artifactURI.toString());
-            throw e;
-        }
-    }
-    
-    public String getArtifactType() {
-        return null;
-    }
-    
-    public Class<Object> getModelType() {
-        return null;
-    }
-
-    /**
-     * Returns the file name from a URL.
-     * @param url
-     * @return
-     */
-    private static String getFileName(URL url){
-        String fileName = url.getPath();
-        int pos = fileName.lastIndexOf("/");
-        
-        return fileName.substring(pos +1);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
deleted file mode 100644
index f17f31edb1..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.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.contribution.processor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-
-/**
- * Interface for contribution package processors
- * 
- * Package processors understand the format of the contribution and how to get the
- * artifacts in the contribution.
- * 
- * @version $Rev$ $Date$
- */
-public interface PackageProcessor {
-    
-    /**
-     * Returns the type of package supported by this package processor.
-     * 
-     * @return the package type
-     */
-    String getPackageType();
-
-    /**
-     * Returns a list of artifacts in the contribution.
-     * 
-     * @param packageSourceURL Contribution package location URL
-     * @param inputStream Optional content of the package
-     * @return List of artifact URIs
-     * @throws ContributionException
-     * @throws IOException
-     */
-    List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException, IOException;
-
-    /**
-     * Return the URL for an artifact in the package.
-     * 
-     * This is needed for archives such as jar files that have specific URL schemes
-     * for the artifacts they contain.
-     * 
-     * @param packageSourceURL Contribution package location URL
-     * @param artifact The relative URI for the artifact
-     * @return The artifact URL
-     */
-    URL getArtifactURL(URL packageSourceURL, URI artifact) throws MalformedURLException;
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
deleted file mode 100644
index ed99239b19..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.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.contribution.processor;
-
-/**
- * An extension point for package processors
- * 
- * @version $Rev$ $Date$
- */
-public interface PackageProcessorExtensionPoint {
-    
-    /**
-     * Register a PackageProcessor using the package type as the key.
-     * 
-     * @param processor The package processor
-     */
-    void addPackageProcessor(PackageProcessor processor);
-    
-    /**
-     * Unregister a PackageProcessor.
-     * 
-     * @param processor The package processor
-     */
-    void removePackageProcessor(PackageProcessor processor);
-    
-    /**
-     * Returns the PackageProcessor for the given package type.
-     * 
-     * @param packageType The package type
-     * @return The package processor
-     */
-    PackageProcessor getPackageProcessor(String packageType);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
deleted file mode 100644
index fcf9347564..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.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.contribution.processor;
-
-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.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-
-/**
- * An artifact processor that can read models from a StAX XMLStreamReader.
- * 
- * @version $Rev$ $Date$
- */
-public interface StAXArtifactProcessor<M> extends ArtifactProcessor<M> {
-
-    /**
-     * Reads a model from an XMLStreamReader.
-     * 
-     * @param reader The XMLStreamReader
-     * @return A model representation of the input.
-     */
-    M read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException;
-    
-    /**
-     * Writes a model to an XMLStreamWriter.
-     * 
-     * @param model A model representing the source
-     * @param writer The XML stream writer
-     * @throws ContributionWriteException
-     * @throws XMLStreamException
-     */
-    void write(M model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException;
-    
-    /**
-     * Returns the type of artifact handled by this artifact processor.
-     *  
-     * @return The type of artifact handled by this artifact processor
-     */
-    QName getArtifactType();
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
deleted file mode 100644
index 9700e2bc60..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.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.contribution.processor;
-
-/**
- * An extension point for StAX artifact processors.
- * 
- * @version $Rev$ $Date$
- */
-public interface StAXArtifactProcessorExtensionPoint extends 
-    ArtifactProcessorExtensionPoint<StAXArtifactProcessor> {
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
deleted file mode 100644
index 2ecddf5465..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.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.contribution.processor;
-
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * An artifact processor that can read models from a URL.
- * 
- * @version $Rev$ $Date$
- */
-public interface URLArtifactProcessor<M> extends ArtifactProcessor<M> {
-
-    /**
-     * Reads a model from a URL.
-     * 
-     * @param contributionURL Contribution location URL
-     * @param artifactURI Artifact URI
-     * @param artifactURL Artifact location URL 
-     * @return A model representation of the input.
-     */
-    M read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException;
-    
-    /**
-     * Returns the type of artifact handled by this artifact processor.
-     *  
-     * @return The type of artifact handled by this artifact processor
-     */
-    String getArtifactType();
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
deleted file mode 100644
index 7714586951..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.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.contribution.processor;
-
-/**
- * An extension point for URL artifact processors.
- * 
- * @version $Rev$ $Date$
- */
-public interface URLArtifactProcessorExtensionPoint extends
-    ArtifactProcessorExtensionPoint<URLArtifactProcessor> {
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
deleted file mode 100644
index da249a09e4..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.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.processor;
-
-import javax.xml.stream.XMLInputFactory;
-
-/**
- * Base marker class for validating XML input factories.
- *
- * @version $Rev$ $Date$
- */
-public abstract class ValidatingXMLInputFactory extends XMLInputFactory {
-
-    /**
-     * Create a new default validating XML input factory. 
-     * @return
-     */
-    public static ValidatingXMLInputFactory newInstance() {
-        return new DefaultValidatingXMLInputFactory(
-                                                    XMLInputFactory.newInstance(),
-                                                    new DefaultValidationSchemaExtensionPoint(),
-                                                    null);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
deleted file mode 100644
index c136c62d33..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.processor;
-
-import java.util.logging.Logger;
-
-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 javax.xml.stream.util.StreamReaderDelegate;
-import javax.xml.validation.Schema;
-import javax.xml.validation.ValidatorHandler;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.AttributesImpl;
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * 
- * A validating XMLStreamReader that reports XMLSchema validation errors.
- *
- * @version $Rev$ $Date$
- */
-class ValidatingXMLStreamReader extends StreamReaderDelegate implements XMLStreamReader {
-    private static final Logger logger = Logger.getLogger(ValidatingXMLStreamReader.class.getName());
-    
-    private int level;
-    private ValidatorHandler handler;
-    private final Monitor monitor;
-    
-    /**
-     * Constructs a new ValidatingXMLStreamReader.
-     * 
-     * @param reader
-     * @param schema
-     * @throws XMLStreamException
-     */
-    ValidatingXMLStreamReader(XMLStreamReader reader, Schema schema, Monitor monitor) throws XMLStreamException {
-        super(reader);
-        this.monitor = monitor;
-        if (schema == null) {
-            return;
-        }
-        
-        handler = schema.newValidatorHandler();
-        handler.setDocumentLocator(new LocatorAdapter());
-        try {
-            handler.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-        } catch (SAXException e) {
-        	XMLStreamException xse = new XMLStreamException(e);
-        	error("XMLStreamException", handler, xse);
-            throw xse;
-        }
-        
-        // These validation errors are just warnings for us as we want to support
-        // running from an XML document with XSD validation errors, as long as we can
-        // get the metadata we need from the document
-        handler.setErrorHandler(new ErrorHandler() {        	
-            private String getMessage(SAXParseException e) {
-                return "XMLSchema validation problem in: " + e.getSystemId() + ", line: " + e.getLineNumber() + ", column: " + e.getColumnNumber() + "\n" + e.getMessage();
-            }
-            
-            public void error(SAXParseException exception) throws SAXException {            	
-            	if (ValidatingXMLStreamReader.this.monitor == null)
-            		logger.warning(getMessage(exception));
-            	else            		
-            		ValidatingXMLStreamReader.this.error("SchemaError", ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
-                   		exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());                              
-            }
-            
-            public void fatalError(SAXParseException exception) throws SAXException {            	
-            	if (ValidatingXMLStreamReader.this.monitor == null)
-            		logger.warning(getMessage(exception));
-            	else
-            		ValidatingXMLStreamReader.this.error("SchemaFatalError", ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
-                       	exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());               
-            }
-            
-            public void warning(SAXParseException exception) throws SAXException {
-            	if (ValidatingXMLStreamReader.this.monitor == null)
-            		logger.warning(getMessage(exception));
-            	else
-            		ValidatingXMLStreamReader.this.warning("SchemaWarning", ValidatingXMLStreamReader.this.getClass(), exception.getSystemId(), 
-                       	exception.getLineNumber(), exception.getColumnNumber(), exception.getMessage());                
-            }
-        });
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-    	}
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "contribution-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-    @Override
-    public int next() throws XMLStreamException {
-        if (handler == null) {
-            return super.next();
-        }
-
-        int event = super.next();
-        try {
-            switch (event) {
-                case XMLStreamConstants.START_DOCUMENT:
-                    level++;
-                    handler.startDocument();
-                    break;
-                case XMLStreamConstants.START_ELEMENT:
-                    level++;
-                    handleStartElement();
-                    break;
-                case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                    handler.processingInstruction(super.getPITarget(), super.getPIData());
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                case XMLStreamConstants.CDATA:
-                case XMLStreamConstants.SPACE:
-                case XMLStreamConstants.ENTITY_REFERENCE:
-                    handler.characters(super.getTextCharacters(), super.getTextStart(), super.getTextLength());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    handleEndElement();
-                    level--;
-                    break;
-                case XMLStreamConstants.END_DOCUMENT:
-                    handler.endDocument();
-                    break;
-            }
-        } catch (SAXException e) {
-        	XMLStreamException xse = new XMLStreamException(e.getMessage(), e);
-        	error("XMLStreamException", handler, xse);
-            throw xse;
-        }
-        return event;
-    }
-    
-    @Override
-    public int nextTag() throws XMLStreamException {
-        if (handler == null) {
-            return super.nextTag();
-        }
-        
-        for (;;) {
-            int event = super.getEventType();
-            try {
-                switch (event) {
-                    case XMLStreamConstants.START_DOCUMENT:
-                        level++;
-                        handler.startDocument();
-                        break;
-                    case XMLStreamConstants.START_ELEMENT:
-                        level++;
-                        handleStartElement();
-                        return event;
-                    case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                        handler.processingInstruction(super.getPITarget(), super.getPIData());
-                        break;
-                    case XMLStreamConstants.CHARACTERS:
-                    case XMLStreamConstants.CDATA:
-                    case XMLStreamConstants.SPACE:
-                    case XMLStreamConstants.ENTITY_REFERENCE:
-                        handler.characters(super.getTextCharacters(), super.getTextStart(), super.getTextLength());
-                        break;
-                    case XMLStreamConstants.END_ELEMENT:
-                        handleEndElement();
-                        level--;
-                        return event;
-                    case XMLStreamConstants.END_DOCUMENT:
-                        handler.endDocument();
-                        return event;
-                }
-            } catch (SAXException e) {
-            	XMLStreamException xse = new XMLStreamException(e);
-            	error("XMLStreamException", handler, xse);
-                throw xse;
-            }
-            super.next();
-        }
-    }
-    
-    @Override
-    public String getElementText() throws XMLStreamException {
-        if (handler == null) {
-            return super.getElementText();
-        }
-
-        if (getEventType() != XMLStreamConstants.START_ELEMENT) {
-            return super.getElementText();
-        }
-        StringBuffer text = new StringBuffer();
-
-        for (;;) {
-            int event = next();
-            switch (event) {
-                case XMLStreamConstants.END_ELEMENT:
-                    return text.toString();
-                    
-                case XMLStreamConstants.COMMENT:
-                case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                    continue;
-                    
-                case CHARACTERS:
-                case CDATA:
-                case SPACE:
-                case ENTITY_REFERENCE:
-                    text.append(getText());
-                    break;
-                    
-                default:
-                    break;
-            }
-        }
-    }
-    
-    /**
-     * Handle a start element event.
-     * 
-     * @throws SAXException
-     */
-    private void handleStartElement() throws SAXException {
-
-        // send startPrefixMapping events immediately before startElement event
-        int nsCount = super.getNamespaceCount();
-        for (int i = 0; i < nsCount; i++) {
-            String prefix = super.getNamespacePrefix(i);
-            if (prefix == null) { // true for default namespace
-                prefix = "";
-            }
-            handler.startPrefixMapping(prefix, super.getNamespaceURI(i));
-        }
-
-        // fire startElement
-        QName qname = super.getName();
-        String prefix = qname.getPrefix();
-        String rawname;
-        if (prefix == null || prefix.length() == 0) {
-            rawname = qname.getLocalPart();
-        } else {
-            rawname = prefix + ':' + qname.getLocalPart();
-        }
-        Attributes attrs = getAttributes();
-        handler.startElement(qname.getNamespaceURI(), qname.getLocalPart(), rawname, attrs);
-    }
-
-    /**
-     * Handle an endElement event.
-     * 
-     * @throws SAXException
-     */
-    private void handleEndElement() throws SAXException {
-
-        // fire endElement
-        QName qname = super.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 = super.getNamespaceCount();
-        for (int i = nsCount - 1; i >= 0; i--) {
-            String prefix = super.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() {
-        AttributesImpl attrs = new AttributesImpl();
-
-        // add namespace declarations
-        for (int i = 0; i < super.getNamespaceCount(); i++) {
-            String prefix = super.getNamespacePrefix(i);
-            String uri = super.getNamespaceURI(i);
-            if (prefix == null) {
-                attrs.addAttribute("", "", "xmlns", "CDATA", uri);
-            } else {
-                attrs.addAttribute("", "", "xmlns:" + prefix, "CDATA", uri);
-            }
-        }
-
-        // Regular attributes
-        for (int i = 0; i < super.getAttributeCount(); i++) {
-            String uri = super.getAttributeNamespace(i);
-            if (uri == null) {
-                uri = "";
-            }
-            String localName = super.getAttributeLocalName(i);
-            String prefix = super.getAttributePrefix(i);
-            String qname;
-            if (prefix == null || prefix.length() == 0) {
-                qname = localName;
-            } else {
-                qname = prefix + ':' + localName;
-            }
-            String type = super.getAttributeType(i);
-            String value = super.getAttributeValue(i);
-
-            attrs.addAttribute(uri, localName, qname, type, value);
-        }
-
-        return attrs;
-    }
-
-    /**
-     * Adapter for mapping Locator information.
-     */
-    private final class LocatorAdapter implements Locator {
-
-        private LocatorAdapter() {
-        }
-
-        public int getColumnNumber() {
-            Location location = getLocation();
-            return location == null ? 0 : location.getColumnNumber();
-        }
-
-        public int getLineNumber() {
-            Location location = getLocation();
-            return location == null ? 0 : location.getLineNumber();
-        }
-
-        public String getPublicId() {
-            Location location = getLocation();
-            return location == null ? "" : location.getPublicId();
-        }
-
-        public String getSystemId() {
-            Location location = getLocation();
-            return location == null ? "" : location.getSystemId();
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
deleted file mode 100644
index cc3bb59a5b..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.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.contribution.processor;
-
-import java.util.List;
-
-
-/**
- * An extension point for XML schemas used for validation.
- *
- * @version $Rev$ $Date$
- */
-public interface ValidationSchemaExtensionPoint {
-    
-    /**
-     * Add a schema.
-     * 
-     * @param uri the URI of the schema
-     */
-    void addSchema(String uri);
-    
-    /**
-     * Remove a schema.
-     * 
-     * @param uri the URI of the schema
-     */
-    void removeSchema(String uri);
-    
-    /**
-     * Returns the list of schemas registered in the extension point.
-     * @return the list of schemas
-     */
-    List<String> getSchemas();
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
deleted file mode 100644
index f3555ee71e..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.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.resolver;
-
-import java.lang.ref.WeakReference;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-/**
- * A weak reference to a class, which should be used to register classes
- * with an ArtifactResolver and resolve these classes later.
- * 
- * FIXME The core contribution model should not have dependencies on classes
- * and ClassLoaders. This should move to the Java import support module.
- *
- * @version $Rev$ $Date$
- */
-public class ClassReference implements Base {
-    
-    private WeakReference<Class<?>> clazz;
-    private String className;
-
-    /**
-     * Constructs a new ClassReference.
-     * 
-     * @param clazz The class reference
-     */
-    public ClassReference(Class<?> clazz) {
-        this.clazz = new WeakReference<Class<?>>(clazz);
-        this.className = clazz.getName();
-    }
-    
-    /**
-     * Constructs a new ClassReference.
-     * 
-     * @param className The class name
-     */
-    public ClassReference(String className) {
-        this.className = className;
-    }
-    
-    /**
-     * Get the referenced class.
-     * 
-     * @return The referenced class
-     */
-    public Class<?> getJavaClass() {
-        if (clazz != null) {
-            return clazz.get();
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Get the referenced class name.
-     * 
-     * @return The class name
-     */
-    public String getClassName() {
-        return className;
-    }
-    
-    public boolean isUnresolved() {
-        return clazz == null;
-    }
-    
-    public void setUnresolved(boolean unresolved) {
-        throw new IllegalStateException();
-    }
-
-    @Override
-    public int hashCode() {
-        return className.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else {
-            if (obj instanceof ClassReference) {
-                return className.equals(((ClassReference)obj).className);
-            } else {
-                return false;
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
deleted file mode 100644
index 13c622adf0..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.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.contribution.resolver;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Base;
-
-/**
- * A model resolver implementation that delegates to a list of model resolvers.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultDelegatingModelResolver implements ModelResolver {
-    
-    private List<ModelResolver> resolvers;
-    
-    public DefaultDelegatingModelResolver(List<ModelResolver> resolvers) {
-        this.resolvers = resolvers;
-    }
-
-    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) {
-        
-        //TODO optimize and cache results of the resolution later
-        
-        // Go over all resolvers
-        for (ModelResolver resolver: resolvers) {
-            
-            Object resolved = resolver.resolveModel(modelClass, unresolved);
-            
-            // Return the resolved model object
-            if (resolved instanceof Base) {
-                if (!((Base)resolved).isUnresolved()) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-
-        // Model object was not resolved
-        return unresolved;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
deleted file mode 100644
index c6facd2b02..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.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.contribution.resolver;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.Base;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.Export;

-import org.apache.tuscany.sca.contribution.Import;

-

-/**

- * A model resolver implementation that considers Exports in a list of contributions.

- *

- * @version $Rev: 560435 $ $Date: 2007-07-27 18:26:55 -0700 (Fri, 27 Jul 2007) $

- */

-public class DefaultImportAllModelResolver implements ModelResolver {

-    

-    private Import import_;

-    private List<Contribution> contributions;

-    

-    public DefaultImportAllModelResolver(Import import_, List<Contribution> contributions) {

-        this.import_ = import_;

-        this.contributions = contributions;

-    }

-

-    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) {

-        

-        //TODO optimize and cache results of the resolution later

-        

-        // Go over all available contributions

-        for (Contribution contribution : contributions) {

-            

-            // Go over all exports in the contribution

-            for (Export export : contribution.getExports()) {

-                

-                    // If the export matches the export, try to resolve the model object

-                    if (import_.match(export)) {

-                        Object resolved = export.getModelResolver().resolveModel(modelClass, unresolved);

-                        

-                        // Return the resolved model object

-                        if (resolved instanceof Base) {

-                            if (!((Base)resolved).isUnresolved()) {

-                                return modelClass.cast(resolved);

-                            }

-                        }

-                    }

-            }

-        }

-

-        // Model object was not resolved

-        return unresolved;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
deleted file mode 100644
index 9ae57c41d0..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.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.contribution.resolver;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.contribution.Export;
-
-/**
- * A model resolver implementation that delegates to a list of exports.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultImportModelResolver implements ModelResolver {
-    
-    private List<Export> exports;
-    
-    public DefaultImportModelResolver(List<Export> exports) {
-        this.exports = exports;
-    }
-
-    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) {
-        
-        //TODO optimize and cache results of the resolution later
-        
-        // Go over all exports
-        for (Export export: exports) {
-            
-            Object resolved = export.getModelResolver().resolveModel(modelClass, unresolved);
-            
-            // Return the resolved model object
-            if (resolved instanceof Base) {
-                if (!((Base)resolved).isUnresolved()) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-
-        // Model object was not resolved
-        return unresolved;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
deleted file mode 100644
index a001baa47f..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.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.contribution.resolver;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * A default implementation of a model resolver based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultModelResolver implements ModelResolver {
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    public DefaultModelResolver() {
-    }
-    
-    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/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
deleted file mode 100644
index 77570aa13d..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.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.contribution.resolver;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-
-/**
- * The default implementation of a model resolver extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultModelResolverExtensionPoint implements ModelResolverExtensionPoint {
-    
-    private final Map<Class<?>, Class<? extends ModelResolver>> resolvers = new HashMap<Class<?>, Class<? extends ModelResolver>>();
-    private Map<String, ServiceDeclaration> loadedResolvers;
-
-    /**
-     * Constructs a new DefaultModelResolverExtensionPoint.
-     */
-    public DefaultModelResolverExtensionPoint() {
-    }
-
-    public void addResolver(Class<?> modelType, Class<? extends ModelResolver> resolver) {
-        resolvers.put(modelType, resolver);
-    }
-
-    public void removeResolver(Class<?> modelType) {
-        resolvers.remove(modelType);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Class<? extends ModelResolver> getResolver(Class<?> modelType) {
-        loadModelResolvers();
-        
-        Class<?>[] classes = modelType.getInterfaces();
-        for (Class<?> c : classes) {
-            Class<? extends ModelResolver> resolver = resolvers.get(c);
-            if (resolver == null) {
-                ServiceDeclaration resolverClass = loadedResolvers.get(c.getName());
-                if (resolverClass != null) {
-                    try {
-                        return (Class<? extends ModelResolver>)resolverClass.loadClass();
-                    } catch (ClassNotFoundException e) {
-                        throw new IllegalArgumentException(e);
-                    }
-                }
-            } else {
-                return resolver;
-            }
-        }
-
-        Class<? extends ModelResolver > resolver = resolvers.get(modelType);
-        if (resolver == null) {
-            ServiceDeclaration resolverClass = loadedResolvers.get(modelType.getName());
-            if (resolverClass != null) {
-                try {
-                    return (Class<? extends ModelResolver>)resolverClass.loadClass();
-                } catch (ClassNotFoundException e) {
-                    throw new IllegalArgumentException(e);
-                }
-            }
-        }
-        return resolver;
-    }
-
-    /**
-     * Dynamically load model resolvers declared under META-INF/services
-     */
-    private void loadModelResolvers() {
-        if (loadedResolvers != null)
-            return;
-        loadedResolvers = new HashMap<String, ServiceDeclaration>();
-
-        // Get the model resolver service declarations
-        Set<ServiceDeclaration> modelResolverDeclarations; 
-        try {
-            modelResolverDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ModelResolver.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        // Load model resolvers
-        for (ServiceDeclaration modelResolverDeclaration: modelResolverDeclarations) {
-            Map<String, String> attributes = modelResolverDeclaration.getAttributes();
-            String model = attributes.get("model");
-
-            loadedResolvers.put(model, modelResolverDeclaration);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
deleted file mode 100644
index 0cfba8e1ed..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.resolver;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-
-/**
- * An implementation of an extensible model resolver which delegates to the
- * proper resolver extension based on the class of the model to resolve.
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensibleModelResolver implements ModelResolver {
-    private final ModelResolverExtensionPoint resolverExtensions;
-    private final ModelFactoryExtensionPoint modelFactories;
-    private final Contribution contribution;
-    private ModelResolver defaultResolver;
-    private final Map<Class<?>, ModelResolver> resolversByModelType = new HashMap<Class<?>, ModelResolver>();
-    private final Map<Class<?>, ModelResolver> resolversByImplementationClass = new HashMap<Class<?>, ModelResolver>();
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    private Object lastUnresolved;
-
-    /**
-     * Constructs an extensible model resolver
-     * 
-     * @param contribution
-     * @param resolverExtensions
-     * @param modelFactories
-     * @param defaultResolver
-     */
-    @Deprecated
-    public ExtensibleModelResolver(Contribution contribution,
-                                   ModelResolverExtensionPoint resolverExtensions,
-                                   ModelFactoryExtensionPoint modelFactories,
-                                   ModelResolver defaultResolver) {
-        this.contribution = contribution;
-        this.resolverExtensions = resolverExtensions;
-        this.modelFactories = modelFactories;
-        //FIXME Remove this default resolver, this is currently used to resolve policy declarations
-        // but they should be handled by the contribution import/export mechanism instead of this
-        // defaultResolver hack.
-        this.defaultResolver = defaultResolver;
-    }
-
-    /**
-     * Constructs an extensible model resolver
-     * 
-     * @param resolverExtensions
-     * @param contribution
-     * @param modelFactories
-     */
-    public ExtensibleModelResolver(Contribution contribution,
-                                   ModelResolverExtensionPoint resolverExtensions,
-                                   ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-        this.resolverExtensions = resolverExtensions;
-        this.modelFactories = modelFactories;
-    }
-
-    /**
-     * Returns the proper resolver instance based on the interfaces of the model
-     * If one is not available on the registry, instantiate on demand
-     * 
-     * @param modelType
-     * @return
-     */
-    private ModelResolver getModelResolverInstance(Class<?> modelType) {
-        // Look up a model resolver instance for the model class or
-        // each implemented interface
-        Class<?>[] interfaces = modelType.getInterfaces();
-        Class<?>[] classes = new Class<?>[interfaces.length + 1];
-        classes[0] = modelType;
-        if (interfaces.length != 0) {
-            System.arraycopy(interfaces, 0, classes, 1, interfaces.length);
-        }
-        for (Class<?> c : classes) {
-
-            // Look up an existing model resolver instance
-            ModelResolver resolverInstance = resolversByModelType.get(c);
-            if (resolverInstance != null) {
-                return resolverInstance;
-            }
-
-            // We don't have an instance, lookup a model resolver class
-            // and instantiate it
-            Class<? extends ModelResolver> resolverClass = resolverExtensions.getResolver(c);
-            if (resolverClass != null) {
-
-                // Construct the model resolver instance and cache it
-                resolverInstance = resolversByImplementationClass.get(resolverClass);
-                if (resolverInstance != null) {
-                    resolversByModelType.put(c, resolverInstance);
-                    return resolverInstance;
-                }
-                try {
-                    Constructor<? extends ModelResolver> constructor =
-                        resolverClass
-                            .getConstructor(new Class[] {Contribution.class, ModelFactoryExtensionPoint.class});
-                    if (constructor != null) {
-
-                        resolverInstance = constructor.newInstance(contribution, modelFactories);
-                        resolversByImplementationClass.put(resolverClass, resolverInstance);
-                        resolversByModelType.put(c, resolverInstance);
-                        return resolverInstance;
-                    }
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public void addModel(Object resolved) {
-        ModelResolver resolver = getModelResolverInstance(resolved.getClass());
-        if (resolver != null) {
-            resolver.addModel(resolved);
-        } else {
-            map.put(resolved, resolved);
-        }
-    }
-
-    public Object removeModel(Object resolved) {
-        ModelResolver resolver = getModelResolverInstance(resolved.getClass());
-        if (resolver != null) {
-            return resolver.removeModel(resolved);
-        } else {
-            return map.remove(resolved);
-        }
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        // Protect against dependency cycles causing infinite recursion
-        // Save the current unresolved object and check later if we are trying
-        // to resolve the same object again
-        if (unresolved == lastUnresolved) {
-            return unresolved;
-        }
-        lastUnresolved = unresolved;
-        
-        ModelResolver resolver = getModelResolverInstance(unresolved.getClass());
-        if (resolver != null) {
-            Object resolved = resolver.resolveModel(modelClass, unresolved);
-            if (resolved != null && resolved != unresolved) {
-                lastUnresolved = null;
-                return modelClass.cast(resolved);
-            }
-        } else {
-            //FIXME Remove this default resolver, this is currently used to resolve policy declarations
-            // but they should be handled by the contribution import/export mechanism instead of this
-            // defaultResolver hack.
-            if (defaultResolver != null) {
-                Object resolved = defaultResolver.resolveModel(modelClass, unresolved);
-                if (resolved != null && resolved != unresolved) {
-                    lastUnresolved = null;
-                    return modelClass.cast(resolved);
-                }
-            }
-            
-            Object resolved = map.get(unresolved);
-            if (resolved != null) {
-                // Return the resolved object
-                lastUnresolved = null;
-                return modelClass.cast(resolved);
-            }
-        }
-
-        return unresolved;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
deleted file mode 100644
index 2831bebbc4..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.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.contribution.resolver;
-
-/**
- * A model resolver, responsible for resolving models in the scope of an
- * SCA contribution. 
- * 
- * SCA Assemblies reference artifacts of a wide variety of types. These
- * include:
- * <ul>
- * <li> Reference from one SCA composite to another SCA composite
- * <li> Reference to PolicySet files
- * <li> Reference to interface definition files, either WSDL or Java interfaces
- * <li> Reference to XSD files
- * <li> Reference to any of a wide variety of implementation artifact files,
- * including Java classes, BPEL scripts, C++ DLLs and classes, PHP scripts
- * </ul>
- * 
- * In the SCA assemblies, these various artifacts are referenced using either
- * QNames or logical URIs. Model resolvers are used to resolve these references
- * and get the in-memory models representing the referenced artifacts.
- * 
- * @version $Rev$ $Date$
- */
-public interface ModelResolver {
-
-    /**
-     * Resolve the model representing an artifact.
-     * 
-     * @param modelClass the type of artifact
-     * @param unresolved the unresolved model
-     * @return the resolved model
-     */
-    <T> T resolveModel(Class<T> modelClass, T unresolved);
-    
-    /**
-     * Add a resolved model.
-     * 
-     * @param resolved The model
-     */
-    void addModel(Object resolved);
-    
-    /**
-     * Remove a resolved model.
-     * 
-     * @param resolved
-     * @return The removed model, or null if the model was not removed
-     */
-    Object removeModel(Object resolved);
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
deleted file mode 100644
index 4a25059792..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.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.contribution.resolver;
-
-
-/**
- * An extension point for model resolvers
- * 
- * @version $Rev$ $Date$
- */
-public interface ModelResolverExtensionPoint {
-
-    /**
-     * Register a model resolver class using the model type as the key
-     * 
-     * @param modelType The model type
-     * @param resolver The model resolver Class
-     */
-    void addResolver(Class<?> modelType, Class <? extends ModelResolver> resolver);
-    
-    /**
-     * Remove the model resolver class for a specific model type
-     * 
-     * @param modelType The model type
-     */
-    void removeResolver(Class<?> modelType);
-    
-    /**
-     * Retrieve a model resolver class for a specific model type
-     * 
-     * @param modelType The model artifact type
-     * @return The model resolver Class
-     */
-    Class <? extends ModelResolver> getResolver(Class<?> modelType);
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
deleted file mode 100644
index 74f0f2d71d..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.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.contribution.resolver;
-
-/**
- * Extension to assembly model implementations to provide a model resolver.
- *
- * @version $Rev$ $Date$
- */
-public interface ResolverExtension {
-
-    /**
-     * Returns the model resolver for the models representing the artifacts
-     * visible in the scope of this contribution.
-     * 
-     * @return The model resolver
-     */
-    ModelResolver getModelResolver();
-    
-    /**
-     * Sets the model resolver for the models representing the artifacts
-     * visible in the scope of this contribution.
-     * 
-     * @param modelResolver The model resolver
-     */
-    void setModelResolver(ModelResolver modelResolver);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
deleted file mode 100644
index 2394f4510b..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.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.contribution.resolver;

-

-import java.net.URL;

-

-/**

- * A resource URL, which should be used to register resources

- * with an ArtifactResolver and resolve these resources later.

- * 

- * FIXME Don't use as its deprecated, use Artifact instead.

- *

- * @version $Rev$ $Date$

- */

-@Deprecated

-public class ResourceReference {

-    

-    private URL resourceURL;

-    private String resourceName;

-

-    /**

-     * Constructs a new ResourceReference.

-     * 

-     * @param resourceName Name of resource

-     * @param resourceURL  The resource URL

-     */

-    public ResourceReference(String resourceName, URL resourceURL) {

-        this.resourceURL = resourceURL;

-        this.resourceName = resourceName;

-    }

-    

-    /**

-     * Constructs a new ResourceReference.

-     * 

-     * @param resourceName Name of resource

-     */

-    public ResourceReference(String resourceName) {

-        this.resourceName = resourceName;

-    }

-    

-    /**

-     * Get the resource URL.

-     * 

-     * @return The resource URL

-     */

-    public URL getResource() {

-        return resourceURL;

-    }

-    

-    /**

-     * Get the resource name.

-     * 

-     * @return The resource name

-     */

-    public String getResourceName() {

-        return resourceName;

-    }

-    

-    /**

-     * Returns true if the resource reference is unresolved.

-     * 

-     * @return Whether or not the resource has been resolved

-     */

-    public boolean isUnresolved() {

-        return resourceURL == null;

-    }

-

-    @Override

-    public int hashCode() {

-        return resourceName.hashCode();

-    }

-    

-    @Override

-    public boolean equals(Object obj) {

-        if (obj == this) {

-            return true;

-        } else {

-            if (obj instanceof ResourceReference) {

-                return resourceName.equals(((ResourceReference)obj).resourceName);

-            } else {

-                return false;

-            }

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
deleted file mode 100644
index 2d03381c8a..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.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.scanner;
-
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * Interface for contribution package scanners
- * 
- * Contribution scanners understand the format of the contribution and how to get the
- * artifacts in the contribution.
- * 
- * @version $Rev$ $Date$
- */
-public interface ContributionScanner {
-    
-    /**
-     * Returns the type of package supported by this package scanner.
-     * 
-     * @return the package type
-     */
-    String getContributionType();
-
-    /**
-     * Returns a list of artifacts in the contribution.
-     * 
-     * @param contributionURL Contribution URL
-     * @return List of artifact URIs
-     * @throws ContributionException
-     * @throws IOException
-     */
-    List<String> getArtifacts(URL contributionURL) throws ContributionReadException;
-
-    /**
-     * Return the URL for an artifact in the contribution.
-     * 
-     * This is needed for archives such as jar files that have specific URL schemes
-     * for the artifacts they contain.
-     * 
-     * @param contributionURL Contribution URL
-     * @param artifact The relative URI for the artifact
-     * @return The artifact URL
-     */
-    URL getArtifactURL(URL contributionURL, String artifact) throws ContributionReadException;
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
deleted file mode 100644
index 1ca9def4ea..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.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.contribution.scanner;
-
-/**
- * An extension point for contribution scanners
- * 
- * @version $Rev$ $Date$
- */
-public interface ContributionScannerExtensionPoint {
-    
-    /**
-     * Add a ContributionScanner using the contribution type as the key.
-     * 
-     * @param scanner The contribution scanner
-     */
-    void addContributionScanner(ContributionScanner scanner);
-    
-    /**
-     * Remove a ContributionScanner.
-     * 
-     * @param scanner The contribution scanner
-     */
-    void removeContributionScanner(ContributionScanner scanner);
-    
-    /**
-     * Returns the ContributionScanner for the given contribution type.
-     * 
-     * @param contributionType The contribution type
-     * @return The contribution scanner
-     */
-    ContributionScanner getContributionScanner(String contributionType);
-    
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
deleted file mode 100644
index 24aae45b59..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.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.contribution.scanner;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of a contribution scanner extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultContributionScannerExtensionPoint implements ContributionScannerExtensionPoint {
-
-    private Map<String, ContributionScanner> scanners = new HashMap<String, ContributionScanner>();
-    private boolean loaded;
-
-    public DefaultContributionScannerExtensionPoint() {
-    }
-
-    public void addContributionScanner(ContributionScanner scanner) {
-        scanners.put(scanner.getContributionType(), scanner);
-    }
-
-    public void removeContributionScanner(ContributionScanner scanner) {
-        scanners.remove(scanner.getContributionType());
-    }
-
-    public ContributionScanner getContributionScanner(String contentType) {
-        loadScanners();
-        return scanners.get(contentType);
-    }
-
-    private void loadScanners() {
-        if (loaded)
-            return;
-
-        // Get the scanner service declarations
-        Set<ServiceDeclaration> scannerDeclarations; 
-        try {
-            scannerDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ContributionScanner.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        for (ServiceDeclaration scannerDeclaration: scannerDeclarations) {
-            Map<String, String> attributes = scannerDeclaration.getAttributes();
-            
-            // Load a URL artifact scanner
-            String contributionType = attributes.get("type");
-            
-            // Create a scanner wrapper and register it
-            ContributionScanner scanner = new LazyContributionScanner(contributionType, scannerDeclaration);
-            addContributionScanner(scanner);
-        }
-        
-        loaded = true;
-    }
-
-    /**
-     * A facade for contribution scanners.
-     */
-    private static class LazyContributionScanner implements ContributionScanner {
-        
-        private ServiceDeclaration scannerDeclaration;
-        private String contributionType;
-        private ContributionScanner scanner;
-        
-        private LazyContributionScanner(String contributionType, ServiceDeclaration scannerDeclaration) {
-            this.scannerDeclaration = scannerDeclaration;
-            this.contributionType = contributionType;
-        }
-
-        public URL getArtifactURL(URL contributionSourceURL, String artifact) throws ContributionReadException {
-            return getScanner().getArtifactURL(contributionSourceURL, artifact);
-        }
-
-        public List<String> getArtifacts(URL contributionSourceURL) throws ContributionReadException {
-            return getScanner().getArtifacts(contributionSourceURL);
-        }
-
-        public String getContributionType() {
-            return contributionType;
-        }
-        
-        private ContributionScanner getScanner() {
-            if (scanner == null) {
-                try {
-                    Class<ContributionScanner> scannerClass = (Class<ContributionScanner>)scannerDeclaration.loadClass();
-                    Constructor<ContributionScanner> constructor = scannerClass.getConstructor();
-                    scanner = constructor.newInstance();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return scanner;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
deleted file mode 100644
index e183206894..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.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.contribution.service;
-
-/**
- * Base class for exceptions raised by contribution services.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionException extends Exception {
-
-    private static final long serialVersionUID = 4432880414927652578L;
-
-    protected ContributionException() {
-        super();
-    }
-
-    protected ContributionException(String message) {
-        super(message);
-    }
-
-    protected ContributionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ContributionException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
deleted file mode 100644
index 5158eaf85c..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.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.service;
-
-import java.util.EventListener;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-
-/**
- * A listener interface used to listen to contribution repository events.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionListener extends EventListener {
-
-    /**
-     * Notifies the listener that a contribution has been added.
-     * 
-     * @param repository The contribution repository 
-     * @param contribution The new contribution
-     */
-    void contributionAdded(ContributionRepository repository, Contribution contribution);
-    
-    /**
-     * Notifies the listener that a contribution has been removed.
-     * 
-     * @param repository The contribution repository 
-     * @param contribution The removed contribution.
-     */
-    void contributionRemoved(ContributionRepository repository, Contribution contribution);
-    
-    /**
-     * Notifies the listener that a contribution has been updated.
-     * 
-     * @param repository The contribution repository 
-     * @param oldContribution The old contribution 
-     * @param contribution The new contribution
-     */
-    void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution);
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
deleted file mode 100644
index ce2b4b13c3..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.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.contribution.service;
-
-import java.util.List;
-
-public interface ContributionListenerExtensionPoint {
-
-    /**
-     * Adds a contribution repository listener extension.
-     * @param listener The listener to add
-     */
-    void addContributionListener(ContributionListener listener);
-    
-    /**
-     * Removes a contribution repository listener extension.
-     * @param listener The listener to remove
-     */
-    void removeContributionListener(ContributionListener listener);
-    
-    /**
-     * Returns the contribution repository listeners.
-     * @return
-     */
-    List<ContributionListener> getContributionListeners();
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
deleted file mode 100644
index 33399dcc2f..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.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.contribution.service;
-
-/**
- * Denotes an exception while reading artifacts inside an SCA contribution.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionReadException extends ContributionException {
-    public static final int UNDEFINED = -1;
-    private static final long serialVersionUID = -7459051598906813461L;
-    private String resourceURI;
-    private int line = UNDEFINED;
-    private int column = UNDEFINED;
-
-    public ContributionReadException(String message) {
-        super(message);
-    }
-
-    public ContributionReadException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ContributionReadException(Throwable cause) {
-        super(cause);
-    }
-    
-    /**
-     * Returns the location of the resource that was being read.
-     *
-     * @return the location of the resource that was being read
-     */
-    public String getResourceURI() {
-        return resourceURI;
-    }
-
-    /**
-     * Sets the location of the resource that was being read.
-     *
-     * @param resourceURI the location of the resource that was being read
-     */
-    public void setResourceURI(String resourceURI) {
-        this.resourceURI = resourceURI;
-    }
-
-    /**
-     * Returns the line inside the resource that was being read.
-     * @return the line inside the resource that was being read
-     */
-    public int getLine() {
-        return line;
-    }
-
-    /**
-     * Sets the line inside the resource that was being read.
-     * @param line the line inside the resource that was being read
-     */
-    public void setLine(int line) {
-        this.line = line;
-    }
-
-    /**
-     * Returns the column inside the resource that was being read.
-     * @return the column inside the resource that was being read
-     */
-    public int getColumn() {
-        return column;
-    }
-
-    /**
-     * Sets the column inside the resource that was being read.
-     * @param column the column inside the resource that was being read
-     */
-    public void setColumn(int column) {
-        this.column = column;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
deleted file mode 100644
index d7d8216f66..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.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.contribution.service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-
-/**
- * Contribution repository 
- * 
- * @version $Rev$ $Date$
- */
-public interface ContributionRepository {
-    
-    /**
-     * Get the URI of the SCA domain 
-     * 
-     * @return The domain URI
-     */
-    URI getDomain();
-    
-    /**
-     * Copies a contribution to the repository.
-     * 
-     * @param contribution A URl pointing to the contribution being copied to
-     *            the repository
-     * @param sourceURL URL of the source. this would be used to calculate the right
-     *            filename to be stored on the repository when a inputStream is being
-     *            provided
-     * @param contributionStream InputStream with the content of the
-     *            distribution
-     * @return A URL pointing to the content of the contribution in the
-     *         repository
-     * @throws IOException
-     */
-    URL store(String contribution, URL sourceURL, InputStream contributionStream) throws IOException;
-    /**
-     * Copy a contribution from the source URL to the repository
-     * 
-     * @param contribution A URl pointing to the contribution being copied to
-     *            the repository
-     * @param sourceURL URL of the source. this would be used to calculate the right
-     *            filename to be stored on the repository when a inputStream is being
-     *            provided
-     * @return A URL pointing to the content of the contribution in the
-     *         repository
-     * @throws IOException
-     */
-    URL store(String contribution, URL sourceURL) throws IOException;
-
-    /**
-     * Look up the contribution by URI
-     * 
-     * @param contribution The URI of the contribution
-     * @return A URL pointing to the content of the contribution in the
-     *         repository, it will be null if the contribution cannot be found
-     *         in the repository
-     */
-    URL find(String contribution);
-
-    /**
-     * Remove a contribution from the repository
-     * 
-     * @param contribution The URI of the contribution to be removed
-     */
-    void remove(String contribution);
-
-    /**
-     * Get list of URIs for all the contributions in the repository
-     * 
-     * @return A list of contribution URIs
-     */
-    List<String> list();
-    
-    /**
-     * Returns the contributions available in the repository.
-     * @return The list of contributions.
-     */
-    List<Contribution> getContributions();
-    
-    /**
-     * Adds a contribution to the repository.
-     * @param contribution The new contribution.
-     */
-    void addContribution(Contribution contribution);
-    
-    /**
-     * Removes a contribution from the repository.
-     * @param contribution The contribution to remove
-     */
-    void removeContribution(Contribution contribution);
-    
-    /**
-     * Updates a contribution in the repository
-     * @param contribution The contribution to update
-     */
-    void updateContribution(Contribution contribution);
-    
-    /**
-     * Returns the contribution with the given URI.
-     * @param uri the URI of the contribution
-     * @return The contribution
-     */
-    Contribution getContribution(String uri);
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
deleted file mode 100644
index ecb774ac0c..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.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.service;
-
-/**
- * Denotes a problem while resolving models inside an SCA contribution.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionResolveException extends ContributionException {
-    private static final long serialVersionUID = -7459051598906813461L;
-
-    public ContributionResolveException(String message) {
-        super(message);
-    }
-
-    public ContributionResolveException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ContributionResolveException(Throwable cause) {
-        super(cause);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
deleted file mode 100644
index 4bf29a3993..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.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.contribution.service;
-
-/**
- * Base class for runtime exceptions raised by contribution services.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionRuntimeException extends RuntimeException {
-    private static final long serialVersionUID = 7711215366287498896L;
-
-    protected ContributionRuntimeException() {
-        super();
-    }
-
-    protected ContributionRuntimeException(String message) {
-        super(message);
-    }
-
-    protected ContributionRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ContributionRuntimeException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
deleted file mode 100644
index dcdb8733b8..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.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.service;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-/**
- * Service interface that manages artifacts contributed to a Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionService {
-    /**
-     * Contribute an artifact to the SCA Domain. The type of the contribution is
-     * determined by the Content-Type of the resource or, if that is undefined,
-     * by some implementation-specific means (such as mapping an extension in
-     * the URL's path).
-     * 
-     * @param contributionURI The URI that is used as the contribution unique ID. 
-     * @param sourceURL The location of the resource containing the artifact
-     * @param storeInRepository Flag that identifies if you want to copy the
-     *            contribution to the repository
-     * @return The contribution model representing the contribution 
-     * @throws ContributionException if there was a problem with the contribution
-     * @throws IOException if there was a problem reading the resource
-     */
-    Contribution contribute(String contributionURI, URL sourceURL, boolean storeInRepository) throws ContributionException,
-        IOException;
-    
-    /**
-     * Contribute an artifact to the SCA Domain. The type of the contribution is
-     * determined by the Content-Type of the resource or, if that is undefined,
-     * by some implementation-specific means (such as mapping an extension in
-     * the URL's path).
-     * 
-     * @param contributionURI The URI that is used as the contribution unique ID. 
-     * @param sourceURL The location of the resource containing the artifact
-     * @param modelResolver The model resolver to use to resolve models in the
-     *             scope of this contribution
-     * @param storeInRepository Flag that identifies if you want to copy the
-     *            contribution to the repository
-     * @return The contribution model representing the contribution 
-     * @throws ContributionException if there was a problem with the contribution
-     * @throws IOException if there was a problem reading the resource
-     */
-    Contribution contribute(String contributionURI, URL sourceURL, ModelResolver modelResolver, boolean storeInRepository) throws ContributionException,
-        IOException;
-
-    /**
-     * Contribute an artifact to the SCA Domain.
-     * 
-     * @param contributionURI The URI that is used as the contribution unique ID.
-     * @param sourceURL The location of the resource containing the artifact. 
-     *            This is used to identify what name should be used when storing
-     *            the contribution on the repository 
-     * @param contributionContent A stream containing the resource being
-     *            contributed; the stream will not be closed but the read
-     *            position after the call is undefined
-     * @return The contribution model representing the contribution 
-     * @throws ContributionException if there was a problem with the contribution
-     * @throws IOException if there was a problem reading the stream
-     */
-    Contribution contribute(String contributionURI, URL sourceURL, InputStream contributionContent)
-        throws ContributionException, IOException;
-    
-    /**
-     * Contribute an artifact to the SCA Domain.
-     * 
-     * @param contributionURI The URI that is used as the contribution unique ID.
-     * @param sourceURL The location of the resource containing the artifact. 
-     *            This is used to identify what name should be used when storing
-     *            the contribution on the repository 
-     * @param modelResolver The model resolver to use to resolve models in the
-     *             scope of this contribution
-     * @param contributionContent A stream containing the resource being
-     *            contributed; the stream will not be closed but the read
-     *            position after the call is undefined
-     * @return The contribution model representing the contribution 
-     * @throws ContributionException if there was a problem with the contribution
-     * @throws IOException if there was a problem reading the stream
-     */
-    Contribution contribute(String contributionURI, URL sourceURL, InputStream contributionContent, ModelResolver modelResolver)
-        throws ContributionException, IOException;
-
-    /**
-     * Get the model for an installed contribution
-     * 
-     * @param contribution The URI of an installed contribution
-     * @return The model for the contribution or null if there is no such
-     *         contribution
-     */
-    Contribution getContribution(String contribution);
-
-    /**
-     * Adds or updates a deployment composite using a supplied composite
-     * ("composite by value" - a data structure, not an existing resource in the
-     * domain) to the contribution identified by a supplied contribution URI.
-     * The added or updated deployment composite is given a relative URI that
-     * matches the "name" attribute of the composite, with a ".composite"
-     * suffix.
-     * 
-     * @param contribution The contribution to where 
-     * @param composite
-     * @throws ContributionException
-     */
-    void addDeploymentComposite(Contribution contribution, Composite composite) throws ContributionException;
-
-    /**
-     * Remove a contribution from the SCA domain
-     * 
-     * @param contribution The URI of the contribution
-     * @throws DeploymentException
-     */
-    void remove(String contribution) throws ContributionException;
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
deleted file mode 100644
index 8bfdedf180..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.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.contribution.service;
-
-
-/**
- * Denotes an exception while writing artifacts inside an SCA contribution.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionWriteException extends ContributionException {
-    private static final long serialVersionUID = -7459051598906813461L;
-    private String resourceURI;
-
-    public ContributionWriteException(String message) {
-        super(message);
-    }
-
-    public ContributionWriteException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ContributionWriteException(Throwable cause) {
-        super(cause);
-    }
-    
-    /**
-     * Returns the location of the resource that was being written.
-     *
-     * @return the location of the resource that was being written
-     */
-    public String getResourceURI() {
-        return resourceURI;
-    }
-
-    /**
-     * Sets the location of the resource that was being written.
-     *
-     * @param resourceURI the location of the resource that was being written
-     */
-    public void setResourceURI(String resourceURI) {
-        this.resourceURI = resourceURI;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
deleted file mode 100644
index 1ab80e344b..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.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.contribution.service;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of a contribution listener extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultContributionListenerExtensionPoint implements ContributionListenerExtensionPoint {
-    
-    private List<ContributionListener> listeners = new CopyOnWriteArrayList<ContributionListener>();
-    private boolean loadedListeners;
-    private ModelFactoryExtensionPoint modelFactories;
-    
-    /**
-     * Constructs a new DefaultContributionListenerExtensionPoint.
-     *  
-     */
-    public DefaultContributionListenerExtensionPoint(ModelFactoryExtensionPoint modelFactories) {
-        this.modelFactories = modelFactories;
-    }
-
-    /**
-     * Constructs a new DefaultContributionListenerExtensionPoint.
-     *  
-     */
-    public DefaultContributionListenerExtensionPoint(ExtensionPointRegistry extensionPoints) {
-        this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-    }
-
-    public void addContributionListener(ContributionListener listener) {
-        listeners.add(listener);
-    }
-
-    public List<ContributionListener> getContributionListeners() {
-        loadListeners();
-        return listeners;
-    }
-
-    public void removeContributionListener(ContributionListener listener) {
-        listeners.remove(listener);
-    }
-
-    /**
-     * Dynamically load listeners declared under META-INF/services
-     */
-    @SuppressWarnings("unchecked")
-    private synchronized void loadListeners() {
-        if (loadedListeners)
-            return;
-
-        // Get the listener service declarations
-        Set<ServiceDeclaration> listenerDeclarations; 
-        try {
-            listenerDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ContributionListener.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        // Load and instantiate the listeners
-        for (ServiceDeclaration listenerDeclaration: listenerDeclarations) {
-            ContributionListener listener;
-            try {
-                Class<ContributionListener> listenerClass = (Class<ContributionListener>)listenerDeclaration.loadClass();
-                try {
-                    Constructor<ContributionListener> constructor = listenerClass.getConstructor(ModelFactoryExtensionPoint.class);
-                    try {
-                        listener = constructor.newInstance(modelFactories);
-                    } catch (InvocationTargetException e) {
-                        throw new IllegalArgumentException(e);
-                    }
-                } catch (NoSuchMethodException e) {
-                    listener = listenerClass.newInstance();
-                }
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InstantiationException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            }
-            addContributionListener(listener);
-        }
-        
-        loadedListeners = true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
deleted file mode 100644
index fc0dc3aa99..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.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.contribution.service;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-
-public class ExtensibleContributionListener implements ContributionListener {
-    private final ContributionListenerExtensionPoint listeners;
-
-    /**
-     * Default constructor receiving the listener extension point
-     * 
-     * @param listeners
-     */
-    public ExtensibleContributionListener(ContributionListenerExtensionPoint listeners) {
-        this.listeners = listeners;
-    }
-
-    /**
-     * Process "contributionAdded" event to all registered listeners
-     */
-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {
-        for (ContributionListener listener : listeners.getContributionListeners()) {
-            try {
-                listener.contributionAdded(repository, contribution);
-            } catch (Exception e) {
-                // ignore, continue to the next listener
-            }
-        }
-    }
-
-    /**
-     * Process "contributionRemoved" event to all registered listeners
-     */
-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {
-        for (ContributionListener listener : listeners.getContributionListeners()) {
-            try {
-                listener.contributionRemoved(repository, contribution);
-            } catch (Exception e) {
-                // ignore, continue to the next listener
-            }
-
-        }
-    }
-
-    /**
-     * Process "contributionUpdated" event to all registered listeners
-     */
-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {
-        for (ContributionListener listener : listeners.getContributionListeners()) {
-            try {
-                listener.contributionUpdated(repository, oldContribution, contribution);
-            } catch (Exception e) {
-                // ignore, continue to the next listener
-            }
-
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
deleted file mode 100644
index 74f303a5a5..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.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.contribution.service;
-
-import java.net.URL;
-
-/**
- * Provide content type for a given resource
- *
- * @version $Rev$ $Date$
- */
-public interface TypeDescriber {
-    /**
-     * Get the content type for the specified resource
-     * 
-     * @param resourceURL The resource URL
-     * @param defaultType The default content type
-     * @return The content type
-     */
-    String getType(URL resourceURL, String defaultType);
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
deleted file mode 100644
index ff21c894de..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.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.contribution.service;
-
-import javax.xml.namespace.QName;
-
-/**
- * Exception that indicates an element was encountered that could not be handled.
- *
- * @version $Rev$ $Date$
- */
-public class UnrecognizedElementException extends ContributionReadException {
-    private static final long serialVersionUID = 2549543622209829032L;
-    private final QName element;
-
-    /**
-     * Constructor that indicates which element could not be handled.
-     * @param element the element that could not be handled
-     */
-    public UnrecognizedElementException(QName element) {
-        super("Unrecognized element: " + element);
-        this.element = element;
-    }
-
-    /**
-     * Returns the element that could not be handled.
-     * @return the element that could not be handled.
-     */
-    public QName getElement() {
-        return element;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
deleted file mode 100644
index 0660d69897..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.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.service;
-
-/**
- * Exception thrown to indicate that a Content-Type is not supported by this SCA Domain.
- * The Content-Type value supplied will be returned as the message text for this exception.
- * 
- * FIXME Don't use as it's deprecated and replaced by UnsupportedPackageTypeException.
- *
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class UnsupportedContentTypeException extends ContributionException {
-    private static final long serialVersionUID = -1831797280021355672L;
-
-    /**
-     * Constructs a new UnsupportedContentTypeException.
-     *
-     * @param message
-     */
-    public UnsupportedContentTypeException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
deleted file mode 100644
index 33c847a049..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.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.contribution.service;
-
-/**
- * Exception thrown to indicate that a Content-Type is not supported by this SCA Domain.
- * The Content-Type value supplied will be returned as the message text for this exception.
- *
- * @version $Rev$ $Date$
- */
-public class UnsupportedPackageTypeException extends ContributionException {
-    private static final long serialVersionUID = -1831797280021355672L;
-
-    /**
-     * Constructs a new UnsupportedPackageTypeException.
-     *
-     * @param message
-     */
-    public UnsupportedPackageTypeException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
deleted file mode 100644
index bcc346d9f8..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ /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.DefaultContributionFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
deleted file mode 100644
index 6b4d2ebdeb..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ /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.DefaultModelFactoryExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
deleted file mode 100644
index 9e6433ba6c..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ /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.processor.DefaultContributionPostProcessorExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
deleted file mode 100644
index 7609eda0d1..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ /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.processor.DefaultPackageProcessorExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
deleted file mode 100644
index 8ea5fc0a7e..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ /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.processor.DefaultStAXArtifactProcessorExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
deleted file mode 100644
index 9d78ca93d0..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ /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.processor.DefaultURLArtifactProcessorExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
deleted file mode 100644
index ae6e876df6..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ /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.processor.DefaultValidationSchemaExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
deleted file mode 100644
index 4bb65e55e7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ /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.resolver.DefaultModelResolverExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
deleted file mode 100644
index 727f8f6ce7..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ /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.scanner.DefaultContributionScannerExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
deleted file mode 100644
index 6e61bebf79..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ /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.service.DefaultContributionListenerExtensionPoint

diff --git a/tags/java/sca/1.3/modules/contribution/src/main/resources/contribution-validation-messages.properties b/tags/java/sca/1.3/modules/contribution/src/main/resources/contribution-validation-messages.properties
deleted file mode 100644
index bd650fe457..0000000000
--- a/tags/java/sca/1.3/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ /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.
-#
-#
-SchemaError = XMLSchema validation error occured in: {0} ,line = {1}, column = {2}, Message = {3}
-SchemaFatalError = XMLSchema validation fatal error occured in: {0} ,line = {1}, column = {2}, Message = {3}
-SchemaWarning = XMLSchema validation warning occured in: {0} ,line = {1}, column = {2}, Message = {3}
-UnsupportedPackageTypeException = Unsupported contribution package type: {0}
-ElementCannotBeProcessed = Element {0} cannot be processed. ({1})
-NoStaxProcessor = No StAX processor is configured to handle {0}
-ContributionWriteException = ContributionWriteException occured due to :
-ContributionReadException = ContributionReadException occured due to :
-UnrecognizedElementException = Unrecognized Element : {0}
-IllegalArgumentException = Invalid qname: {0}
-PrivilegedActionException = PrivilegedActionException occured due to : 
diff --git a/tags/java/sca/1.3/modules/core-databinding/LICENSE b/tags/java/sca/1.3/modules/core-databinding/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/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/tags/java/sca/1.3/modules/core-databinding/NOTICE b/tags/java/sca/1.3/modules/core-databinding/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/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/tags/java/sca/1.3/modules/core-databinding/pom.xml b/tags/java/sca/1.3/modules/core-databinding/pom.xml
deleted file mode 100644
index 648fc90766..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/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>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-core-databinding</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA Core/DataBinding Integration</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <scope>runtime</scope>
-            <version>3.2.1</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.core.databinding</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.core.databinding*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
deleted file mode 100644
index 2056789089..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.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.core.databinding.module;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
-import org.apache.tuscany.sca.core.databinding.transformers.Array2ArrayTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.CallableReference2XMLStreamReader;
-import org.apache.tuscany.sca.core.databinding.transformers.CallableReferenceDataBinding;
-import org.apache.tuscany.sca.core.databinding.transformers.CallableReferenceXMLAdapter;
-import org.apache.tuscany.sca.core.databinding.transformers.Exception2ExceptionTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.Input2InputTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.Output2OutputTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.XMLStreamReader2CallableReference;
-import org.apache.tuscany.sca.core.databinding.wire.DataBindingRuntimeWireProcessor;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.Group2GroupTransformer;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
-import org.osoa.sca.CallableReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DataBindingModuleActivator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry registry) {
-        DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
-        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
-
-        XMLAdapterExtensionPoint xmlAdapterExtensionPoint = registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
-        xmlAdapterExtensionPoint.addAdapter(CallableReference.class, CallableReferenceXMLAdapter.class);
-        FaultExceptionMapper faultExceptionMapper = new JAXWSFaultExceptionMapper(dataBindings, xmlAdapterExtensionPoint);
-        
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        Input2InputTransformer input2InputTransformer = new Input2InputTransformer();
-        input2InputTransformer.setMediator(mediator);
-        transformers.addTransformer(input2InputTransformer, true);
-
-        Output2OutputTransformer output2OutputTransformer = new Output2OutputTransformer();
-        output2OutputTransformer.setMediator(mediator);
-        transformers.addTransformer(output2OutputTransformer, true);
-
-        Exception2ExceptionTransformer exception2ExceptionTransformer = new Exception2ExceptionTransformer(mediator, faultExceptionMapper);
-        transformers.addTransformer(exception2ExceptionTransformer, false);
-        
-        Array2ArrayTransformer array2ArrayTransformer = new Array2ArrayTransformer();
-        array2ArrayTransformer.setMediator(mediator);
-        transformers.addTransformer(array2ArrayTransformer, true);
-
-        Group2GroupTransformer group2GroupTransformer = new Group2GroupTransformer();
-        group2GroupTransformer.setMediator(mediator);
-        transformers.addTransformer(group2GroupTransformer, true);
-        
-        dataBindings.addDataBinding(new CallableReferenceDataBinding());
-        transformers.addTransformer(new CallableReference2XMLStreamReader(), true);
-        transformers.addTransformer(new XMLStreamReader2CallableReference(), false);
-
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-
-        // [rfeng] The JAX-WS processor should come before the Databinding processor to make sure @WebService
-        // is honored as Remoteable
-        javaFactory.addInterfaceVisitor(new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper, xmlAdapterExtensionPoint));
-
-        javaFactory.addInterfaceVisitor(new DataBindingJavaInterfaceProcessor(dataBindings));
-
-        RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint = registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-        if (wireProcessorExtensionPoint != null) {
-            wireProcessorExtensionPoint.addWireProcessor(new DataBindingRuntimeWireProcessor(mediator, dataBindings, faultExceptionMapper));
-        }
-        
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
deleted file mode 100644
index e182b472d4..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.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.core.databinding.processor;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-
-/**
- * The databinding annotation processor for java interfaces
- * 
- * @version $Rev$ $Date$
- */
-public class DataBindingJavaInterfaceProcessor implements JavaInterfaceVisitor {
-    private static final String JAXB_DATABINDING = "javax.xml.bind.JAXBElement";
-    private DataBindingExtensionPoint dataBindingRegistry;
-
-    public DataBindingJavaInterfaceProcessor(DataBindingExtensionPoint dataBindingRegistry) {
-        super();
-        this.dataBindingRegistry = dataBindingRegistry;
-    }
-
-    public void visitInterface(JavaInterface javaInterface) throws InvalidInterfaceException {
-        if (!javaInterface.isRemotable()) {
-            return;
-        }
-        List<Operation> operations = javaInterface.getOperations();
-        processInterface(javaInterface, operations);
-    }
-
-    private void processInterface(JavaInterface javaInterface, List<Operation> operations) {
-        Class<?> clazz = javaInterface.getJavaClass();
-        DataBinding dataBinding = clazz.getAnnotation(DataBinding.class);
-        String dataBindingId = null;
-        boolean wrapperStyle = false;
-        if (dataBinding != null) {
-            dataBindingId = dataBinding.value();
-            wrapperStyle = dataBinding.wrapped();
-        }
-
-        Map<String, Operation> opMap = new HashMap<String, Operation>();
-        for (Operation op : javaInterface.getOperations()) {
-            opMap.put(op.getName(), op);
-            // In the case of @WebMethod, the method name can be different from the operation name
-            if (op instanceof JavaOperation) {
-                opMap.put(((JavaOperation)op).getJavaMethod().getName(), op);
-            }
-            if (dataBindingId != null) {
-                op.setDataBinding(dataBindingId);
-                op.setWrapperStyle(wrapperStyle);
-            }
-        }
-        for (Method method : clazz.getMethods()) {
-            if (method.getDeclaringClass() == Object.class) {
-                continue;
-            }
-            Operation operation = opMap.get(method.getName());
-            if (operation == null) { // @WebMethod exclude=true
-                continue;
-            }
-            DataBinding methodDataBinding = clazz.getAnnotation(DataBinding.class);
-            if (methodDataBinding == null) {
-                methodDataBinding = dataBinding;
-            }
-            dataBindingId = null;
-            wrapperStyle = false;
-            if (dataBinding != null) {
-                dataBindingId = dataBinding.value();
-                wrapperStyle = dataBinding.wrapped();
-                operation.setDataBinding(dataBindingId);
-                operation.setWrapperStyle(wrapperStyle);
-            }
-
-            // FIXME: We need a better way to identify simple java types
-            int i = 0;
-            for (org.apache.tuscany.sca.interfacedef.DataType<?> d : operation.getInputType().getLogical()) {
-                if (d.getDataBinding() == null) {
-                    d.setDataBinding(dataBindingId);
-                }
-                for (Annotation a : method.getParameterAnnotations()[i]) {
-                    if (a.annotationType() == org.apache.tuscany.sca.databinding.annotation.DataType.class) {
-                        String value = ((org.apache.tuscany.sca.databinding.annotation.DataType)a).value();
-                        d.setDataBinding(value);
-                    }
-                }
-                dataBindingRegistry.introspectType(d, operation);
-                i++;
-            }
-            if (operation.getOutputType() != null) {
-                DataType<?> d = operation.getOutputType();
-                if (d.getDataBinding() == null) {
-                    d.setDataBinding(dataBindingId);
-                }
-                org.apache.tuscany.sca.databinding.annotation.DataType dt =
-                    method.getAnnotation(org.apache.tuscany.sca.databinding.annotation.DataType.class);
-                if (dt != null) {
-                    d.setDataBinding(dt.value());
-                }
-                dataBindingRegistry.introspectType(d, operation);
-            }
-            for (org.apache.tuscany.sca.interfacedef.DataType<?> d : operation.getFaultTypes()) {
-                if (d.getDataBinding() == null) {
-                    d.setDataBinding(dataBindingId);
-                }
-                // TODO: Handle exceptions
-                dataBindingRegistry.introspectType(d, operation);
-            }
-
-            // JIRA: TUSCANY-842
-            String db = operation.getDataBinding();
-            if (db == null || JAXB_DATABINDING.equals(db)) {
-                assignOperationDataBinding(operation);
-                db = operation.getDataBinding();
-            }
-
-            // Introspect the wrapper data type
-            if (operation.getWrapper() != null) {
-                org.apache.tuscany.sca.databinding.DataBinding dbObj =
-                    dataBindingRegistry.getDataBinding(db);
-                WrapperHandler handler = dbObj == null ? null : dbObj.getWrapperHandler();
-                if (handler != null) {
-                    WrapperInfo wrapper = operation.getWrapper();
-                    wrapper.setInputWrapperType(handler.getWrapperType(operation, true));
-                    wrapper.setOutputWrapperType(handler.getWrapperType(operation, false));
-                }
-                if (dbObj != null && handler == null) {
-                    // To avoid JAXB wrapper bean generation
-                    WrapperInfo wrapper = operation.getWrapper();
-                    wrapper.setInputWrapperType(null);
-                    wrapper.setOutputWrapperType(null);
-                }
-            }
-        }
-    }
-
-    /*
-     *  Assigns an operation DB if one of the input types, output type, fault types has a non-default DB.
-     *  However, if two of the input types, output type, fault types have two different non-default DBs 
-     *  ( e.g. SDO and JAXB), then we do nothing to the operation DB.
-     *  
-     *  The method logic assumes the JavaBeans DataBinding is the default 
-     */
-    private void assignOperationDataBinding(Operation operation) {
-
-        Set<String> dbs = new HashSet<String>();
-
-        // Can't use DataType<?> since operation.getInputType() returns: DataType<List<DataType>> 
-        List<DataType> opDataTypes = new LinkedList<DataType>();
-
-        opDataTypes.addAll(operation.getInputType().getLogical());
-        opDataTypes.add(operation.getOutputType());
-        for (DataType<DataType> ft : operation.getFaultTypes()) {
-            opDataTypes.add(ft.getLogical());
-        }
-
-        for (DataType<?> d : opDataTypes) {
-            if (d != null) {
-                String dataBinding = d.getDataBinding();
-                if ("java:array".equals(dataBinding)) {
-                    dataBinding = ((DataType)d.getLogical()).getDataBinding();
-                }
-                if (dataBinding != null) {
-                    dbs.add(dataBinding);
-                }
-            }
-        }
-
-        dbs.remove(JavaBeansDataBinding.NAME);
-        dbs.remove(SimpleJavaDataBinding.NAME);
-
-        if (dbs.size() == 1) {
-            operation.setDataBinding(dbs.iterator().next());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
deleted file mode 100644
index 38ca2cd10c..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.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.core.databinding.transformers;
-
-import java.lang.reflect.Array;
-
-import org.apache.tuscany.sca.databinding.Mediator;
-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.interfacedef.DataType;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This is a special transformer to transform the output from one IDL to the
- * other one
- *
- * @version $Rev$ $Date$
- */
-public class Array2ArrayTransformer extends BaseTransformer<Object, Object> implements PullTransformer<Object, Object> {
-
-    protected Mediator mediator;
-
-    public Array2ArrayTransformer() {
-        super();
-    }
-
-    /**
-     * @param mediator the mediator to set
-     */
-    @Reference
-    public void setMediator(Mediator mediator) {
-        this.mediator = mediator;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "java:array";
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "java:array";
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
-     */
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
-     */
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object transform(Object array, TransformationContext context) {
-        try {
-            if (array == null) {
-                return null;
-            }
-            DataType<DataType> sourceType = context.getSourceDataType();
-            DataType<DataType> targetType = context.getTargetDataType();
-            int length = Array.getLength(array);
-            Object targetArray = Array.newInstance(targetType.getPhysical().getComponentType(), length);
-            for (int i = 0; i < length; i++) {
-                Object sourceItem = Array.get(array, i);
-                Object targetItem =
-                    mediator.mediate(sourceItem, sourceType.getLogical(), targetType.getLogical(), context
-                        .getMetadata());
-                Array.set(targetArray, i, targetItem);
-            }
-            return targetArray;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
deleted file mode 100644
index 124928db24..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.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.core.databinding.transformers;

-

-import javax.xml.stream.XMLStreamReader;

-

-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;

-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.StAXHelper;

-import org.osoa.sca.CallableReference;

-

-public class CallableReference2XMLStreamReader extends BaseTransformer<CallableReference, XMLStreamReader> implements

-    PullTransformer<CallableReference, XMLStreamReader> {

-

-    @Override

-    protected Class<CallableReference> getSourceType() {

-        return CallableReference.class;

-    }

-

-    @Override

-    protected Class<XMLStreamReader> getTargetType() {

-        return XMLStreamReader.class;

-    }

-

-    public XMLStreamReader transform(CallableReference source, TransformationContext context) {

-        try {

-            if (source != null) {

-                if (source instanceof CallableReferenceImpl) {

-                    XMLStreamReader xmlReader = ((CallableReferenceImpl)source).getXMLReader();

-                    if (xmlReader != null) {

-                        return xmlReader;

-                    } else {

-                        String xmlString = ((CallableReferenceImpl)source).toXMLString();

-

-                        // remove "<?xml...?>" processing instruction and wrap with a top-level element

-                        return StAXHelper.createXMLStreamReader("<reference xmlns=\"http://callable\">"

-                                        + xmlString.substring(xmlString.indexOf("?>") + 2)

-                                        + "</reference>");

-                    }

-                } else {   

-                    throw new TransformationException("Unrecognized transformation source object");

-                }

-            } else {

-                return null;

-            }

-        } catch (Exception e) {

-            throw new TransformationException(e);

-        }

-    }

-	

-    @Override

-    public int getWeight() {

-        return 10;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
deleted file mode 100644
index 7384b8a31d..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.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.core.databinding.transformers;

-

-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;

-import org.osoa.sca.CallableReference;

-

-public class CallableReferenceDataBinding extends BaseDataBinding {

-    

-    public static final String NAME = CallableReference.class.getName();

-    public static final String[] ALIASES = new String[] {"callablereference"};

-

-    public CallableReferenceDataBinding() {

-        super(NAME, ALIASES, CallableReference.class);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
deleted file mode 100644
index ff6e444dcd..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.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.core.databinding.transformers;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;
-import org.osoa.sca.CallableReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CallableReferenceXMLAdapter extends XmlAdapter<Source, CallableReference> {
-    private TransformerFactory transformerFactory = TransformerFactory.newInstance();
-    private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-    @Override
-    public CallableReference unmarshal(Source v) throws Exception {
-        StringWriter sw = new StringWriter();
-        StreamResult result = new StreamResult(sw);
-        transformerFactory.newTransformer().transform(v, result);
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(sw.toString()));
-        XMLStreamReader2CallableReference t2 = new XMLStreamReader2CallableReference();
-        return t2.transform(reader, null);
-    }
-
-    @Override
-    public Source marshal(CallableReference v) throws Exception {
-        CallableReference2XMLStreamReader t = new CallableReference2XMLStreamReader();
-        XMLStreamReader reader = t.transform(v, null);
-        XMLStreamReader2String t2 = new XMLStreamReader2String();
-        String xml = t2.transform(reader, null);
-        return new StreamSource(new StringReader(xml));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
deleted file mode 100644
index 6e2e714bdb..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.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.core.databinding.transformers;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-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.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-
-/**
- * This is a special transformer to transform the exception from one IDL to the
- * other one
- *
- * @version $Rev$ $Date$
- */
-public class Exception2ExceptionTransformer extends BaseTransformer<Throwable, Throwable> implements
-    PullTransformer<Throwable, Throwable> {
-
-    protected Mediator mediator;
-    protected FaultExceptionMapper faultExceptionMapper;
-
-    public Exception2ExceptionTransformer(Mediator mediator, FaultExceptionMapper faultExceptionMapper) {
-        super();
-        this.mediator = mediator;
-        this.faultExceptionMapper = faultExceptionMapper;
-    }
-
-    public Exception2ExceptionTransformer() {
-        super();
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return DataBinding.IDL_FAULT;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return DataBinding.IDL_FAULT;
-    }
-
-    /**
-     * @param mediator the mediator to set
-     */
-    public void setMediator(Mediator mediator) {
-        this.mediator = mediator;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
-     */
-    @Override
-    protected Class<Throwable> getSourceType() {
-        return Throwable.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
-     */
-    @Override
-    protected Class<Throwable> getTargetType() {
-        return Throwable.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Throwable transform(Throwable source, TransformationContext context) {
-        DataType<DataType> sourceType = context.getSourceDataType();
-
-        DataType<DataType> targetType = context.getTargetDataType();
-
-        Object sourceFaultInfo = faultExceptionMapper.getFaultInfo(source, sourceType.getLogical().getPhysical(), context.getSourceOperation());
-        Object targetFaultInfo =
-            mediator.mediate(sourceFaultInfo, sourceType.getLogical(), targetType.getLogical(), context.getMetadata());
-
-        Throwable targetException =
-            faultExceptionMapper.wrapFaultInfo(targetType, source.getMessage(), targetFaultInfo, source.getCause(), context.getTargetOperation());
-
-        // FIXME
-        return targetException == null ? source : targetException;
-
-    }
-
-    public void setFaultExceptionMapper(FaultExceptionMapper faultExceptionMapper) {
-        this.faultExceptionMapper = faultExceptionMapper;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
deleted file mode 100644
index 71694c0a0a..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.core.databinding.transformers;
-
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-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.WrapperHandler;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-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.tuscany.sca.interfacedef.util.XMLType;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This is a special transformer to transform the input from one IDL to the
- * other one
- *
- * @version $Rev$ $Date$
- */
-public class Input2InputTransformer extends BaseTransformer<Object[], Object[]> implements
-    PullTransformer<Object[], Object[]> {
-    private static final Logger logger = Logger.getLogger(Input2InputTransformer.class.getName());
-
-    protected Mediator mediator;
-
-    public Input2InputTransformer() {
-        super();
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return DataBinding.IDL_INPUT;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return DataBinding.IDL_INPUT;
-    }
-
-    /**
-     * @param mediator the mediator to set
-     */
-    @Reference
-    public void setMediator(Mediator mediator) {
-        this.mediator = mediator;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
-     */
-    @Override
-    protected Class<Object[]> getSourceType() {
-        return Object[].class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
-     */
-    @Override
-    protected Class<Object[]> getTargetType() {
-        return Object[].class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-    /**
-     * Match the structure of the wrapper element. If it matches, then we can do
-     * wrapper to wrapper transformation. Otherwise, we do child to child.
-     * @param w1
-     * @param w2
-     * @return
-     */
-    private boolean matches(WrapperInfo w1, WrapperInfo w2) {
-        if (w1 == null || w2 == null) {
-            return false;
-        }
-        if (!w1.getInputWrapperElement().equals(w2.getInputWrapperElement())) {
-            return false;
-        }
-
-        // Compare the child elements
-        List<ElementInfo> list1 = w1.getInputChildElements();
-        List<ElementInfo> list2 = w2.getInputChildElements();
-        if (list1.size() != list2.size()) {
-            return false;
-        }
-        // FXIME: [rfeng] At this point, the J2W generates local elments under the namespace
-        // of the interface instead of "". We only compare the local parts only to work around
-        // the namespace mismatch
-        for (int i = 0; i < list1.size(); i++) {
-            String n1 = list1.get(i).getQName().getLocalPart();
-            String n2 = list2.get(i).getQName().getLocalPart();
-            if (!n1.equals(n2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object[] transform(Object[] source, TransformationContext context) {
-        // Check if the source operation is wrapped
-        DataType<List<DataType>> sourceType = context.getSourceDataType();
-        Operation sourceOp = context.getSourceOperation();
-        boolean sourceWrapped = sourceOp != null && sourceOp.isWrapperStyle();
-
-        // Find the wrapper handler for source data
-        WrapperHandler sourceWrapperHandler = null;
-        String sourceDataBinding = getDataBinding(sourceOp);
-        sourceWrapperHandler = getWrapperHandler(sourceDataBinding, sourceWrapped);
-
-        // Check if the target operation is wrapped
-        DataType<List<DataType>> targetType = context.getTargetDataType();
-        Operation targetOp = (Operation)context.getTargetOperation();
-        boolean targetWrapped = targetOp != null && targetOp.isWrapperStyle();
-
-        // Find the wrapper handler for target data
-        WrapperHandler targetWrapperHandler = null;
-        String targetDataBinding = getDataBinding(targetOp);
-        targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped);
-
-        if ((!sourceWrapped) && targetWrapped) {
-            // Unwrapped --> Wrapped
-            WrapperInfo wrapper = targetOp.getWrapper();
-            ElementInfo wrapperElement = wrapper.getInputWrapperElement();
-
-            Class<?> targetWrapperClass = wrapper != null ? wrapper.getInputWrapperClass() : null;
-
-            if (source == null) {
-                // Empty child elements
-                Object targetWrapper = targetWrapperHandler.create(targetOp, true);
-                return new Object[] {targetWrapper};
-            }
-
-            // If the source can be wrapped, wrapped it first
-            if (sourceWrapperHandler != null) {
-                WrapperInfo sourceWrapperInfo = sourceOp.getWrapper();
-                DataType sourceWrapperType = sourceWrapperInfo != null ? sourceWrapperInfo.getInputWrapperType() : null;
-
-                // We only do wrapper to wrapper transformation if the source has a wrapper and both sides
-                // match by XML structure
-                if (sourceWrapperType != null && matches(sourceOp.getWrapper(), targetOp.getWrapper())) {
-                    Class<?> sourceWrapperClass = sourceWrapperType.getPhysical();
-
-                    // Create the source wrapper
-                    Object sourceWrapper = sourceWrapperHandler.create(sourceOp, true);
-
-                    // Populate the source wrapper
-                    if (sourceWrapper != null) {
-                        sourceWrapperHandler.setChildren(sourceWrapper,
-                                                         source,
-                                                         sourceOp,
-                                                         true);
-
-                        // Transform the data from source wrapper to target wrapper
-                        Object targetWrapper =
-                            mediator.mediate(sourceWrapper, sourceWrapperType, targetType.getLogical().get(0), context
-                                .getMetadata());
-                        return new Object[] {targetWrapper};
-                    }
-                }
-            }
-            // Fall back to child by child transformation
-            Object targetWrapper = targetWrapperHandler.create(targetOp, true);
-            List<DataType> argTypes = wrapper.getUnwrappedInputType().getLogical();
-            Object[] targetChildren = new Object[source.length];
-            for (int i = 0; i < source.length; i++) {
-                // ElementInfo argElement = wrapper.getInputChildElements().get(i);
-                DataType<XMLType> argType = argTypes.get(i);
-                targetChildren[i] =
-                    mediator.mediate(source[i], sourceType.getLogical().get(i), argType, context.getMetadata());
-            }
-            targetWrapperHandler.setChildren(targetWrapper,
-                                             targetChildren,
-                                             targetOp,
-                                             true);
-            return new Object[] {targetWrapper};
-
-        } else if (sourceWrapped && (!targetWrapped)) {
-            // Wrapped to Unwrapped
-            Object sourceWrapper = source[0];
-            Object[] target = null;
-
-            List<ElementInfo> childElements = sourceOp.getWrapper().getInputChildElements();
-            if (targetWrapperHandler != null) {
-                ElementInfo wrapperElement = sourceOp.getWrapper().getInputWrapperElement();
-                // FIXME: This is a workaround for the wsdless support as it passes in child elements
-                // under the wrapper that only matches by position
-                if (sourceWrapperHandler.isInstance(sourceWrapper, sourceOp, true)) {
-
-                    WrapperInfo targetWrapperInfo = targetOp.getWrapper();
-                    DataType targetWrapperType =
-                        targetWrapperInfo != null ? targetWrapperInfo.getInputWrapperType() : null;
-                    if (targetWrapperType != null && matches(sourceOp.getWrapper(), targetOp.getWrapper())) {
-                        Object targetWrapper =
-                            mediator.mediate(sourceWrapper, sourceType.getLogical().get(0), targetWrapperType, context
-                                .getMetadata());
-                        target = targetWrapperHandler.getChildren(targetWrapper, targetOp, true).toArray();
-                        return target;
-                    }
-                }
-            }
-            Object[] sourceChildren = sourceWrapperHandler.getChildren(sourceWrapper, sourceOp, true).toArray();
-            target = new Object[sourceChildren.length];
-            for (int i = 0; i < sourceChildren.length; i++) {
-                DataType<XMLType> childType = sourceOp.getWrapper().getUnwrappedInputType().getLogical().get(i);
-                target[i] =
-                    mediator.mediate(sourceChildren[i], childType, targetType.getLogical().get(i), context
-                        .getMetadata());
-            }
-            return target;
-        } else {
-            // Assuming wrapper to wrapper conversion can be handled here as well
-            Object[] newArgs = new Object[source.length];
-            for (int i = 0; i < source.length; i++) {
-                Object child =
-                    mediator.mediate(source[i], sourceType.getLogical().get(i), targetType.getLogical().get(i), context
-                        .getMetadata());
-                newArgs[i] = child;
-            }
-            return newArgs;
-        }
-    }
-
-    private WrapperHandler getWrapperHandler(String dataBindingId, boolean required) {
-        WrapperHandler wrapperHandler = null;
-        if (dataBindingId != null) {
-            DataBinding dataBinding = mediator.getDataBindings().getDataBinding(dataBindingId);
-            wrapperHandler = dataBinding == null ? null : dataBinding.getWrapperHandler();
-        }
-        if (wrapperHandler == null && required) {
-            throw new TransformationException("No wrapper handler is provided for databinding: " + dataBindingId);
-        }
-        return wrapperHandler;
-    }
-
-    private String getDataBinding(Operation operation) {
-        WrapperInfo wrapper = operation.getWrapper();
-        if (wrapper != null) {
-            return wrapper.getDataBinding();
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
deleted file mode 100644
index 71253f00b4..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.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 org.apache.tuscany.sca.core.databinding.transformers;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-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.WrapperHandler;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-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.tuscany.sca.interfacedef.util.XMLType;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This is a special transformer to transform the output from one IDL to the
- * other one
- *
- * @version $Rev$ $Date$
- */
-public class Output2OutputTransformer extends BaseTransformer<Object, Object> implements
-    PullTransformer<Object, Object> {
-
-    protected Mediator mediator;
-
-    /**
-     * @param wrapperHandler
-     */
-    public Output2OutputTransformer() {
-        super();
-    }
-
-    /**
-     * @param mediator the mediator to set
-     */
-    @Reference
-    public void setMediator(Mediator mediator) {
-        this.mediator = mediator;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return DataBinding.IDL_OUTPUT;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return DataBinding.IDL_OUTPUT;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
-     */
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
-     */
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-    private String getDataBinding(Operation operation) {
-        WrapperInfo wrapper = operation.getWrapper();
-        if (wrapper != null) {
-            return wrapper.getDataBinding();
-        } else {
-            return null;
-        }
-    }
-
-    private WrapperHandler getWrapperHandler(String dataBindingId, boolean required) {
-        WrapperHandler wrapperHandler = null;
-        if (dataBindingId != null) {
-            DataBinding dataBinding = mediator.getDataBindings().getDataBinding(dataBindingId);
-            wrapperHandler = dataBinding == null ? null : dataBinding.getWrapperHandler();
-        }
-        if (wrapperHandler == null && required) {
-            throw new TransformationException("No wrapper handler is provided for databinding: " + dataBindingId);
-        }
-        return wrapperHandler;
-    }
-
-    /**
-     * Match the structure of the wrapper element. If it matches, then we can do
-     * wrapper to wrapper transformation. Otherwise, we do child to child.
-     * @param w1
-     * @param w2
-     * @return
-     */
-    private boolean matches(WrapperInfo w1, WrapperInfo w2) {
-        if (w1 == null || w2 == null) {
-            return false;
-        }
-        if (!w1.getOutputWrapperElement().equals(w2.getOutputWrapperElement())) {
-            return false;
-        }
-
-        // Compare the child elements
-        List<ElementInfo> list1 = w1.getOutputChildElements();
-        List<ElementInfo> list2 = w2.getOutputChildElements();
-        if (list1.size() != list2.size()) {
-            return false;
-        }
-        // FXIME: [rfeng] At this point, the J2W generates local elments under the namespace
-        // of the interface instead of "". We only compare the local parts only to work around
-        // the namespace mismatch
-        for (int i = 0; i < list1.size(); i++) {
-            String n1 = list1.get(i).getQName().getLocalPart();
-            String n2 = list2.get(i).getQName().getLocalPart();
-            if (!n1.equals(n2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object transform(Object response, TransformationContext context) {
-        try {
-            DataType<DataType> sourceType = context.getSourceDataType();
-            Operation sourceOp = context.getSourceOperation();
-            boolean sourceWrapped = sourceOp != null && sourceOp.isWrapperStyle();
-
-            WrapperHandler sourceWrapperHandler = null;
-            String sourceDataBinding = getDataBinding(sourceOp);
-            sourceWrapperHandler = getWrapperHandler(sourceDataBinding, sourceWrapped);
-
-            DataType<DataType> targetType = context.getTargetDataType();
-            Operation targetOp = (Operation)context.getTargetOperation();
-            boolean targetWrapped = targetOp != null && targetOp.isWrapperStyle();
-            WrapperHandler targetWrapperHandler = null;
-            String targetDataBinding = getDataBinding(targetOp);
-            targetWrapperHandler = getWrapperHandler(targetDataBinding, targetWrapped);
-
-            if ((!sourceWrapped) && targetWrapped) {
-                // Unwrapped --> Wrapped
-                WrapperInfo wrapper = targetOp.getWrapper();
-                ElementInfo wrapperElement = wrapper.getOutputWrapperElement();
-                List<ElementInfo> childElements = wrapper.getOutputChildElements();
-                Class<?> targetWrapperClass = wrapper != null ? wrapper.getOutputWrapperClass() : null;
-
-                // If the source can be wrapped, wrapped it first
-                if (sourceWrapperHandler != null) {
-                    WrapperInfo sourceWrapperInfo = sourceOp.getWrapper();
-                    DataType sourceWrapperType =
-                        sourceWrapperInfo != null ? sourceWrapperInfo.getOutputWrapperType() : null;
-
-                    if (sourceWrapperType != null && matches(sourceOp.getWrapper(), targetOp.getWrapper())) {
-                        Class<?> sourceWrapperClass = sourceWrapperType.getPhysical();
-
-                        Object sourceWrapper = sourceWrapperHandler.create(sourceOp, false);
-                        if (sourceWrapper != null) {
-                            if (!childElements.isEmpty()) {
-                                // Set the return value
-                                sourceWrapperHandler.setChildren(sourceWrapper,
-                                                                 new Object[] {response},
-                                                                 sourceOp,
-                                                                 false);
-                            }
-                            Object targetWrapper =
-                                mediator.mediate(sourceWrapper, sourceWrapperType, targetType.getLogical(), context
-                                    .getMetadata());
-                            return targetWrapper;
-                        }
-                    }
-                }
-                Object targetWrapper = targetWrapperHandler.create(targetOp, false);
-
-                if (childElements.isEmpty()) {
-                    // void output
-                    return targetWrapper;
-                }
-
-                DataType<XMLType> argType = wrapper.getUnwrappedOutputType();
-                Object child = response;
-                child = mediator.mediate(response, sourceType.getLogical(), argType, context.getMetadata());
-                targetWrapperHandler.setChildren(targetWrapper, new Object[] {child}, targetOp, false);
-                return targetWrapper;
-            } else if (sourceWrapped && (!targetWrapped)) {
-                // Wrapped to Unwrapped
-                Object sourceWrapper = response;
-                List<ElementInfo> childElements = sourceOp.getWrapper().getOutputChildElements();
-                if (childElements.isEmpty()) {
-                    // The void output
-                    return null;
-                }
-                if (targetWrapperHandler != null) {
-                    ElementInfo wrapperElement = sourceOp.getWrapper().getOutputWrapperElement();
-
-                    // FIXME: This is a workaround for the wsdless support as it passes in child elements
-                    // under the wrapper that only matches by position
-                    if (sourceWrapperHandler.isInstance(sourceWrapper, sourceOp, false)) {
-
-                        WrapperInfo targetWrapperInfo = targetOp.getWrapper();
-                        DataType targetWrapperType =
-                            targetWrapperInfo != null ? targetWrapperInfo.getOutputWrapperType() : null;
-
-                        if (targetWrapperType != null && matches(sourceOp.getWrapper(), targetOp.getWrapper())) {
-                            Object targetWrapper =
-                                mediator.mediate(sourceWrapper, sourceType.getLogical(), targetWrapperType, context
-                                    .getMetadata());
-                            return targetWrapperHandler.getChildren(targetWrapper, targetOp, false).get(0);
-                        }
-                    }
-                }
-                Object child = sourceWrapperHandler.getChildren(sourceWrapper, sourceOp, false).get(0);
-                DataType<?> childType = sourceOp.getWrapper().getUnwrappedOutputType();
-                return mediator.mediate(child, childType, targetType.getLogical(), context.getMetadata());
-            } else {
-                // FIXME: Do we want to handle wrapped to wrapped?
-                return mediator.mediate(response, sourceType.getLogical(), targetType.getLogical(), context
-                    .getMetadata());
-            }
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
deleted file mode 100644
index 841efa9398..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.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.core.databinding.transformers;

-

-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;

-

-import java.lang.reflect.Constructor;

-

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-import javax.xml.stream.XMLStreamReader;

-

-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;

-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;

-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.osoa.sca.CallableReference;

-

-@SuppressWarnings("unchecked")

-public class XMLStreamReader2CallableReference extends BaseTransformer<XMLStreamReader, CallableReference>

-            implements PullTransformer<XMLStreamReader, CallableReference> {

-

-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

-    private static final String COMPOSITE = "composite";

-    public static final QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);

-    

-    public CallableReference transform(XMLStreamReader source, TransformationContext context) {

-        try {

-            if (source != null) {

-                skipTopLevelElement(source);

-                Class refType = context.getTargetDataType().getPhysical();

-                Class implType;

-                if (refType.isAssignableFrom(CallableReferenceImpl.class)) {

-                    implType = CallableReferenceImpl.class;

-                } else if (refType.isAssignableFrom(ServiceReferenceImpl.class)) {

-                    implType = ServiceReferenceImpl.class;

-                } else {   

-                    throw new TransformationException("Unrecognized transformation target type");

-                }

-                Constructor constructor = implType.getConstructor(new Class[] {XMLStreamReader.class});

-                return (CallableReference)constructor.newInstance(new Object[] {source});

-            } else {

-                return null;

-            }

-        } catch (Exception e) {

-            throw new TransformationException(e);

-        }

-    }

-

-    /*

-     * Step over top-level element added by CallableReference2XMLStreamReader

-     */

-    private void skipTopLevelElement(XMLStreamReader source) throws XMLStreamException {

-        while (source.hasNext()) {

-            int event = source.getEventType();

-            if (event == START_ELEMENT) {

-                QName name = source.getName();

-                if (COMPOSITE_QNAME.equals(name)) {

-                    return;

-                }

-            }

-            source.next();

-        }

-        throw new TransformationException("<composite> element not found");

-    }

-

-    @Override

-    protected Class<XMLStreamReader> getSourceType() {

-        return XMLStreamReader.class;

-    }

-

-    @Override

-    protected Class<CallableReference> getTargetType() {

-        return CallableReference.class;

-    }

-

-    @Override

-    public int getWeight() {

-        return 10;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
deleted file mode 100644
index e5965db2c5..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.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.core.databinding.wire;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-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.InvocationChain;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-
-/**
- * This processor is responsible to add an interceptor to invocation chain if
- * the source and target operations have different databinding requirements
- * 
- * @version $Rev$ $Date$
- */
-public class DataBindingRuntimeWireProcessor implements RuntimeWireProcessor {
-    private Mediator mediator;
-    private DataBindingExtensionPoint dataBindings;
-    private FaultExceptionMapper faultExceptionMapper;
-
-    public DataBindingRuntimeWireProcessor(Mediator mediator,
-                                           DataBindingExtensionPoint dataBindings,
-                                           FaultExceptionMapper faultExceptionMapper) {
-        super();
-        this.mediator = mediator;
-        this.dataBindings = dataBindings;
-        this.faultExceptionMapper = faultExceptionMapper;
-    }
-
-    public boolean isTransformationRequired(DataType source, DataType target) {
-        if (source == null || target == null) { // void return type
-            return false;
-        }
-        if (source == target) {
-            return false;
-        }
-
-        // Output type can be null
-        if (source == null && target == null) {
-            return false;
-        } else if (source == null || target == null) {
-            return true;
-        }
-        String sourceDataBinding = source.getDataBinding();
-        String targetDataBinding = target.getDataBinding();
-        if (sourceDataBinding == targetDataBinding) {
-            return false;
-        }
-        if (sourceDataBinding == null || targetDataBinding == null) {
-            // TODO: If any of the databinding is null, then no transformation
-            return false;
-        }
-        return !sourceDataBinding.equals(targetDataBinding);
-    }
-
-    public boolean isTransformationRequired(Operation source, Operation target) {
-        if (source == target) {
-            return false;
-        }
-
-        if (source.isWrapperStyle() != target.isWrapperStyle()) {
-            return true;
-        }
-
-        // Check output type
-        DataType sourceOutputType = source.getOutputType();
-        DataType targetOutputType = target.getOutputType();
-
-        // Note the target output type is now the source for checking
-        // compatibility
-        if (isTransformationRequired(targetOutputType, sourceOutputType)) {
-            return true;
-        }
-
-        List<DataType> sourceInputType = source.getInputType().getLogical();
-        List<DataType> targetInputType = target.getInputType().getLogical();
-
-        int size = sourceInputType.size();
-        if (size != targetInputType.size()) {
-            // TUSCANY-1682: The wrapper style may have different arguments
-            return true;
-        }
-        for (int i = 0; i < size; i++) {
-            if (isTransformationRequired(sourceInputType.get(i), targetInputType.get(i))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private boolean isTransformationRequired(InterfaceContract sourceContract,
-                                             Operation sourceOperation,
-                                             InterfaceContract targetContract,
-                                             Operation targetOperation) {
-        if (targetContract == null) {
-            targetContract = sourceContract;
-        }
-        if (sourceContract == targetContract) {
-            return false;
-        }
-        return isTransformationRequired(sourceOperation, targetOperation);
-    }
-
-    public void process(RuntimeWire wire) {
-        InterfaceContract sourceContract = wire.getSource().getInterfaceContract();
-        InterfaceContract targetContract = wire.getTarget().getInterfaceContract();
-        if (targetContract == null) {
-            targetContract = sourceContract;
-        }
-
-        if (!sourceContract.getInterface().isRemotable()) {
-            return;
-        }
-        List<InvocationChain> chains = wire.getInvocationChains();
-        for (InvocationChain chain : chains) {
-            Operation sourceOperation = chain.getSourceOperation();
-            Operation targetOperation = chain.getTargetOperation();
-
-            Interceptor interceptor = null;
-            if (isTransformationRequired(sourceContract, sourceOperation, targetContract, targetOperation)) {
-                // Add the interceptor to the source side because multiple
-                // references can be wired to the same service
-                interceptor =
-                    new DataTransformationInterceptor(wire, sourceOperation, targetOperation, mediator,
-                                                      faultExceptionMapper);
-            } else {
-                // assume pass-by-values copies are required if interfaces are remotable and there is no data binding
-                // transformation, i.e. a transformation will result in a copy so another pass-by-value copy is unnecessary
-                if (isRemotable(chain, sourceOperation, targetOperation)) {
-                    interceptor =
-                        new PassByValueInterceptor(dataBindings, faultExceptionMapper, chain, targetOperation);
-                }
-            }
-            if (interceptor != null) {
-                String phase =
-                    (wire.getSource().getContract() instanceof ComponentReference) ? Phase.REFERENCE_INTERFACE
-                        : Phase.SERVICE_INTERFACE;
-                chain.addInterceptor(phase, interceptor);
-            }
-        }
-
-    }
-
-    /**
-     * Pass-by-value copies are required if the interfaces are remotable unless the
-     * implementation uses the @AllowsPassByReference annotation.
-     */
-    protected boolean isRemotable(InvocationChain chain, Operation sourceOperation, Operation targetOperation) {
-        if (!sourceOperation.getInterface().isRemotable()) {
-            return false;
-        }
-        if (!targetOperation.getInterface().isRemotable()) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
deleted file mode 100644
index 5814f3d215..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.core.databinding.wire;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * An interceptor to transform data across databindings on the wire
- * 
- * @version $Rev$ $Date$
- */
-public class DataTransformationInterceptor implements Interceptor, DataExchangeSemantics {
-    private Invoker next;
-
-    private Operation sourceOperation;
-
-    private Operation targetOperation;
-    private RuntimeWire wire;
-    private Mediator mediator;
-    private FaultExceptionMapper faultExceptionMapper;
-
-    public DataTransformationInterceptor(RuntimeWire wire,
-                                         Operation sourceOperation,
-                                         Operation targetOperation,
-                                         Mediator mediator,
-                                         FaultExceptionMapper faultExceptionMapper) {
-        super();
-        this.sourceOperation = sourceOperation;
-        this.targetOperation = targetOperation;
-        this.mediator = mediator;
-        this.wire = wire;
-        this.faultExceptionMapper = faultExceptionMapper;
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public Message invoke(Message msg) {
-        Object input = transform(msg.getBody(), sourceOperation.getInputType(), targetOperation.getInputType(), false);
-        msg.setBody(input);
-        Message resultMsg = next.invoke(msg);
-        Object result = resultMsg.getBody();
-        if (sourceOperation.isNonBlocking()) {
-            // Not to reset the message body
-            return resultMsg;
-        }
-
-        // FIXME: Should we fix the Operation model so that getOutputType
-        // returns DataType<DataType<T>>?
-        DataType<DataType> targetType =
-            new DataTypeImpl<DataType>(DataBinding.IDL_OUTPUT, Object.class, targetOperation.getOutputType());
-
-        DataType<DataType> sourceType =
-            new DataTypeImpl<DataType>(DataBinding.IDL_OUTPUT, Object.class, sourceOperation.getOutputType());
-
-        if (resultMsg.isFault()) {
-
-            // FIXME: We need to figure out what fault type it is and then
-            // transform it
-            // back the source fault type
-            // throw new InvocationRuntimeException((Throwable) result);
-
-            if ((result instanceof Exception) && !(result instanceof RuntimeException)) {
-                // FIXME: How to match fault data to a fault type for the
-                // operation?
-
-                // If the result is from an InvocationTargetException look at
-                // the actual cause.
-                if (result instanceof InvocationTargetException) {
-                    result = ((InvocationTargetException)result).getCause();
-                }
-                DataType targetDataType = null;
-                for (DataType exType : targetOperation.getFaultTypes()) {
-                    if (((Class)exType.getPhysical()).isInstance(result)) {
-                        if (result instanceof FaultException) {
-                            DataType faultType = (DataType)exType.getLogical();
-                            if (((FaultException)result).isMatchingType(faultType.getLogical())) {
-                                targetDataType = exType;
-                                break;
-                            }
-                        } else {
-                            targetDataType = exType;
-                            break;
-                        }
-                    }
-                }
-
-                /*
-                if (targetDataType == null) {
-                    // Not a business exception
-                    return resultMsg;
-                }
-                */
-
-                DataType targetFaultType = getFaultType(targetDataType);
-                if (targetFaultType == null) {
-                    // No matching fault type, it's a system exception
-                    Throwable cause = (Throwable) result;
-                    throw new ServiceRuntimeException(cause);
-                }
-
-                // FIXME: How to match a source fault type to a target fault
-                // type?
-                DataType sourceDataType = null;
-                DataType sourceFaultType = null;
-                for (DataType exType : sourceOperation.getFaultTypes()) {
-                    DataType faultType = getFaultType(exType);
-                    // Match by the QName (XSD element) of the fault type
-                    if (faultType != null && typesMatch(targetFaultType.getLogical(), faultType.getLogical())) {
-                        sourceDataType = exType;
-                        sourceFaultType = faultType;
-                        break;
-                    }
-                }
-
-                if (sourceFaultType == null) {
-                    // No matching fault type, it's a system exception
-                    Throwable cause = (Throwable) result;
-                    throw new ServiceRuntimeException(cause);
-                }
-
-                Object newResult =
-                    transformException(result, targetDataType, sourceDataType, targetFaultType, sourceFaultType);
-                if (newResult != result) {
-                    resultMsg.setFaultBody(newResult);
-                }
-            }
-
-        } else {
-            assert !(result instanceof Throwable) : "Expected messages that are not throwable " + result;
-
-            Object newResult = transform(result, targetType, sourceType, true);
-            if (newResult != result) {
-                resultMsg.setBody(newResult);
-            }
-        }
-
-        return resultMsg;
-    }
-
-    private Object transform(Object source, DataType sourceType, DataType targetType, boolean isResponse) {
-        if (sourceType == targetType || (sourceType != null && sourceType.equals(targetType))) {
-            return source;
-        }
-        Map<String, Object> metadata = new HashMap<String, Object>();
-        metadata.put("source.operation", isResponse ? targetOperation : sourceOperation);
-        metadata.put("target.operation", isResponse ? sourceOperation : targetOperation);
-        metadata.put("wire", wire);
-        return mediator.mediate(source, sourceType, targetType, metadata);
-    }
-
-    private DataType getFaultType(DataType exceptionType) {
-        return exceptionType == null ? null : (DataType)exceptionType.getLogical();
-    }
-
-    private boolean typesMatch(Object first, Object second) {
-        if (first.equals(second)) {
-            return true;
-        }
-        if (first instanceof XMLType && second instanceof XMLType) {
-            XMLType t1 = (XMLType)first;
-            XMLType t2 = (XMLType)second;
-            // TUSCANY-2113, we should compare element names only
-            return matches(t1.getElementName(), t2.getElementName());
-        }
-        return false;
-    }
-
-    /**
-     * @param qn1
-     * @param qn2
-     */
-    private boolean matches(QName qn1, QName qn2) {
-        if (qn1 == qn2) {
-            return true;
-        }
-        if (qn1 == null || qn2 == null) {
-            return false;
-        }
-        String ns1 = qn1.getNamespaceURI();
-        String ns2 = qn2.getNamespaceURI();
-        String e1 = qn1.getLocalPart();
-        String e2 = qn2.getLocalPart();
-        if (e1.equals(e2) && (ns1.equals(ns2) || ns1.equals(ns2 + "/") || ns2.equals(ns1 + "/"))) {
-            // Tolerating the trailing / which is required by JAX-WS java package --> xml ns mapping
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param source The source exception
-     * @param sourceExType The data type for the source exception
-     * @param targetExType The data type for the target exception
-     * @param sourceType The fault type for the source
-     * @param targetType The fault type for the target
-     * @return
-     */
-    private Object transformException(Object source,
-                                      DataType sourceExType,
-                                      DataType targetExType,
-                                      DataType sourceType,
-                                      DataType targetType) {
-        if (sourceType == targetType || (sourceType != null && sourceType.equals(targetType))) {
-            return source;
-        }
-        Map<String, Object> metadata = new HashMap<String, Object>();
-        metadata.put("source.operation", targetOperation);
-        metadata.put("target.operation", sourceOperation);
-        metadata.put("wire", wire);
-        DataType<DataType> eSourceDataType =
-            new DataTypeImpl<DataType>("idl:fault", sourceExType.getPhysical(), sourceType);
-        DataType<DataType> eTargetDataType =
-            new DataTypeImpl<DataType>("idl:fault", targetExType.getPhysical(), targetType);
-
-        return mediator.mediate(source, eSourceDataType, eTargetDataType, metadata);
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    public boolean allowsPassByReference() {
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
deleted file mode 100644
index 3586f54d71..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.core.databinding.wire;
-
-import java.io.Serializable;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-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.Interceptor;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Implementation of an interceptor that enforces pass-by-value semantics
- * on operation invocations by copying the operation input and output data.
- *
- * @version $Rev$ $Date$
- */
-public class PassByValueInterceptor implements Interceptor {
-
-    private DataBindingExtensionPoint dataBindings;
-    private FaultExceptionMapper faultExceptionMapper;
-
-    private DataBinding[] inputDataBindings;
-    private DataBinding outputDataBinding;
-    private DataBinding javaBeanDataBinding;
-    private DataBinding jaxbDataBinding;
-    private Operation operation;
-    private Invoker nextInvoker;
-    private InvocationChain chain;
-
-    /**
-     * Constructs a new PassByValueInterceptor.
-     * @param dataBindings databinding extension point
-     * @param operation the intercepted operation
-     */
-    public PassByValueInterceptor(DataBindingExtensionPoint dataBindings,
-                                  FaultExceptionMapper faultExceptionMapper,
-                                  InvocationChain chain,
-                                  Operation operation) {
-        this.chain = chain;
-        this.operation = operation;
-
-        // Cache data bindings to use
-        this.dataBindings = dataBindings;
-        this.faultExceptionMapper = faultExceptionMapper;
-
-        jaxbDataBinding = dataBindings.getDataBinding(JAXBDataBinding.NAME);
-        javaBeanDataBinding = dataBindings.getDataBinding(JavaBeansDataBinding.NAME);
-
-        // Determine the input databindings
-        if (operation.getInputType() != null) {
-            List<DataType> inputTypes = operation.getInputType().getLogical();
-            inputDataBindings = new DataBinding[inputTypes.size()];
-            int i = 0;
-            for (DataType inputType : inputTypes) {
-                String id = inputType.getDataBinding();
-                inputDataBindings[i++] = dataBindings.getDataBinding(id);
-            }
-        }
-
-        // Determine the output databinding
-        if (operation.getOutputType() != null) {
-            String id = operation.getOutputType().getDataBinding();
-            outputDataBinding = dataBindings.getDataBinding(id);
-        }
-    }
-
-    public Message invoke(Message msg) {
-        if (chain.allowsPassByReference()) {
-            return nextInvoker.invoke(msg);
-        }
-
-        msg.setBody(copy((Object[])msg.getBody(), inputDataBindings, operation.getInputType().getLogical()));
-
-        Message resultMsg = nextInvoker.invoke(msg);
-
-        if (!msg.isFault() && operation.getOutputType() != null) {
-            resultMsg.setBody(copy(resultMsg.getBody(), outputDataBinding, operation.getOutputType()));
-        }
-
-        if (msg.isFault()) {
-            msg.setFaultBody(copyFault(msg.getBody()));
-        }
-        return resultMsg;
-    }
-
-    private Object copyFault(Object fault) {
-        if (faultExceptionMapper == null) {
-            return fault;
-        }
-        for (DataType et : operation.getFaultTypes()) {
-            if (et.getPhysical().isInstance(fault)) {
-                Throwable ex = (Throwable)fault;
-                DataType<DataType> exType =
-                    new DataTypeImpl<DataType>(ex.getClass(), new DataTypeImpl<XMLType>(ex.getClass(), XMLType.UNKNOWN));
-                faultExceptionMapper.introspectFaultDataType(exType, operation, false);
-                DataType faultType = exType.getLogical();
-                Object faultInfo = faultExceptionMapper.getFaultInfo(ex, faultType.getPhysical(), operation);
-                faultInfo = copy(faultInfo, dataBindings.getDataBinding(faultType.getDataBinding()), faultType);
-                fault = faultExceptionMapper.wrapFaultInfo(exType, ex.getMessage(), faultInfo, ex.getCause(), operation);
-                return fault;
-            }
-        }
-        return fault;
-    }
-
-    /**
-     * Copy an array of data objects passed to an operation
-     * @param data array of objects to copy
-     * @return the copy
-     */
-    private Object[] copy(Object[] data, DataBinding[] dataBindings, List<DataType> dataTypes) {
-        if (data == null) {
-            return null;
-        }
-        Object[] copy = new Object[data.length];
-        Map<Object, Object> map = new IdentityHashMap<Object, Object>();
-        for (int i = 0; i < data.length; i++) {
-            Object arg = data[i];
-            if (arg == null) {
-                copy[i] = null;
-            } else {
-                Object copiedArg = map.get(arg);
-                if (copiedArg != null) {
-                    copy[i] = copiedArg;
-                } else {
-                    copiedArg = copy(arg, dataBindings[i], dataTypes.get(i));
-                    map.put(arg, copiedArg);
-                    copy[i] = copiedArg;
-                }
-            }
-        }
-        return copy;
-    }
-
-    /**
-     * Copy data using the specified databinding.
-     * @param data input data
-     * @param dataBinding databinding to use
-     * @param dataType TODO
-     * @return a copy of the data
-     */
-    private Object copy(Object data, DataBinding dataBinding, DataType dataType) {
-        if (data == null) {
-            return null;
-        }
-        Class<?> clazz = data.getClass();
-        if (String.class == clazz || clazz.isPrimitive()
-            || Number.class.isAssignableFrom(clazz)
-            || Boolean.class.isAssignableFrom(clazz)
-            || Character.class.isAssignableFrom(clazz)
-            || Byte.class.isAssignableFrom(clazz)
-            || URI.class == clazz
-            || UUID.class == clazz
-            || QName.class == clazz) {
-            // Immutable classes
-            return data;
-        }
-        // If no databinding was specified, introspect the given arg to
-        // determine its databinding
-        if (dataBinding == null) {
-            dataType = dataBindings.introspectType(data, operation);
-            if (dataType != null) {
-                String db = dataType.getDataBinding();
-                dataBinding = dataBindings.getDataBinding(db);
-                if (dataBinding == null && db != null) {
-                    return data;
-                }
-            }
-            if (dataBinding == null) {
-
-                // Default to the JavaBean databinding
-                dataBinding = javaBeanDataBinding;
-            }
-        }
-
-        // Use the JAXB databinding to copy non-Serializable data
-        if (dataBinding == javaBeanDataBinding) {
-
-            // If the input data is an array containing non Serializable elements
-            // use JAXB
-            clazz = data.getClass();
-            if (clazz.isArray()) {
-                if (Array.getLength(data) != 0) {
-                    Object element = Array.get(data, 0);
-                    if (element != null && !(element instanceof Serializable)) {
-                        dataBinding = jaxbDataBinding;
-                    }
-                }
-            } else {
-
-                // If the input data is not Serializable use JAXB
-                if (!(data instanceof Serializable)) {
-                    dataBinding = jaxbDataBinding;
-                }
-
-                if (data instanceof Cloneable) {
-                    Method clone;
-                    try {
-                        clone = data.getClass().getMethod("clone", (Class[])null);
-                        try {
-                            return clone.invoke(data, (Object[])null);
-                        } catch (InvocationTargetException e) {
-                            if (e.getTargetException() instanceof CloneNotSupportedException) {
-                                // Ignore 
-                            } else {
-                                throw new ServiceRuntimeException(e);
-                            }
-                        } catch (Exception e) {
-                            throw new ServiceRuntimeException(e);
-                        }
-                    } catch (NoSuchMethodException e) {
-                        // Ignore it
-                    }
-                }
-            }
-        }
-
-        Object copy = dataBinding.copy(data, dataType, operation);
-        return copy;
-    }
-
-    public Invoker getNext() {
-        return nextInvoker;
-    }
-
-    public void setNext(Invoker next) {
-        this.nextInvoker = next;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index baba638c9b..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/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 ExtensionActivator

-org.apache.tuscany.sca.core.databinding.module.DataBindingModuleActivator

diff --git a/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
deleted file mode 100644
index b0c39e18ef..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.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.core.databinding.processor;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-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.osoa.sca.annotations.Remotable;
-import org.w3c.dom.Node;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataBindingJavaInterfaceProcessorTestCase extends TestCase {
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-    }
-
-    /**
-     * @throws InvalidServiceContractException
-     */
-    public final void testVisitInterface() throws InvalidInterfaceException {
-        DataBindingExtensionPoint registry = new DefaultDataBindingExtensionPoint();
-        DataBindingJavaInterfaceProcessor processor = new DataBindingJavaInterfaceProcessor(registry);
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        
-        JavaInterface contract = javaFactory.createJavaInterface();
-        contract.setJavaClass(MockInterface.class);
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(contract);
-        Operation operation = newOperation("call");
-        Operation operation1 = newOperation("call1");
-        contract.getOperations().add(operation);
-        contract.getOperations().add(operation1);
-        contract.setRemotable(true);
-        processor.visitInterface(contract);
-        // Assert.assertEquals("org.w3c.dom.Node", contract.getDataBinding());
-        // Assert.assertEquals("org.w3c.dom.Node",
-        // contract.getOperations().get("call").getDataBinding());
-        // Assert.assertEquals("xml:string",
-        // contract.getOperations().get("call1").getDataBinding());
-    }
-
-    @DataBinding("org.w3c.dom.Node")
-    @Remotable
-    public static interface MockInterface {
-        Node call(Node msg);
-
-        @DataBinding("xml:string")
-        String call1(String msg);
-    }
-
-    private static Operation newOperation(String name) {
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-        return operation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java b/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
deleted file mode 100644
index 7d49fb7112..0000000000
--- a/tags/java/sca/1.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.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.core.databinding.transformers;
-
-//import static org.apache.tuscany.spi.databinding.DataBinding.IDL_INPUT;
-//import static org.apache.tuscany.spi.databinding.DataBinding.IDL_OUTPUT;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-//import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
-//import org.apache.tuscany.databinding.impl.MediatorImpl;
-//import org.apache.tuscany.databinding.impl.TransformationContextImpl;
-//import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
-//import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
-//import org.apache.tuscany.databinding.javabeans.JavaBean2DOMNodeTransformer;
-//import org.apache.tuscany.databinding.xml.DOMDataBinding;
-//import org.apache.tuscany.databinding.xml.Node2String;
-//import org.apache.tuscany.databinding.xml.String2Node;
-//import org.apache.tuscany.interfacedef.DataType;
-//import org.apache.tuscany.interfacedef.Operation;
-//import org.apache.tuscany.interfacedef.impl.DataTypeImpl;
-//import org.apache.tuscany.interfacedef.impl.OperationImpl;
-//import org.apache.tuscany.interfacedef.util.ElementInfo;
-//import org.apache.tuscany.interfacedef.util.TypeInfo;
-//import org.apache.tuscany.interfacedef.util.WrapperInfo;
-//import org.apache.tuscany.interfacedef.util.XMLType;
-//import org.apache.tuscany.spi.databinding.DataBindingRegistry;
-//import org.apache.tuscany.spi.databinding.TransformationContext;
-//import org.apache.tuscany.spi.databinding.extension.DOMHelper;
-//import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
-//import org.w3c.dom.Document;
-//import org.w3c.dom.Element;
-
-public class IDLTransformerTestCaseFIXME extends TestCase {
-//    private static final String IPO_XML = "<?xml version=\"1.0\"?>" + "<order1"
-//                                          + "  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>"
-//                                          + "</order1>";
-//
-//    private static final String URI_ORDER_XSD = "http://example.com/order.xsd";
-//
-//    /**
-//     * @see junit.framework.TestCase#setUp()
-//     */
-//    protected void setUp() throws Exception {
-//        super.setUp();
-//    }
-//
-//    public void testTransform() throws Exception {
-//        List<DataType> types0 = new ArrayList<DataType>();
-//        DataType<XMLType> wrapperType = new DataTypeImpl<XMLType>(null, Object.class,
-//                                                                  new XMLType(new QName(URI_ORDER_XSD,
-//                                                                                        "checkOrderStatus"), null));
-//        types0.add(wrapperType);
-//        DataType<List<DataType>> inputType0 = new DataTypeImpl<List<DataType>>(IDL_INPUT,
-//                                                                                                 Object[].class, types0);
-//
-//        List<DataType> types1 = new ArrayList<DataType>();
-//        DataType<XMLType> customerIdType = new DataTypeImpl<XMLType>(
-//                                                                     null,
-//                                                                     Object.class,
-//                                                                     new XMLType(
-//                                                                                 new QName(URI_ORDER_XSD, "customerId"),
-//                                                                                 null));
-//        DataType<XMLType> orderType = new DataTypeImpl<XMLType>(null, Object.class,
-//                                                                new XMLType(new QName(URI_ORDER_XSD, "order"), null));
-//        DataType<XMLType> flagType = new DataTypeImpl<XMLType>(null, Object.class, new XMLType(new QName(URI_ORDER_XSD,
-//                                                                                                         "flag"), null));
-//        types1.add(customerIdType);
-//        types1.add(orderType);
-//        types1.add(flagType);
-//
-//        DataType<XMLType> statusType = new DataTypeImpl<XMLType>(null, Object.class,
-//                                                                 new XMLType(new QName(URI_ORDER_XSD, "status"), null));
-//        DataType<XMLType> responseType = new DataTypeImpl<XMLType>(null, Object.class,
-//                                                                   new XMLType(new QName(URI_ORDER_XSD,
-//                                                                                         "checkOrderStatusResponse"),
-//                                                                               null));
-//
-//        Operation op = new OperationImpl("checkOrderStatus");
-//        op.setInputType(inputType0);
-//        op.setOutputType(responseType);
-////        op.setDataBinding(DOMDataBinding.NAME);
-////
-////        inputType0.setOperation(op);
-//        op.setWrapperStyle(true);
-//        ElementInfo inputElement = new ElementInfo(new QName(URI_ORDER_XSD, "checkOrderStatus"), new TypeInfo(null,
-//                                                                                                              false,
-//                                                                                                              null));
-////        wrapperType.setMetadata(ElementInfo.class.getName(), inputElement);
-//
-//        ElementInfo customerId = new ElementInfo(new QName("", "customerId"),
-//                                                 SimpleTypeMapperExtension.XSD_SIMPLE_TYPES.get("string"));
-//        ElementInfo order = new ElementInfo(new QName("", "order"), new TypeInfo(new QName(URI_ORDER_XSD), false, null));
-//        ElementInfo flag = new ElementInfo(new QName("", "flag"), SimpleTypeMapperExtension.XSD_SIMPLE_TYPES.get("int"));
-//
-////        customerIdType.setMetadata(ElementInfo.class.getName(), customerId);
-////        orderType.setMetadata(ElementInfo.class.getName(), order);
-////        flagType.setMetadata(ElementInfo.class.getName(), flag);
-////
-////        customerIdType.setOperation(op);
-////        orderType.setOperation(op);
-////        flagType.setOperation(op);
-//
-//        List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
-//        inputElements.add(customerId);
-//        inputElements.add(order);
-//        inputElements.add(flag);
-//
-//        ElementInfo statusElement = new ElementInfo(new QName("", "status"), SimpleTypeMapperExtension.XSD_SIMPLE_TYPES
-//            .get("string"));
-//
-////        statusType.setMetadata(ElementInfo.class.getName(), statusElement);
-////        statusType.setOperation(op);
-//
-//        List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
-//        outputElements.add(statusElement);
-//
-//        ElementInfo outputElement = new ElementInfo(new QName(URI_ORDER_XSD, "checkOrderStatusResponse"),
-//                                                    new TypeInfo(null, false, null));
-//
-////        responseType.setMetadata(ElementInfo.class.getName(), inputElement);
-////        responseType.setOperation(op);
-//
-//        WrapperInfo wrapperInfo = new WrapperInfo(DOMDataBinding.NAME, inputElement, outputElement, inputElements,
-//                                                  outputElements);
-//        op.setWrapper(wrapperInfo);
-////        op.setDataBinding(DOMDataBinding.NAME);
-//
-//        MediatorImpl m = new MediatorImpl();
-//        TransformerRegistryImpl tr = new TransformerRegistryImpl();
-//        tr.registerTransformer(new String2Node());
-//        tr.registerTransformer(new Node2String());
-//        tr.registerTransformer(new DOMNode2JavaBeanTransformer());
-//        tr.registerTransformer(new JavaBean2DOMNodeTransformer());
-//        m.setTransformerRegistry(tr);
-//        DataBindingRegistry dataBindingRegistry = new DataBindingRegistryImpl();
-//        dataBindingRegistry.register(new DOMDataBinding());
-//        m.setDataBindingRegistry(dataBindingRegistry);
-//
-//        Object[] source = new Object[] {"cust001", IPO_XML, Integer.valueOf(1)};
-//        Input2InputTransformer t = new Input2InputTransformer();
-//        t.setMediator(m);
-//
-//        TransformationContext context = new TransformationContextImpl();
-//        context.setSourceOperation(op);
-//        List<DataType<Class>> types = new ArrayList<DataType<Class>>();
-//        types.add(new DataTypeImpl<Class>(Object.class.getName(), String.class, String.class));
-//        types.add(new DataTypeImpl<Class>("java.lang.String", String.class, String.class));
-//        types.add(new DataTypeImpl<Class>(Object.class.getName(), int.class, int.class));
-//        DataType<List<DataType<Class>>> inputType1 = new DataTypeImpl<List<DataType<Class>>>(IDL_INPUT, Object[].class,
-//                                                                                             types);
-//        context.setSourceDataType(inputType1);
-//        context.setTargetDataType(op.getInputType());
-//        Object[] results = t.transform(source, context);
-//        assertEquals(1, results.length);
-//        assertTrue(results[0] instanceof Element);
-//        Element element = (Element)results[0];
-//        assertEquals("http://example.com/order.xsd", element.getNamespaceURI());
-//        assertEquals("checkOrderStatus", element.getLocalName());
-//
-//        TransformationContext context1 = new TransformationContextImpl();
-//        DataType<DataType> sourceType = new DataTypeImpl<DataType>(IDL_OUTPUT, Object.class, op.getOutputType());
-//
-//        context1.setSourceDataType(sourceType);
-//        DataType<DataType> targetType = new DataTypeImpl<DataType>(IDL_OUTPUT, Object.class,
-//                                                                   new DataTypeImpl<Class>("java.lang.Object",
-//                                                                                           String.class, String.class));
-//        context1.setTargetDataType(targetType);
-//
-//        Document factory = DOMHelper.newDocument();
-//        Element responseElement = factory
-//            .createElementNS("http://example.com/order.wsdl", "p:checkOrderStatusResponse");
-//        Element status = factory.createElement("status");
-//        responseElement.appendChild(status);
-//        status.appendChild(factory.createTextNode("shipped"));
-//        Output2OutputTransformer t2 = new Output2OutputTransformer();
-//        t2.setMediator(m);
-//        Object st = t2.transform(responseElement, context1);
-//        assertEquals("shipped", st);
-//
-//    }
-//
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/LICENSE b/tags/java/sca/1.3/modules/core-spi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/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/tags/java/sca/1.3/modules/core-spi/NOTICE b/tags/java/sca/1.3/modules/core-spi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/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/tags/java/sca/1.3/modules/core-spi/pom.xml b/tags/java/sca/1.3/modules/core-spi/pom.xml
deleted file mode 100644
index e8195e9977..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-core-spi</artifactId>
-    <name>Apache Tuscany SCA Core SPI</name>
-
-    <dependencies>
-    	<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>                        
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.core.spi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/core-spi/src/doc/Context Model.emx b/tags/java/sca/1.3/modules/core-spi/src/doc/Context Model.emx
deleted file mode 100644
index 0445ea5a6b..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/doc/Context Model.emx
+++ /dev/null
@@ -1,673 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<!--xtools2_universal_type_manager-->

-<uml:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.ibm.com/xtools/1.5.0/Notation" xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" xmlns:umlnotation="http://www.ibm.com/xtools/1.5.0/Umlnotation" xmi:id="_al1S8NovEdqRBPR5WyT36A" name="Context Model" appliedProfile="_al1S9NovEdqRBPR5WyT36A _al1S99ovEdqRBPR5WyT36A _al1S-tovEdqRBPR5WyT36A _al1S_dovEdqRBPR5WyT36A _al1TANovEdqRBPR5WyT36A">

-  <eAnnotations xmi:id="_al1S8dovEdqRBPR5WyT36A" source="uml2.diagrams" references="_al1S8tovEdqRBPR5WyT36A">

-    <contents xmi:type="notation:Diagram" xmi:id="_al1S8tovEdqRBPR5WyT36A" type="Class" name="Main">

-      <children xmi:id="_ePDcYdovEdqRBPR5WyT36A" sourceEdges="_Fd3lQdowEdqRBPR5WyT36A _R5Rjwdo1EdqRBPR5WyT36A _pdfmkNo2EdqRBPR5WyT36A" targetEdges="_hmIF4dovEdqRBPR5WyT36A _mu9A4dovEdqRBPR5WyT36A _pe3jwNovEdqRBPR5WyT36A" element="_ePDcYNovEdqRBPR5WyT36A">

-        <children xmi:id="_ePJjANovEdqRBPR5WyT36A" type="ImageCompartment" element="_ePDcYNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_ePJjAdovEdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_ePJjAtovEdqRBPR5WyT36A" type="Stereotype" element="_ePDcYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ePJjA9ovEdqRBPR5WyT36A" type="Kind" element="_ePDcYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ePJjBNovEdqRBPR5WyT36A" type="Name" element="_ePDcYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ePJjBdovEdqRBPR5WyT36A" type="AttributeCompartment" element="_ePDcYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ePJjBtovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_ePJjB9ovEdqRBPR5WyT36A" type="OperationCompartment" element="_ePDcYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ePJjCNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_ePJjCdovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_ePDcYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ePJjCtovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_ePDcYtovEdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePDcY9ovEdqRBPR5WyT36A" x="6693" y="3545"/>

-      </children>

-      <children xmi:id="_fs1pANovEdqRBPR5WyT36A" sourceEdges="_hmIF4dovEdqRBPR5WyT36A _pe3jwNovEdqRBPR5WyT36A" targetEdges="_xInjYdovEdqRBPR5WyT36A" element="_fsviYNovEdqRBPR5WyT36A">

-        <children xmi:id="_fs1pA9ovEdqRBPR5WyT36A" type="ImageCompartment" element="_fsviYNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_fs1pBNovEdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_fs1pBdovEdqRBPR5WyT36A" type="Stereotype" element="_fsviYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_fs1pBtovEdqRBPR5WyT36A" type="Kind" element="_fsviYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_fs1pB9ovEdqRBPR5WyT36A" type="Name" element="_fsviYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_fs1pCNovEdqRBPR5WyT36A" type="AttributeCompartment" element="_fsviYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_fs1pCdovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_fs1pCtovEdqRBPR5WyT36A" type="OperationCompartment" element="_fsviYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_fs1pC9ovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_fs1pDNovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_fsviYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_fs1pDdovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_fs1pAdovEdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fs1pAtovEdqRBPR5WyT36A" x="2226" y="8268"/>

-      </children>

-      <children xmi:id="_ikr_4NovEdqRBPR5WyT36A" sourceEdges="_mu9A4dovEdqRBPR5WyT36A" element="_ikl5QNovEdqRBPR5WyT36A">

-        <children xmi:id="_ikr_49ovEdqRBPR5WyT36A" type="ImageCompartment" element="_ikl5QNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_ikr_5NovEdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_ikr_5dovEdqRBPR5WyT36A" type="Stereotype" element="_ikl5QNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ikr_5tovEdqRBPR5WyT36A" type="Kind" element="_ikl5QNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ikr_59ovEdqRBPR5WyT36A" type="Name" element="_ikl5QNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_ikr_6NovEdqRBPR5WyT36A" type="AttributeCompartment" element="_ikl5QNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ikr_6dovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_ikr_6tovEdqRBPR5WyT36A" type="OperationCompartment" element="_ikl5QNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ikr_69ovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_ikr_7NovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_ikl5QNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_ikr_7dovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_ikr_4dovEdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ikr_4tovEdqRBPR5WyT36A" x="9222" y="8268"/>

-      </children>

-      <children xmi:id="_tZF9odovEdqRBPR5WyT36A" sourceEdges="_xInjYdovEdqRBPR5WyT36A _BkUg0dowEdqRBPR5WyT36A" element="_tZF9oNovEdqRBPR5WyT36A">

-        <children xmi:id="_tZF9pNovEdqRBPR5WyT36A" type="ImageCompartment" element="_tZF9oNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_tZF9pdovEdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_tZF9ptovEdqRBPR5WyT36A" type="Stereotype" element="_tZF9oNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_tZF9p9ovEdqRBPR5WyT36A" type="Kind" element="_tZF9oNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_tZF9qNovEdqRBPR5WyT36A" type="Name" element="_tZF9oNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_tZF9qdovEdqRBPR5WyT36A" type="AttributeCompartment" element="_tZF9oNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_tZF9qtovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_tZF9q9ovEdqRBPR5WyT36A" type="OperationCompartment" element="_tZF9oNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_tZF9rNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_tZF9rdovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_tZF9oNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_tZF9rtovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_tZF9otovEdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tZF9o9ovEdqRBPR5WyT36A" x="2226" y="12084"/>

-      </children>

-      <children xmi:id="_z_m-oNovEdqRBPR5WyT36A" sourceEdges="_cN4xsdo2EdqRBPR5WyT36A" targetEdges="_3Ic-4NovEdqRBPR5WyT36A _9XeF4tovEdqRBPR5WyT36A _Fd3lQdowEdqRBPR5WyT36A" element="_z_g4ANovEdqRBPR5WyT36A">

-        <children xmi:id="_z_m-o9ovEdqRBPR5WyT36A" type="ImageCompartment" element="_z_g4ANovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_z_m-pNovEdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_z_m-pdovEdqRBPR5WyT36A" type="Stereotype" element="_z_g4ANovEdqRBPR5WyT36A"/>

-        <children xmi:id="_z_m-ptovEdqRBPR5WyT36A" type="Kind" element="_z_g4ANovEdqRBPR5WyT36A"/>

-        <children xmi:id="_z_m-p9ovEdqRBPR5WyT36A" type="Name" element="_z_g4ANovEdqRBPR5WyT36A"/>

-        <children xmi:id="_z_m-qNovEdqRBPR5WyT36A" type="AttributeCompartment" element="_z_g4ANovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_z_m-qdovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_z_m-qtovEdqRBPR5WyT36A" type="OperationCompartment" element="_z_g4ANovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_z_m-q9ovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_z_m-rNovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_z_g4ANovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_z_m-rdovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_z_m-odovEdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_m-otovEdqRBPR5WyT36A" x="17172" y="6996"/>

-      </children>

-      <children xmi:id="_1y-ZsNovEdqRBPR5WyT36A" sourceEdges="_3Ic-4NovEdqRBPR5WyT36A _9-BEUNo2EdqRBPR5WyT36A" targetEdges="_BkUg0dowEdqRBPR5WyT36A" element="_1yyMcNovEdqRBPR5WyT36A">

-        <children xmi:id="_1y-Zs9ovEdqRBPR5WyT36A" type="ImageCompartment" element="_1yyMcNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_1y-ZtNovEdqRBPR5WyT36A" width="1320" height="1320"/>

-        </children>

-        <children xmi:id="_1y-ZtdovEdqRBPR5WyT36A" type="Stereotype" element="_1yyMcNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_1y-ZttovEdqRBPR5WyT36A" type="Name" element="_1yyMcNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_1y-Zt9ovEdqRBPR5WyT36A" type="AttributeCompartment" element="_1yyMcNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_1y-ZuNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_1y-ZudovEdqRBPR5WyT36A" type="OperationCompartment" element="_1yyMcNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_1y-ZutovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_1y-Zu9ovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_1yyMcNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_1y-ZvNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_1y-ZvdovEdqRBPR5WyT36A" visible="false" type="StructureCompartment" element="_1yyMcNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLShapeCompartmentStyle" xmi:id="_1y-ZvtovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLShapeStyle" xmi:id="_1y-ZsdovEdqRBPR5WyT36A" showStereotype="Label"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1y-ZstovEdqRBPR5WyT36A" x="13992" y="12084"/>

-      </children>

-      <children xmi:id="_4WSrANovEdqRBPR5WyT36A" sourceEdges="_9XeF4tovEdqRBPR5WyT36A _9PaR4No2EdqRBPR5WyT36A" element="_4WMkYNovEdqRBPR5WyT36A">

-        <children xmi:id="_4WSrA9ovEdqRBPR5WyT36A" type="ImageCompartment" element="_4WMkYNovEdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_4WSrBNovEdqRBPR5WyT36A" width="1320" height="1320"/>

-        </children>

-        <children xmi:id="_4WSrBdovEdqRBPR5WyT36A" type="Stereotype" element="_4WMkYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_4WSrBtovEdqRBPR5WyT36A" type="Name" element="_4WMkYNovEdqRBPR5WyT36A"/>

-        <children xmi:id="_4WSrB9ovEdqRBPR5WyT36A" type="AttributeCompartment" element="_4WMkYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_4WSrCNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_4WSrCdovEdqRBPR5WyT36A" type="OperationCompartment" element="_4WMkYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_4WSrCtovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_4WSrC9ovEdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_4WMkYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_4WSrDNovEdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_4WSrDdovEdqRBPR5WyT36A" visible="false" type="StructureCompartment" element="_4WMkYNovEdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLShapeCompartmentStyle" xmi:id="_4WSrDtovEdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLShapeStyle" xmi:id="_4WSrAdovEdqRBPR5WyT36A" showStereotype="Label"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WSrAtovEdqRBPR5WyT36A" x="19716" y="12084"/>

-      </children>

-      <children xmi:id="_o2m3oNo0EdqRBPR5WyT36A" targetEdges="_9PaR4No2EdqRBPR5WyT36A _9-BEUNo2EdqRBPR5WyT36A" element="_o2gxANo0EdqRBPR5WyT36A">

-        <children xmi:id="_o2m3o9o0EdqRBPR5WyT36A" type="ImageCompartment" element="_o2gxANo0EdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_o2m3pNo0EdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_o2m3pdo0EdqRBPR5WyT36A" type="Stereotype" element="_o2gxANo0EdqRBPR5WyT36A"/>

-        <children xmi:id="_o2m3pto0EdqRBPR5WyT36A" type="Kind" element="_o2gxANo0EdqRBPR5WyT36A"/>

-        <children xmi:id="_o2m3p9o0EdqRBPR5WyT36A" type="Name" element="_o2gxANo0EdqRBPR5WyT36A"/>

-        <children xmi:id="_o2m3qNo0EdqRBPR5WyT36A" type="AttributeCompartment" element="_o2gxANo0EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_o2m3qdo0EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_o2m3qto0EdqRBPR5WyT36A" type="OperationCompartment" element="_o2gxANo0EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_o2m3q9o0EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_o2m3rNo0EdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_o2gxANo0EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_o2m3rdo0EdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_o2m3odo0EdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o2m3oto0EdqRBPR5WyT36A" x="23532" y="6996"/>

-      </children>

-      <children xmi:id="_M0FLkNo1EdqRBPR5WyT36A" targetEdges="_R5Rjwdo1EdqRBPR5WyT36A _V7zlEdo1EdqRBPR5WyT36A" element="_Mz_E8No1EdqRBPR5WyT36A">

-        <children xmi:id="_M0FLk9o1EdqRBPR5WyT36A" type="ImageCompartment" element="_Mz_E8No1EdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_M0FLlNo1EdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_M0FLldo1EdqRBPR5WyT36A" type="Stereotype" element="_Mz_E8No1EdqRBPR5WyT36A"/>

-        <children xmi:id="_M0FLlto1EdqRBPR5WyT36A" type="Kind" element="_Mz_E8No1EdqRBPR5WyT36A"/>

-        <children xmi:id="_M0FLl9o1EdqRBPR5WyT36A" type="Name" element="_Mz_E8No1EdqRBPR5WyT36A"/>

-        <children xmi:id="_M0FLmNo1EdqRBPR5WyT36A" type="AttributeCompartment" element="_Mz_E8No1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_M0FLmdo1EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_M0FLmto1EdqRBPR5WyT36A" type="OperationCompartment" element="_Mz_E8No1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_M0FLm9o1EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_M0FLnNo1EdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_Mz_E8No1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_M0FLndo1EdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_M0FLkdo1EdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M0FLkto1EdqRBPR5WyT36A" x="6678" y="318"/>

-      </children>

-      <children xmi:id="_TJHbANo1EdqRBPR5WyT36A" sourceEdges="_V7zlEdo1EdqRBPR5WyT36A" targetEdges="_cN4xsdo2EdqRBPR5WyT36A" element="_TI7NwNo1EdqRBPR5WyT36A">

-        <children xmi:id="_TJHbA9o1EdqRBPR5WyT36A" type="ImageCompartment" element="_TI7NwNo1EdqRBPR5WyT36A">

-          <layoutConstraint xmi:type="notation:Size" xmi:id="_TJHbBNo1EdqRBPR5WyT36A" width="530" height="530"/>

-        </children>

-        <children xmi:id="_TJHbBdo1EdqRBPR5WyT36A" type="Stereotype" element="_TI7NwNo1EdqRBPR5WyT36A"/>

-        <children xmi:id="_TJHbBto1EdqRBPR5WyT36A" type="Kind" element="_TI7NwNo1EdqRBPR5WyT36A"/>

-        <children xmi:id="_TJHbB9o1EdqRBPR5WyT36A" type="Name" element="_TI7NwNo1EdqRBPR5WyT36A"/>

-        <children xmi:id="_TJHbCNo1EdqRBPR5WyT36A" type="AttributeCompartment" element="_TI7NwNo1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_TJHbCdo1EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_TJHbCto1EdqRBPR5WyT36A" type="OperationCompartment" element="_TI7NwNo1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_TJHbC9o1EdqRBPR5WyT36A"/>

-        </children>

-        <children xmi:id="_TJHbDNo1EdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_TI7NwNo1EdqRBPR5WyT36A">

-          <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_TJHbDdo1EdqRBPR5WyT36A"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLClassifierStyle" xmi:id="_TJHbAdo1EdqRBPR5WyT36A" showStereotype="Label" useClassifierShape="true"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJHbAto1EdqRBPR5WyT36A" x="16854" y="318"/>

-      </children>

-      <styles xmi:type="umlnotation:UMLDiagramStyle" xmi:id="_al1S89ovEdqRBPR5WyT36A"/>

-      <edges xmi:id="_hmIF4dovEdqRBPR5WyT36A" element="_hmIF4NovEdqRBPR5WyT36A" source="_fs1pANovEdqRBPR5WyT36A" target="_ePDcYdovEdqRBPR5WyT36A">

-        <children xmi:id="_hmIF5NovEdqRBPR5WyT36A" type="NameLabel" element="_hmIF4NovEdqRBPR5WyT36A">

-          <children xmi:id="_hmIF5tovEdqRBPR5WyT36A" type="Stereotype" element="_hmIF4NovEdqRBPR5WyT36A"/>

-          <children xmi:id="_hmIF59ovEdqRBPR5WyT36A" type="Name" element="_hmIF4NovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_hmIF5dovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_hmIF4tovEdqRBPR5WyT36A" routing="Tree" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hmIF49ovEdqRBPR5WyT36A" points="[26, -31, -110, 148]$[140, -148, 4, 31]"/>

-      </edges>

-      <edges xmi:id="_mu9A4dovEdqRBPR5WyT36A" element="_mu9A4NovEdqRBPR5WyT36A" source="_ikr_4NovEdqRBPR5WyT36A" target="_ePDcYdovEdqRBPR5WyT36A">

-        <children xmi:id="_mu9A5NovEdqRBPR5WyT36A" type="NameLabel" element="_mu9A4NovEdqRBPR5WyT36A">

-          <children xmi:id="_mu9A5tovEdqRBPR5WyT36A" type="Stereotype" element="_mu9A4NovEdqRBPR5WyT36A"/>

-          <children xmi:id="_mu9A59ovEdqRBPR5WyT36A" type="Name" element="_mu9A4NovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_mu9A5dovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_mu9A4tovEdqRBPR5WyT36A" routing="Tree" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mu9A49ovEdqRBPR5WyT36A" points="[-185, -820, 2937, 3916]$[-185, -3042, 2937, 1694]$[-3255, -3042, -133, 1694]$[-3255, -3916, -133, 820]"/>

-      </edges>

-      <edges xmi:id="_pe3jwNovEdqRBPR5WyT36A" element="_peM1YNovEdqRBPR5WyT36A" source="_fs1pANovEdqRBPR5WyT36A" target="_ePDcYdovEdqRBPR5WyT36A">

-        <children xmi:id="_pe3jw9ovEdqRBPR5WyT36A" type="NameLabel" element="_peM1YNovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3jxdovEdqRBPR5WyT36A" type="Stereotype" element="_peM1YNovEdqRBPR5WyT36A"/>

-          <children xmi:id="_pe3jxtovEdqRBPR5WyT36A" type="Name" element="_peM1YNovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3jxNovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_pe3jx9ovEdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_peM1YtovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3jydovEdqRBPR5WyT36A" type="ToMultiplicity" element="_peM1YtovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3jyNovEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_pe3jytovEdqRBPR5WyT36A" type="ToRoleLabel" element="_peM1YtovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3jzNovEdqRBPR5WyT36A" type="ToRole" element="_peM1YtovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3jy9ovEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_pe3jzdovEdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_peM1YdovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3jz9ovEdqRBPR5WyT36A" type="FromMultiplicity" element="_peM1YdovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3jztovEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_pe3j0NovEdqRBPR5WyT36A" type="FromRoleLabel" element="_peM1YdovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3j0tovEdqRBPR5WyT36A" type="FromRole" element="_peM1YdovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3j0dovEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_pe3j09ovEdqRBPR5WyT36A" type="ToQualifierLabel" element="_peM1YtovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3j1dovEdqRBPR5WyT36A" type="QualifierCompartment" element="_peM1YtovEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pe3j1tovEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3j1NovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_pe3j19ovEdqRBPR5WyT36A" type="FromQualifierLabel" element="_peM1YdovEdqRBPR5WyT36A">

-          <children xmi:id="_pe3j2dovEdqRBPR5WyT36A" type="QualifierCompartment" element="_peM1YdovEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pe3j2tovEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pe3j2NovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_pe3jwdovEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pe3jwtovEdqRBPR5WyT36A" points="[-317, -820, -3916, 3916]$[-1931, -4762, -5530, -26]$[2382, -4762, -1217, -26]"/>

-      </edges>

-      <edges xmi:id="_xInjYdovEdqRBPR5WyT36A" element="_xInjYNovEdqRBPR5WyT36A" source="_tZF9odovEdqRBPR5WyT36A" target="_fs1pANovEdqRBPR5WyT36A">

-        <children xmi:id="_xInjZNovEdqRBPR5WyT36A" type="NameLabel" element="_xInjYNovEdqRBPR5WyT36A">

-          <children xmi:id="_xInjZtovEdqRBPR5WyT36A" type="Stereotype" element="_xInjYNovEdqRBPR5WyT36A"/>

-          <children xmi:id="_xInjZ9ovEdqRBPR5WyT36A" type="Name" element="_xInjYNovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_xInjZdovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_xInjYtovEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xInjY9ovEdqRBPR5WyT36A" points="[-4, -31, 1, 113]$[-4, -115, 1, 29]"/>

-      </edges>

-      <edges xmi:id="_3Ic-4NovEdqRBPR5WyT36A" element="_3IW4QNovEdqRBPR5WyT36A" source="_1y-ZsNovEdqRBPR5WyT36A" target="_z_m-oNovEdqRBPR5WyT36A">

-        <children xmi:id="_3Ic-49ovEdqRBPR5WyT36A" type="NameLabel" element="_3IW4QNovEdqRBPR5WyT36A">

-          <children xmi:id="_3Ic-5dovEdqRBPR5WyT36A" type="Stereotype" element="_3IW4QNovEdqRBPR5WyT36A"/>

-          <children xmi:id="_3Ic-5tovEdqRBPR5WyT36A" type="Name" element="_3IW4QNovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_3Ic-5NovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_3Ic-4dovEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3Ic-4tovEdqRBPR5WyT36A" points="[6, -24, -37, 154]$[-22, -170, -65, 8]"/>

-      </edges>

-      <edges xmi:id="_9XeF4tovEdqRBPR5WyT36A" element="_9XeF4NovEdqRBPR5WyT36A" source="_4WSrANovEdqRBPR5WyT36A" target="_z_m-oNovEdqRBPR5WyT36A">

-        <children xmi:id="_9XeF5dovEdqRBPR5WyT36A" type="NameLabel" element="_9XeF4NovEdqRBPR5WyT36A">

-          <children xmi:id="_9XeF59ovEdqRBPR5WyT36A" type="Stereotype" element="_9XeF4NovEdqRBPR5WyT36A"/>

-          <children xmi:id="_9XeF6NovEdqRBPR5WyT36A" type="Name" element="_9XeF4NovEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9XeF5tovEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_9XeF49ovEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9XeF5NovEdqRBPR5WyT36A" points="[-23, -23, 162, 151]$[-121, -170, 64, 4]"/>

-      </edges>

-      <edges xmi:id="_BkUg0dowEdqRBPR5WyT36A" element="_Bj8GUNowEdqRBPR5WyT36A" source="_tZF9odovEdqRBPR5WyT36A" target="_1y-ZsNovEdqRBPR5WyT36A">

-        <children xmi:id="_BkancNowEdqRBPR5WyT36A" type="NameLabel" element="_Bj8GUNowEdqRBPR5WyT36A">

-          <children xmi:id="_BkanctowEdqRBPR5WyT36A" type="Stereotype" element="_Bj8GUNowEdqRBPR5WyT36A"/>

-          <children xmi:id="_Bkanc9owEdqRBPR5WyT36A" type="Name" element="_Bj8GUNowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkancdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_BkandNowEdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_Bj8GUtowEdqRBPR5WyT36A">

-          <children xmi:id="_BkandtowEdqRBPR5WyT36A" type="ToMultiplicity" element="_Bj8GUtowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkanddowEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_Bkand9owEdqRBPR5WyT36A" type="ToRoleLabel" element="_Bj8GUtowEdqRBPR5WyT36A">

-          <children xmi:id="_BkanedowEdqRBPR5WyT36A" type="ToRole" element="_Bj8GUtowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkaneNowEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_BkanetowEdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_Bj8GUdowEdqRBPR5WyT36A">

-          <children xmi:id="_BkanfNowEdqRBPR5WyT36A" type="FromMultiplicity" element="_Bj8GUdowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Bkane9owEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_BkanfdowEdqRBPR5WyT36A" type="FromRoleLabel" element="_Bj8GUdowEdqRBPR5WyT36A">

-          <children xmi:id="_Bkanf9owEdqRBPR5WyT36A" type="FromRole" element="_Bj8GUdowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkanftowEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_BkangNowEdqRBPR5WyT36A" type="ToQualifierLabel" element="_Bj8GUtowEdqRBPR5WyT36A">

-          <children xmi:id="_BkangtowEdqRBPR5WyT36A" type="QualifierCompartment" element="_Bj8GUtowEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_Bkang9owEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkangdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_BkanhNowEdqRBPR5WyT36A" type="FromQualifierLabel" element="_Bj8GUdowEdqRBPR5WyT36A">

-          <children xmi:id="_BkanhtowEdqRBPR5WyT36A" type="QualifierCompartment" element="_Bj8GUdowEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_Bkanh9owEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_BkanhdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_BkUg0towEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkUg09owEdqRBPR5WyT36A" points="[83, -24, -490, 123]$[486, -151, -87, -4]"/>

-      </edges>

-      <edges xmi:id="_Fd3lQdowEdqRBPR5WyT36A" element="_FdlRYNowEdqRBPR5WyT36A" source="_ePDcYdovEdqRBPR5WyT36A" target="_z_m-oNovEdqRBPR5WyT36A">

-        <children xmi:id="_Fd3lRNowEdqRBPR5WyT36A" type="NameLabel" element="_FdlRYNowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lRtowEdqRBPR5WyT36A" type="Stereotype" element="_FdlRYNowEdqRBPR5WyT36A"/>

-          <children xmi:id="_Fd3lR9owEdqRBPR5WyT36A" type="Name" element="_FdlRYNowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lRdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_Fd3lSNowEdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_FdlRYtowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lStowEdqRBPR5WyT36A" type="ToMultiplicity" element="_FdlRYtowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lSdowEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_Fd3lS9owEdqRBPR5WyT36A" type="ToRoleLabel" element="_FdlRYtowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lTdowEdqRBPR5WyT36A" type="ToRole" element="_FdlRYtowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lTNowEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_Fd3lTtowEdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_FdlRYdowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lUNowEdqRBPR5WyT36A" type="FromMultiplicity" element="_FdlRYdowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lT9owEdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_Fd3lUdowEdqRBPR5WyT36A" type="FromRoleLabel" element="_FdlRYdowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lU9owEdqRBPR5WyT36A" type="FromRole" element="_FdlRYdowEdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lUtowEdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_Fd3lVNowEdqRBPR5WyT36A" type="ToQualifierLabel" element="_FdlRYtowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lVtowEdqRBPR5WyT36A" type="QualifierCompartment" element="_FdlRYtowEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_Fd3lV9owEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lVdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_Fd3lWNowEdqRBPR5WyT36A" type="FromQualifierLabel" element="_FdlRYdowEdqRBPR5WyT36A">

-          <children xmi:id="_Fd3lWtowEdqRBPR5WyT36A" type="QualifierCompartment" element="_FdlRYdowEdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_Fd3lW9owEdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Fd3lWdowEdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_Fd3lQtowEdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Fd3lQ9owEdqRBPR5WyT36A" points="[46, -11, -369, -9]$[351, -11, -64, -9]"/>

-      </edges>

-      <edges xmi:id="_R5Rjwdo1EdqRBPR5WyT36A" element="_R5RjwNo1EdqRBPR5WyT36A" source="_ePDcYdovEdqRBPR5WyT36A" target="_M0FLkNo1EdqRBPR5WyT36A">

-        <children xmi:id="_R5RjxNo1EdqRBPR5WyT36A" type="NameLabel" element="_R5RjwNo1EdqRBPR5WyT36A">

-          <children xmi:id="_R5Rjxto1EdqRBPR5WyT36A" type="Stereotype" element="_R5RjwNo1EdqRBPR5WyT36A"/>

-          <children xmi:id="_R5Rjx9o1EdqRBPR5WyT36A" type="Name" element="_R5RjwNo1EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_R5Rjxdo1EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_R5Rjwto1EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R5Rjw9o1EdqRBPR5WyT36A" points="[-2, -31, -2, 91]$[-2, -91, -2, 31]"/>

-      </edges>

-      <edges xmi:id="_V7zlEdo1EdqRBPR5WyT36A" element="_V7zlENo1EdqRBPR5WyT36A" source="_TJHbANo1EdqRBPR5WyT36A" target="_M0FLkNo1EdqRBPR5WyT36A">

-        <children xmi:id="_V7zlFNo1EdqRBPR5WyT36A" type="NameLabel" element="_V7zlENo1EdqRBPR5WyT36A">

-          <children xmi:id="_V7zlFto1EdqRBPR5WyT36A" type="Stereotype" element="_V7zlENo1EdqRBPR5WyT36A"/>

-          <children xmi:id="_V7zlF9o1EdqRBPR5WyT36A" type="Name" element="_V7zlENo1EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_V7zlFdo1EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_V7zlEto1EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V7zlE9o1EdqRBPR5WyT36A" points="[-73, 0, 339, 0]$[-457, 0, -45, 0]"/>

-      </edges>

-      <edges xmi:id="_cN4xsdo2EdqRBPR5WyT36A" targetEdges="_pdfmkNo2EdqRBPR5WyT36A" element="_cNskcNo2EdqRBPR5WyT36A" source="_z_m-oNovEdqRBPR5WyT36A" target="_TJHbANo1EdqRBPR5WyT36A">

-        <children xmi:id="_cN4xtNo2EdqRBPR5WyT36A" type="NameLabel" element="_cNskcNo2EdqRBPR5WyT36A">

-          <children xmi:id="_cN4xtto2EdqRBPR5WyT36A" type="Stereotype" element="_cNskcNo2EdqRBPR5WyT36A"/>

-          <children xmi:id="_cN4xt9o2EdqRBPR5WyT36A" type="Name" element="_cNskcNo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN4xtdo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_cN4xuNo2EdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_cNskcto2EdqRBPR5WyT36A">

-          <children xmi:id="_cN4xuto2EdqRBPR5WyT36A" type="ToMultiplicity" element="_cNskcto2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN4xudo2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_cN4xu9o2EdqRBPR5WyT36A" type="ToRoleLabel" element="_cNskcto2EdqRBPR5WyT36A">

-          <children xmi:id="_cN4xvdo2EdqRBPR5WyT36A" type="ToRole" element="_cNskcto2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN4xvNo2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_cN_fYNo2EdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_cNskcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_cN_fYto2EdqRBPR5WyT36A" type="FromMultiplicity" element="_cNskcdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN_fYdo2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_cN_fY9o2EdqRBPR5WyT36A" type="FromRoleLabel" element="_cNskcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_cN_fZdo2EdqRBPR5WyT36A" type="FromRole" element="_cNskcdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN_fZNo2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_cN_fZto2EdqRBPR5WyT36A" type="ToQualifierLabel" element="_cNskcto2EdqRBPR5WyT36A">

-          <children xmi:id="_cN_faNo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_cNskcto2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_cN_fado2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN_fZ9o2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_cN_fato2EdqRBPR5WyT36A" type="FromQualifierLabel" element="_cNskcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_cN_fbNo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_cNskcdo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_cN_fbdo2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cN_fa9o2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_cN4xsto2EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cN4xs9o2EdqRBPR5WyT36A" points="[-2, -29, 1, 91]$[26, -89, 29, 31]"/>

-      </edges>

-      <edges xmi:id="_pdfmkNo2EdqRBPR5WyT36A" element="_pdHMENo2EdqRBPR5WyT36A" source="_ePDcYdovEdqRBPR5WyT36A" target="_cN4xsdo2EdqRBPR5WyT36A">

-        <children xmi:id="_pdfml9o2EdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_pdTZUdo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmmdo2EdqRBPR5WyT36A" type="ToMultiplicity" element="_pdTZUdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmmNo2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_pdfmmto2EdqRBPR5WyT36A" type="ToRoleLabel" element="_pdTZUdo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmnNo2EdqRBPR5WyT36A" type="ToRole" element="_pdTZUdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmm9o2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_pdfmndo2EdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_pdTZUNo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmn9o2EdqRBPR5WyT36A" type="FromMultiplicity" element="_pdTZUNo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmnto2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_pdfmoNo2EdqRBPR5WyT36A" type="FromRoleLabel" element="_pdTZUNo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmoto2EdqRBPR5WyT36A" type="FromRole" element="_pdTZUNo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmodo2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_pdfmo9o2EdqRBPR5WyT36A" type="ToQualifierLabel" element="_pdTZUdo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmpdo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_pdTZUdo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pdfmpto2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmpNo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_pdfmp9o2EdqRBPR5WyT36A" type="FromQualifierLabel" element="_pdTZUNo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmqdo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_pdTZUNo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pdfmqto2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pdfmqNo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_pdfmq9o2EdqRBPR5WyT36A" element="_pdHMENo2EdqRBPR5WyT36A">

-          <children xmi:id="_pdfmrto2EdqRBPR5WyT36A" type="ImageCompartment" element="_pdHMENo2EdqRBPR5WyT36A">

-            <layoutConstraint xmi:type="notation:Size" xmi:id="_pdfmr9o2EdqRBPR5WyT36A" width="1320" height="1320"/>

-          </children>

-          <children xmi:id="_pdfmsNo2EdqRBPR5WyT36A" type="Stereotype" element="_pdHMENo2EdqRBPR5WyT36A"/>

-          <children xmi:id="_pdfmsdo2EdqRBPR5WyT36A" type="Name" element="_pdHMENo2EdqRBPR5WyT36A"/>

-          <children xmi:id="_pdfmsto2EdqRBPR5WyT36A" type="AttributeCompartment" element="_pdHMENo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pdfms9o2EdqRBPR5WyT36A"/>

-          </children>

-          <children xmi:id="_pdfmtNo2EdqRBPR5WyT36A" type="OperationCompartment" element="_pdHMENo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pdfmtdo2EdqRBPR5WyT36A"/>

-          </children>

-          <children xmi:id="_pdfmtto2EdqRBPR5WyT36A" visible="false" type="SignalCompartment" element="_pdHMENo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_pdfmt9o2EdqRBPR5WyT36A"/>

-          </children>

-          <children xmi:id="_pdfmuNo2EdqRBPR5WyT36A" visible="false" type="StructureCompartment" element="_pdHMENo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLShapeCompartmentStyle" xmi:id="_pdfmudo2EdqRBPR5WyT36A"/>

-          </children>

-          <styles xmi:type="umlnotation:UMLShapeStyle" xmi:id="_pdfmrNo2EdqRBPR5WyT36A" showStereotype="Label"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pdfmrdo2EdqRBPR5WyT36A" y="1323"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_pdfmkdo2EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pdfmkto2EdqRBPR5WyT36A" points="[46, 3, -366, 94]$[412, -91, 0, 0]"/>

-        <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pdrz0No2EdqRBPR5WyT36A" id="100"/>

-      </edges>

-      <edges xmi:id="_9PaR4No2EdqRBPR5WyT36A" element="_9PH-ANo2EdqRBPR5WyT36A" source="_4WSrANovEdqRBPR5WyT36A" target="_o2m3oNo0EdqRBPR5WyT36A">

-        <children xmi:id="_9PaR49o2EdqRBPR5WyT36A" type="NameLabel" element="_9PH-ANo2EdqRBPR5WyT36A">

-          <children xmi:id="_9PaR5do2EdqRBPR5WyT36A" type="Stereotype" element="_9PH-ANo2EdqRBPR5WyT36A"/>

-          <children xmi:id="_9PaR5to2EdqRBPR5WyT36A" type="Name" element="_9PH-ANo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PaR5No2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_9PaR59o2EdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_9PH-Ato2EdqRBPR5WyT36A">

-          <children xmi:id="_9PaR6do2EdqRBPR5WyT36A" type="ToMultiplicity" element="_9PH-Ato2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PaR6No2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_9PaR6to2EdqRBPR5WyT36A" type="ToRoleLabel" element="_9PH-Ato2EdqRBPR5WyT36A">

-          <children xmi:id="_9PaR7No2EdqRBPR5WyT36A" type="ToRole" element="_9PH-Ato2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PaR69o2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_9PaR7do2EdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_9PH-Ado2EdqRBPR5WyT36A">

-          <children xmi:id="_9PaR79o2EdqRBPR5WyT36A" type="FromMultiplicity" element="_9PH-Ado2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PaR7to2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_9PaR8No2EdqRBPR5WyT36A" type="FromRoleLabel" element="_9PH-Ado2EdqRBPR5WyT36A">

-          <children xmi:id="_9PaR8to2EdqRBPR5WyT36A" type="FromRole" element="_9PH-Ado2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PaR8do2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_9PgYgNo2EdqRBPR5WyT36A" type="ToQualifierLabel" element="_9PH-Ato2EdqRBPR5WyT36A">

-          <children xmi:id="_9PgYgto2EdqRBPR5WyT36A" type="QualifierCompartment" element="_9PH-Ato2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_9PgYg9o2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PgYgdo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_9PgYhNo2EdqRBPR5WyT36A" type="FromQualifierLabel" element="_9PH-Ado2EdqRBPR5WyT36A">

-          <children xmi:id="_9PgYhto2EdqRBPR5WyT36A" type="QualifierCompartment" element="_9PH-Ado2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_9PgYh9o2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9PgYhdo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_9PaR4do2EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9PaR4to2EdqRBPR5WyT36A" points="[12, -24, -94, 162]$[80, -155, -26, 31]"/>

-      </edges>

-      <edges xmi:id="_9-BEUNo2EdqRBPR5WyT36A" element="_99uwcNo2EdqRBPR5WyT36A" source="_1y-ZsNovEdqRBPR5WyT36A" target="_o2m3oNo0EdqRBPR5WyT36A">

-        <children xmi:id="_9-BEU9o2EdqRBPR5WyT36A" type="NameLabel" element="_99uwcNo2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HK8No2EdqRBPR5WyT36A" type="Stereotype" element="_99uwcNo2EdqRBPR5WyT36A"/>

-          <children xmi:id="_9-HK8do2EdqRBPR5WyT36A" type="Name" element="_99uwcNo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-BEVNo2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_9-HK8to2EdqRBPR5WyT36A" type="ToMultiplicityLabel" element="_99uwcto2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HK9No2EdqRBPR5WyT36A" type="ToMultiplicity" element="_99uwcto2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HK89o2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_9-HK9do2EdqRBPR5WyT36A" type="ToRoleLabel" element="_99uwcto2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HK99o2EdqRBPR5WyT36A" type="ToRole" element="_99uwcto2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HK9to2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_9-HK-No2EdqRBPR5WyT36A" type="FromMultiplicityLabel" element="_99uwcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HK-to2EdqRBPR5WyT36A" type="FromMultiplicity" element="_99uwcdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HK-do2EdqRBPR5WyT36A" y="397"/>

-        </children>

-        <children xmi:id="_9-HK-9o2EdqRBPR5WyT36A" type="FromRoleLabel" element="_99uwcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HK_do2EdqRBPR5WyT36A" type="FromRole" element="_99uwcdo2EdqRBPR5WyT36A"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HK_No2EdqRBPR5WyT36A" y="-397"/>

-        </children>

-        <children xmi:id="_9-HK_to2EdqRBPR5WyT36A" type="ToQualifierLabel" element="_99uwcto2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HLANo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_99uwcto2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_9-HLAdo2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HK_9o2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <children xmi:id="_9-HLAto2EdqRBPR5WyT36A" type="FromQualifierLabel" element="_99uwcdo2EdqRBPR5WyT36A">

-          <children xmi:id="_9-HLBNo2EdqRBPR5WyT36A" type="QualifierCompartment" element="_99uwcdo2EdqRBPR5WyT36A">

-            <styles xmi:type="umlnotation:UMLListCompartmentStyle" xmi:id="_9-HLBdo2EdqRBPR5WyT36A"/>

-          </children>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_9-HLA9o2EdqRBPR5WyT36A" y="-185"/>

-        </children>

-        <styles xmi:type="umlnotation:UMLConnectorStyle" xmi:id="_9-BEUdo2EdqRBPR5WyT36A" showStereotype="Text"/>

-        <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9-BEUto2EdqRBPR5WyT36A" points="[49, -24, -290, 162]$[404, -163, 65, 23]"/>

-      </edges>

-    </contents>

-  </eAnnotations>

-  <packageImport xmi:type="uml:ProfileApplication" xmi:id="_al1S9NovEdqRBPR5WyT36A">

-    <eAnnotations xmi:id="_al1S9dovEdqRBPR5WyT36A" source="attributes">

-      <details xmi:id="_al1S9tovEdqRBPR5WyT36A" key="version" value="0"/>

-    </eAnnotations>

-    <importedPackage xmi:type="uml:Profile" href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/>

-    <importedProfile href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/>

-  </packageImport>

-  <packageImport xmi:type="uml:ProfileApplication" xmi:id="_al1S99ovEdqRBPR5WyT36A">

-    <eAnnotations xmi:id="_al1S-NovEdqRBPR5WyT36A" source="attributes">

-      <details xmi:id="_al1S-dovEdqRBPR5WyT36A" key="version" value="0"/>

-    </eAnnotations>

-    <importedPackage xmi:type="uml:Profile" href="pathmap://UML2_PROFILES/Intermediate.profile.uml2#_Cz7csK87Edih9-GG5afQ0g"/>

-    <importedProfile href="pathmap://UML2_PROFILES/Intermediate.profile.uml2#_Cz7csK87Edih9-GG5afQ0g"/>

-  </packageImport>

-  <packageImport xmi:type="uml:ProfileApplication" xmi:id="_al1S-tovEdqRBPR5WyT36A">

-    <eAnnotations xmi:id="_al1S-9ovEdqRBPR5WyT36A" source="attributes">

-      <details xmi:id="_al1S_NovEdqRBPR5WyT36A" key="version" value="0"/>

-    </eAnnotations>

-    <importedPackage xmi:type="uml:Profile" href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/>

-    <importedProfile href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/>

-  </packageImport>

-  <packageImport xmi:type="uml:ProfileApplication" xmi:id="_al1S_dovEdqRBPR5WyT36A">

-    <eAnnotations xmi:id="_al1S_tovEdqRBPR5WyT36A" source="attributes">

-      <details xmi:id="_al1S_9ovEdqRBPR5WyT36A" key="version" value="0"/>

-    </eAnnotations>

-    <importedPackage xmi:type="uml:Profile" href="pathmap://UML2_MSL_PROFILES/Default.epx#_a_S3wNWLEdiy4IqP8whjFA?Default"/>

-    <importedProfile href="pathmap://UML2_MSL_PROFILES/Default.epx#_a_S3wNWLEdiy4IqP8whjFA?Default"/>

-  </packageImport>

-  <packageImport xmi:type="uml:ProfileApplication" xmi:id="_al1TANovEdqRBPR5WyT36A">

-    <eAnnotations xmi:id="_al1TAdovEdqRBPR5WyT36A" source="attributes">

-      <details xmi:id="_al1TAtovEdqRBPR5WyT36A" key="version" value="0"/>

-    </eAnnotations>

-    <importedPackage xmi:type="uml:Profile" href="pathmap://UML2_MSL_PROFILES/Deployment.epx#_vjbuwOvHEdiDX5bji0iVSA?Deployment"/>

-    <importedProfile href="pathmap://UML2_MSL_PROFILES/Deployment.epx#_vjbuwOvHEdiDX5bji0iVSA?Deployment"/>

-  </packageImport>

-  <packageImport xmi:id="_al1TA9ovEdqRBPR5WyT36A">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML2_LIBRARIES/UML2PrimitiveTypes.library.uml2#_EfRZoK86EdieaYgxtVWN8Q"/>

-  </packageImport>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_ePDcYNovEdqRBPR5WyT36A" name="Context">

-    <generalization xmi:id="_R5RjwNo1EdqRBPR5WyT36A" general="_Mz_E8No1EdqRBPR5WyT36A"/>

-    <ownedAttribute xmi:id="_FdlRYdowEdqRBPR5WyT36A" name="scopecontext" visibility="private" type="_z_g4ANovEdqRBPR5WyT36A" association="_FdlRYNowEdqRBPR5WyT36A">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FdlRZNowEdqRBPR5WyT36A" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FdlRY9owEdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_fsviYNovEdqRBPR5WyT36A" name="CompositeContext">

-    <generalization xmi:id="_hmIF4NovEdqRBPR5WyT36A" general="_ePDcYNovEdqRBPR5WyT36A"/>

-    <ownedAttribute xmi:id="_peM1YdovEdqRBPR5WyT36A" name="context" visibility="private" type="_ePDcYNovEdqRBPR5WyT36A" association="_peM1YNovEdqRBPR5WyT36A" aggregation="composite">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_peM1ZNovEdqRBPR5WyT36A" value="-1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_peM1Y9ovEdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_ikl5QNovEdqRBPR5WyT36A" name="AtomicContext">

-    <generalization xmi:id="_mu9A4NovEdqRBPR5WyT36A" general="_ePDcYNovEdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_peM1YNovEdqRBPR5WyT36A" memberEnd="_peM1YdovEdqRBPR5WyT36A _peM1YtovEdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_peM1YtovEdqRBPR5WyT36A" visibility="private" type="_fsviYNovEdqRBPR5WyT36A" association="_peM1YNovEdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_tZF9oNovEdqRBPR5WyT36A" name="DeploymentContext">

-    <generalization xmi:id="_xInjYNovEdqRBPR5WyT36A" general="_fsviYNovEdqRBPR5WyT36A"/>

-    <ownedAttribute xmi:id="_Bj8GUdowEdqRBPR5WyT36A" name="modulescopecontext" visibility="private" type="_1yyMcNovEdqRBPR5WyT36A" association="_Bj8GUNowEdqRBPR5WyT36A">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bj8GVNowEdqRBPR5WyT36A" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bj8GU9owEdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_z_g4ANovEdqRBPR5WyT36A" name="ScopeContext">

-    <ownedAttribute xmi:id="_cNskcdo2EdqRBPR5WyT36A" name="instancewrapper" visibility="private" type="_TI7NwNo1EdqRBPR5WyT36A" association="_cNskcNo2EdqRBPR5WyT36A">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNskdNo2EdqRBPR5WyT36A" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cNskc9o2EdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Class" xmi:id="_1yyMcNovEdqRBPR5WyT36A" name="ModuleScopeContext" clientDependency="_3IW4QNovEdqRBPR5WyT36A">

-    <implementation xmi:id="_3IW4QNovEdqRBPR5WyT36A" client="_1yyMcNovEdqRBPR5WyT36A" supplier="_z_g4ANovEdqRBPR5WyT36A" realizingClassifier="_z_g4ANovEdqRBPR5WyT36A" contract="_z_g4ANovEdqRBPR5WyT36A">

-      <mapping xmi:id="_3IW4QdovEdqRBPR5WyT36A"/>

-    </implementation>

-    <ownedAttribute xmi:id="_99uwcdo2EdqRBPR5WyT36A" name="scoperegistry" visibility="private" type="_o2gxANo0EdqRBPR5WyT36A" association="_99uwcNo2EdqRBPR5WyT36A">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_99uwdNo2EdqRBPR5WyT36A" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_99uwc9o2EdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Class" xmi:id="_4WMkYNovEdqRBPR5WyT36A" name="HTTPSessionScopeContext" clientDependency="_9XeF4NovEdqRBPR5WyT36A">

-    <implementation xmi:id="_9XeF4NovEdqRBPR5WyT36A" client="_4WMkYNovEdqRBPR5WyT36A" supplier="_z_g4ANovEdqRBPR5WyT36A" realizingClassifier="_z_g4ANovEdqRBPR5WyT36A" contract="_z_g4ANovEdqRBPR5WyT36A">

-      <mapping xmi:id="_9XeF4dovEdqRBPR5WyT36A"/>

-    </implementation>

-    <ownedAttribute xmi:id="_9PH-Ado2EdqRBPR5WyT36A" name="scoperegistry" visibility="private" type="_o2gxANo0EdqRBPR5WyT36A" association="_9PH-ANo2EdqRBPR5WyT36A">

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9PH-BNo2EdqRBPR5WyT36A" value="1"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9PH-A9o2EdqRBPR5WyT36A"/>

-    </ownedAttribute>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_Bj8GUNowEdqRBPR5WyT36A" memberEnd="_Bj8GUdowEdqRBPR5WyT36A _Bj8GUtowEdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_Bj8GUtowEdqRBPR5WyT36A" visibility="private" type="_tZF9oNovEdqRBPR5WyT36A" association="_Bj8GUNowEdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_FdlRYNowEdqRBPR5WyT36A" memberEnd="_FdlRYdowEdqRBPR5WyT36A _FdlRYtowEdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_FdlRYtowEdqRBPR5WyT36A" visibility="private" type="_ePDcYNovEdqRBPR5WyT36A" association="_FdlRYNowEdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_o2gxANo0EdqRBPR5WyT36A" name="ScopeRegistry"/>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_Mz_E8No1EdqRBPR5WyT36A" name="Lifecycle"/>

-  <ownedMember xmi:type="uml:Interface" xmi:id="_TI7NwNo1EdqRBPR5WyT36A" name="InstanceWrapper">

-    <generalization xmi:id="_V7zlENo1EdqRBPR5WyT36A" general="_Mz_E8No1EdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_cNskcNo2EdqRBPR5WyT36A" memberEnd="_cNskcdo2EdqRBPR5WyT36A _cNskcto2EdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_cNskcto2EdqRBPR5WyT36A" visibility="private" type="_z_g4ANovEdqRBPR5WyT36A" association="_cNskcNo2EdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:AssociationClass" xmi:id="_pdHMENo2EdqRBPR5WyT36A" name="AssociationClass1" memberEnd="_pdTZUNo2EdqRBPR5WyT36A _pdTZUdo2EdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_pdTZUNo2EdqRBPR5WyT36A" visibility="private" type="_cNskcNo2EdqRBPR5WyT36A" association="_pdHMENo2EdqRBPR5WyT36A"/>

-    <ownedEnd xmi:id="_pdTZUdo2EdqRBPR5WyT36A" visibility="private" type="_ePDcYNovEdqRBPR5WyT36A" association="_pdHMENo2EdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_9PH-ANo2EdqRBPR5WyT36A" memberEnd="_9PH-Ado2EdqRBPR5WyT36A _9PH-Ato2EdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_9PH-Ato2EdqRBPR5WyT36A" visibility="private" type="_4WMkYNovEdqRBPR5WyT36A" association="_9PH-ANo2EdqRBPR5WyT36A"/>

-  </ownedMember>

-  <ownedMember xmi:type="uml:Association" xmi:id="_99uwcNo2EdqRBPR5WyT36A" memberEnd="_99uwcdo2EdqRBPR5WyT36A _99uwcto2EdqRBPR5WyT36A">

-    <ownedEnd xmi:id="_99uwcto2EdqRBPR5WyT36A" visibility="private" type="_1yyMcNovEdqRBPR5WyT36A" association="_99uwcNo2EdqRBPR5WyT36A"/>

-  </ownedMember>

-</uml:Model>

diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
deleted file mode 100644
index ed4b57639c..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.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.context;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.ComponentContext;
-
-/**
- * Interface implemented by the provider of the ComponentContext.
- * 
- * @version $Rev$ $Date$
- */
-public interface ComponentContextFactory {
-    /**
-     * Create an instance of ComponentContext
-     * 
-     * @param component The runtime component
-     * @param requestContextFactory The factory to create RequestContext
-     * @return An instance of ComponentContext for the component
-     */
-    ComponentContext createComponentContext(RuntimeComponent component, RequestContextFactory requestContextFactory);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
deleted file mode 100644
index e92a8f2844..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.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.context;
-
-/**
- * An extension point for context factories. 
- *
- * @version $Rev$ $Date$
- */
-public interface ContextFactoryExtensionPoint {
-    
-    /**
-     * Add a context factory extension.
-     * 
-     * @param factory The factory to add
-     */
-    void addFactory(Object factory);
-    
-    /**
-     * Remove a context factory extension.
-     *  
-     * @param factory The factory to remove
-     */
-    void removeFactory(Object factory); 
-    
-    /**
-     * Get a factory implementing the given interface.
-     * @param factoryInterface the lookup key (factory interface)
-     * @return The factory
-     */
-    <T> T getFactory(Class<T> factoryInterface);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
deleted file mode 100644
index 5a0aefe55d..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.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.context;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of a model factory extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultContextFactoryExtensionPoint implements ContextFactoryExtensionPoint {
-
-    /**
-     * The Map of Factories that have been registered.
-     */
-    private HashMap<Class<?>, Object> factories = new HashMap<Class<?>, Object>();
-
-    private ExtensionPointRegistry registry;
-
-    public DefaultContextFactoryExtensionPoint(ExtensionPointRegistry registry) {
-        this.registry = registry;
-    }
-
-    /**
-     * Add a model factory extension.
-     *
-     * @param factory The factory to add.
-     * @throws IllegalArgumentException if factory is null
-     */
-    public void addFactory(Object factory) throws IllegalArgumentException {
-        if (factory == null) {
-            throw new IllegalArgumentException("Cannot add null as a factory");
-        }
-
-        Class<?>[] interfaces = factory.getClass().getInterfaces();
-        for (int i = 0; i<interfaces.length; i++) {
-            factories.put(interfaces[i], factory);
-        }
-    }
-
-    /**
-     * Remove a model factory extension.
-     *
-     * @param factory The factory to remove
-     * @throws IllegalArgumentException if factory is null
-     */
-    public void removeFactory(Object factory) throws IllegalArgumentException {
-        if (factory == null) {
-            throw new IllegalArgumentException("Cannot remove null as a factory");
-        }
-
-        Class<?>[] interfaces = factory.getClass().getInterfaces();
-        for (int i = 0; i<interfaces.length; i++) {
-            factories.remove(interfaces[i]);
-        }
-    }
-
-    /**
-     * Get a factory implementing the given interface.
-     *
-     * @param factoryInterface The lookup key (factory interface)
-     * @return The factory
-     */
-    public <T> T getFactory(Class<T> factoryInterface) throws IllegalArgumentException {
-        if (factoryInterface == null) {
-            throw new IllegalArgumentException("Cannot get null as a factory");
-        }
-
-        Object factory = factories.get(factoryInterface);
-        if (factory == null) {
-
-            // Dynamically load a factory class declared under META-INF/services
-            try {
-                Class<?> factoryClass = ServiceDiscovery.getInstance().loadFirstServiceClass(factoryInterface);
-                if (factoryClass != null) {
-            
-                    // Default empty constructor
-                    Constructor<?> constructor = factoryClass.getConstructor(ExtensionPointRegistry.class);
-                    factory = constructor.newInstance(registry);
-            
-                    // Cache the loaded factory
-                    addFactory(factory);
-                }
-            } catch (Exception e) {
-                throw new IllegalArgumentException(e);
-            }
-
-        }
-
-        return factoryInterface.cast(factory);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
deleted file mode 100644
index 9766e164b8..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.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.context;
-
-import org.apache.tuscany.sca.assembly.ComponentProperty;
-
-/**
- * Interface implemented by the provider of the property values
- *
- * @version $Rev$ $Date$
- */
-public interface PropertyValueFactory {
-
-    /**
-     * This method will create an instance of the value for the specified Property.
-     * 
-     * @param property The Property from which to retrieve the property value
-     * @param type The type of the property value being retrieved from the Property
-     * @param <B> Type type of the property value being looked up
-     * 
-     * @return the value for the Property
-     */
-    <B> B createPropertyValue(ComponentProperty property, Class<B> type);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
deleted file mode 100644
index 546757c766..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.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.context;
-
-import org.osoa.sca.RequestContext;
-
-/**
- * Interface implemented by the provider of the RequestContext.
- *
- * @version $Rev$ $Date$
- */
-public interface RequestContextFactory {
-    /**
-     * @return An instance of RequestContext for the current invocation
-     */
-    RequestContext createRequestContext();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
deleted file mode 100644
index 41735261e6..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.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.endpointresolver;
-
-import java.lang.reflect.Constructor;
-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.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Default implementation of a provider factory extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultEndpointResolverFactoryExtensionPoint implements EndpointResolverFactoryExtensionPoint {
-
-    private ExtensionPointRegistry registry;
-    private final Map<Class<?>, EndpointResolverFactory> endpointResolverFactories = new HashMap<Class<?>, EndpointResolverFactory>();
-    private boolean loaded;
-
-    /**
-     * The default constructor. Does nothing.
-     *
-     */
-    public DefaultEndpointResolverFactoryExtensionPoint(ExtensionPointRegistry registry) {
-        this.registry = registry;
-    }
-
-    /**
-     * Add an endpoint resolver factory.
-     * 
-     * @param endpointResolverFactory The resolver factory
-     */
-    public void addEndpointResolverFactory(EndpointResolverFactory endpointResolverFactory){
-        endpointResolverFactories.put(endpointResolverFactory.getModelType(), endpointResolverFactory);
-    }
-
-    /**
-     * Remove a endpoint resolver factory.
-     * 
-     * @param endpointResolverFactory The endpoint resolver factory
-     */
-    public void removeEndpointResolverFactory(EndpointResolverFactory endpointResolverFactory){
-        endpointResolverFactories.remove(endpointResolverFactory.getModelType());
-    }
-
-    /**
-     * Returns the provider factory associated with the given model type.
-     * @param modelType A model type
-     * @return The provider factory associated with the given model type
-     */
-    public EndpointResolverFactory getEndpointResolverFactory(Class<?> modelType) {
-        loadProviderFactories();
-
-        Class<?>[] classes = modelType.getInterfaces();
-        for (Class<?> c : classes) {
-            EndpointResolverFactory factory = endpointResolverFactories.get(c);
-            if (factory != null) {
-                return factory;
-            }
-        }
-        return endpointResolverFactories.get(modelType);
-    }
-
-
-    /**
-     * Load provider factories declared under META-INF/services.
-     * @param registry
-     */
-    private void loadProviderFactories() {
-        if (loaded)
-            return;
-
-        // Get the provider factory service declarations
-        Set<ServiceDeclaration> factoryDeclarations;
-        ServiceDiscovery serviceDiscovery = ServiceDiscovery.getInstance();
-        try {
-            factoryDeclarations = serviceDiscovery.getServiceDeclarations(EndpointResolverFactory.class);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-
-        // Get the extension point
-        EndpointResolverFactoryExtensionPoint factoryExtensionPoint =
-            registry.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class);
-        List<EndpointResolverFactory> factories = new ArrayList<EndpointResolverFactory>();
-
-        for (ServiceDeclaration factoryDeclaration : factoryDeclarations) {
-            Map<String, String> attributes = factoryDeclaration.getAttributes();
-
-            // Find the model type that identifies this resolver
-            String modelTypeName = attributes.get("model");
-
-            // Create a provider factory wrapper and register it
-            EndpointResolverFactory factory =
-                new LazyEndpointResolverFactory(registry, modelTypeName, factoryDeclaration);
-            factoryExtensionPoint.addEndpointResolverFactory(factory);
-            factories.add(factory);
-        }
-
-        loaded = true;
-    }
-
-    /**
-     * A wrapper around an endpoint provider factory allowing lazy
-     * loading and initialization of endpoint providers.
-     */
-    private class LazyEndpointResolverFactory implements EndpointResolverFactory {
-        private ExtensionPointRegistry registry;
-        private String modelTypeName;
-        private ServiceDeclaration providerClass;
-        private EndpointResolverFactory factory;
-        private Class modelType;
-
-        private LazyEndpointResolverFactory(ExtensionPointRegistry registry,
-                                            String modelTypeName,
-                                            ServiceDeclaration providerClass) {
-            this.registry = registry;
-            this.modelTypeName = modelTypeName;
-            this.providerClass = providerClass;
-        }
-
-        @SuppressWarnings("unchecked")
-        private EndpointResolverFactory getFactory() {
-            if (factory == null) {
-                try {
-                    Class<EndpointResolverFactory> factoryClass = (Class<EndpointResolverFactory>)providerClass.loadClass();
-                    Constructor<EndpointResolverFactory> constructor =
-                        factoryClass.getConstructor(ExtensionPointRegistry.class);
-                    factory = constructor.newInstance(registry);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return factory;
-        }
-
-        public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-            return getFactory().createEndpointResolver(endpoint, binding);
-        }
-
-        public Class getModelType() {
-            if (modelType == null) {
-                try {
-                    modelType = providerClass.loadClass(modelTypeName);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return modelType;
-        }
-
-    }    
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
deleted file mode 100644
index 79a10f6d84..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.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.endpointresolver;
-
-
-/**
- * A reference binding implementation can options implement this
- * interface to tie into the Tuscany SCA runtime
- * 
- * @version $Rev$ $Date$
- */
-public interface EndpointResolver {
-
-    /**
-     * This method will be invoked when the endpoint is
-     * activated. It gives the resolver the opportunity
-     * to do any set up ready for when it is asked to 
-     * resolve the endpoint when a message arrives
-     */
-    void start();
-    
-    /**
-     * This method will be invoked when the endpoint is
-     * to be resolved. The resolver will attempt to resolve the 
-     * endpoint against available services. The resolvers extending
-     * this interface will provide environment or binding specific 
-     * resolution processing
-     */
-    void resolve();
-
-    /**
-     * This method will be invoked when the endpont is
-     * deactivated. It gives the resolver the opportunity
-     * to take and required resolver shutdown actions
-     */
-    void stop();    
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
deleted file mode 100644
index fdd304a9c7..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.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.endpointresolver;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-
-/**
- * A factory for creating the runtime artifacts that resolve endpoints.
- * 
- * @version $Rev$ $Date$
- */
-public interface EndpointResolverFactory <M>{
-
-    /**
-     * Creates a new endpoint resolver for the given component,
-     * reference and binding.
-     * 
-     * @param component The runtime component
-     * @param reference The reference on the runtime component
-     * @param enpoint The endpoint assembly model object
-     * @return The endpoint provider
-     */
-    EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding);
-    
-    Class<M> getModelType();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
deleted file mode 100644
index be55981131..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.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.endpointresolver;
-
-import java.util.List;
-
-
-/**
- * An extension point for resolver factories. Holds all of the resolver
- * factories from loaded extension points. Allows a resolver factory
- * to be located based on a given model type. Hence the runtime can 
- * generate endpoint resolvers from the in memory assembly model. 
- *
- * @version $Rev$ $Date$
- */
-public interface EndpointResolverFactoryExtensionPoint {
-
-
-    /**
-     * Add an endpoint resolver factory.
-     * 
-     * @param endpointResolverFactory The resolver factory
-     */
-    void addEndpointResolverFactory(EndpointResolverFactory endpointResolverFactory);
-
-    /**
-     * Remove a endpoint resolver factory.
-     * 
-     * @param endpointResolverFactory The endpoint resolver factory
-     */
-    void removeEndpointResolverFactory(EndpointResolverFactory endpointResolverFactory);
-
-    /**
-     * Returns the endpoint resolver factory associated with the given binding type.
-     * @param bindingType A binding type
-     * @return The endpoint resolver factory associated with the given binding type
-     */
-    EndpointResolverFactory getEndpointResolverFactory(Class<?> bindingType);
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
deleted file mode 100644
index 992c1188f7..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.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.event;
-
-/**
- * The base interface for events that are propagated in the runtime
- *
- * @version $Rev$ $Date$
- */
-public interface Event {
-
-    /**
-     * Returns the source of the event
-     */
-    Object getSource();
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
deleted file mode 100644
index d17aebd7e8..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.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.event;
-
-/**
- * Evaluates whether a {@link RuntimeEventListener} is applicable to a given runtime event
- *
- * @version $Rev$ $Date$
- */
-public interface EventFilter {
-
-    /**
-     * Performs the actual evaluation on an event
-     * @param event Returns true if the event matches implemented criteria
-     * @return Match result
-     */
-    boolean match(Event event);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
deleted file mode 100644
index f209eb8936..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.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.event;
-
-/**
- * Publishes events in the runtime by accepting {@link Event} objects and 
- * forwarding them to all registered {@link RuntimeEventListener} objects.
- *
- * @version $Rev$ $Date$
- */
-public interface EventPublisher {
-
-    /**
-     * Publish an event to all registered listeners
-     * @param object The event to publish
-     */
-    void publish(Event object);
-
-    /**
-     * Registers a listener to receive notifications for the context
-     * @param listener The listener to add
-     */
-    void addListener(RuntimeEventListener listener);
-
-    /**
-     * Registers a listener to receive notifications for the context
-     * @param filter The filter that will be applied before the lister is called
-     * @param listener The lister to add
-     */
-    void addListener(EventFilter filter, RuntimeEventListener listener);
-
-
-    /**
-     * Removes a previously registered listener
-     * @param listener The listener to remove
-     */
-    void removeListener(RuntimeEventListener listener);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
deleted file mode 100644
index b34dceee62..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.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.event;
-
-import java.util.EventListener;
-
-/**
- * Listeners observe events fired in the SCA runtime.
- *
- * @version $Rev$ $Date$
- */
-public interface RuntimeEventListener extends EventListener {
-
-    /**
-     * Accepts and event and acts on it
-     * @param event The event to act on
-     */
-    void onEvent(Event event);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
deleted file mode 100644
index f888908340..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.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.event;
-
-/**
- * An event filter that always returns a true condition
- *
- * @version $Rev$ $Date$
- */
-public class TrueFilter implements EventFilter {
-
-    /**
-     * Performs the actual evaluation on an event. Always returns true
-     * in this case
-     * @param event The incoming event which is ignored
-     * @return true
-     */
-    public boolean match(Event event) {
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
deleted file mode 100644
index 957a15ce8a..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.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.invocation;
-
-/**
- * An invoker or interceptor can optionally implement this interface to indicate if they can 
- * enforce the pass-by-value semantics for an operation on remotable interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public interface DataExchangeSemantics {
-    /**
-     * Indicate if the data can be passed in by reference as they won't be mutated.
-     * @return true if pass-by-reference is allowed
-     */
-    boolean allowsPassByReference();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
deleted file mode 100644
index a5f221fc11..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.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.invocation;
-
-/**
- * Synchronous mediation associated with a client- or target- side wire.
- *
- * @version $Rev$ $Date$
- */
-public interface Interceptor extends Invoker {
-
-    /**
-     * Sets the next invoker
-     * @param next The next invoker
-     */
-    void setNext(Invoker next);
-
-    /**
-     * Returns the next invoker or null
-     * @return The next Invoker
-     */
-    Invoker getNext();
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
deleted file mode 100644
index 75719bb0cc..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.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.invocation;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * A wire consists of 1..n invocation chains associated with the operations of its source service contract.
- * <p/>
- * Invocation chains may contain <code>Interceptors</code> that process invocations.
- * <p/>
- * A <code>Message</code> is used to pass data associated with an invocation through the chain.
- *
- * @version $Rev$ $Date$
- */
-public interface InvocationChain {
-    /**
-     * Returns the target operation for this invocation chain.
-     *
-     * @return The target operation for this invocation chain
-     */
-    Operation getTargetOperation();
-
-    /**
-     * Updates the target operation for this invocation chain.
-     *
-     * @param operation The new target operation for this invocation chain
-     */
-    void setTargetOperation(Operation operation);
-    
-    /**
-     * Returns the source operation for this invocation chain.
-     *
-     * @return The source operation for this invocation chain
-     */    
-    Operation getSourceOperation();
-
-    /**
-     * Adds an interceptor to the chain. For reference side, it will be added to
-     * Phase.REFERENCE. For service side, it will be added to Phase.SERVICE 
-     *
-     * @param interceptor The interceptor to add
-     */
-    void addInterceptor(Interceptor interceptor);
-
-    /**
-     * Adds an invoker to the chain
-     *
-     * @param invoker The invoker to add
-     */
-    void addInvoker(Invoker invoker);
-
-    /**
-     * Returns the first invoker in the chain.
-     *
-     * @return The first invoker in the chain
-     */
-    Invoker getHeadInvoker();
-
-    /**
-     * @deprecated This method is not used
-     * Returns the last invoker in the chain.
-     *
-     * @return The last invoker in the chain
-     */
-    @Deprecated
-    Invoker getTailInvoker();
-
-    /**
-     * @deprecated Please use <code>void addInterceptor(String phase, Interceptor interceptor);</code>
-     * Adds an interceptor at the given position in the interceptor stack
-     *
-     * @param index       The position in the interceptor stack to add the interceptor
-     * @param interceptor The interceptor to add
-     */
-    @Deprecated
-    void addInterceptor(int index, Interceptor interceptor);
-    
-    /**
-     * Add an interceptor to the given phase
-     * @param phase
-     * @param interceptor
-     */
-    void addInterceptor(String phase, Interceptor interceptor);
-    
-    /**
-     * Indicate if the data can be passed in by reference as they won't be mutated.
-     * @return true if pass-by-reference is allowed
-     */
-    boolean allowsPassByReference();
-    /**
-     * Force the invocation to allow pass-by-reference
-     * @param allowsPBR
-     */
-    void setAllowsPassByReference(boolean allowsPBR);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
deleted file mode 100644
index 2748bbed9a..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.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.invocation;
-
-/**
- * Synchronous mediation associated with a client- or target- side wire.
- *
- * @version $Rev$ $Date$
- */
-public interface Invoker {
-
-    /**
-     * Process a synchronous wire
-     *
-     * @param msg The request Message for the wire
-     * @return The response Message from the wire
-     */
-    Message invoke(Message msg);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
deleted file mode 100644
index 4c27c8b06f..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.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.invocation;
-
-import java.util.Map;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-
-/**
- * Represents a request, response, or exception flowing through a wire
- *
- * @version $Rev $Date$
- */
-public interface Message {
-    String QOS_CTX_SECURITY_PRINCIPAL = "PRINCIPAL";
-
-    /**
-     * Returns the body of the message, which will be the payload or parameters associated with the wire
-     * @return The body of the message
-     */
-    <T> T getBody();
-
-    /**
-     * Sets the body of the message.
-     * @param body The body of the message
-     */
-    <T> void setBody(T body);
-
-    /**
-     * Get the end point reference of the source reference
-     * @return The end point reference of the reference originating the message
-     */
-    EndpointReference getFrom();
-
-    /**
-     * Set the end point reference of the reference originating the message
-     * @param from The end point reference of the reference originating the message
-     */
-    void setFrom(EndpointReference from);
-
-    /**
-     * Get the end point reference of target service
-     * @return The end point reference of the service that the message targets
-     */
-    EndpointReference getTo();
-
-    /**
-     * Set the end point reference of target service
-     * @param to The end point reference of the service that the message targets
-     */
-    void setTo(EndpointReference to);
-    
-    /**
-     * Returns the id of the message
-     * @return The message Id
-     */
-    Object getMessageID();
-
-    /**
-     * Sets the id of the message
-     * @param messageId The message ID
-     */
-    void setMessageID(Object messageId);
-
-    /**
-     * Determines if the message represents a fault/exception
-     *
-     * @return true If the message body is a fault object, false if the body is a normal payload
-     */
-    boolean isFault();
-
-    /**
-     * Set the message body with a fault object. After this method is called, isFault() returns true.
-     *
-     * @param fault The fault object represents an exception
-     */
-    <T> void setFaultBody(T fault);
-
-    /**
-     * Returns the operation that created the message.
-     *
-     * @return The operation that created the message
-     */
-    Operation getOperation();
-
-    /**
-     * Sets the operation that created the message.
-     *
-     * @param op The operation that created the message
-     */
-    void setOperation(Operation op);
-    
-    /** 
-     * Returns a map of objects that represents the QoS context that wraps this message such as 
-     * invoking authenticated principal and so on.
-     * 
-     * @return
-     */
-    Map<String, Object> getQoSContext();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
deleted file mode 100644
index 38c900e36a..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.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.invocation;
-
-
-/**
- * A factory for messages
- *
- * @version $Rev $Date$
- */
-public interface MessageFactory {
-
-    /**
-     * Creates a new message.
-     * 
-     * @return The new message
-     */
-    Message createMessage();
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
deleted file mode 100644
index 2deb273f84..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.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.invocation;
-
-/**
- * Tuscany built-in phases for the invocation chain
- * 
- * @version $Rev$ $Date$
- */
-public interface Phase {
-    // The first phase for outgoing invocations via a reference
-    String REFERENCE = "component.reference";
-
-    // data transformation and validation
-    String REFERENCE_INTERFACE = "reference.interface";
-
-    // reference policy handling
-    String REFERENCE_POLICY = "reference.policy";
-
-    // reference binding invoker
-    String REFERENCE_BINDING = "reference.binding";
-
-    // The first phase for incoming invocations via a service
-    String SERVICE_BINDING = "service.binding";
-
-    // service policy handling
-    String SERVICE_POLICY = "service.policy";
-
-    // data validation and transformation
-    String SERVICE_INTERFACE = "service.interface";
-
-    // TODO: not sure if we need to have this face
-    String SERVICE = "component.service";
-
-    // implementation policy handling
-    String IMPLEMENTATION_POLICY = "implementation.policy";
-
-    // implementation invoker
-    String IMPLEMENTATION = "component.implementation";
-
-    // String getName();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
deleted file mode 100644
index 3887db4873..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.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.management;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Interface for the management service abstraction. The implementation
- * could be based on a variety of technologies including JMX, WSDM,
- * SNMP etc.
- *
- * @version $Revision$ $Date$
- */
-public interface ManagementService {
-
-    /**
-     * Registers a component for management.
-     *
-     * @param name      Name of the component.
-     * @param component Component to be registered.
-     */
-    void registerComponent(String name, RuntimeComponent component);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
deleted file mode 100644
index 0f6a932c51..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.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.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * A factory for creating the runtime artifacts that represent bindings.
- * 
- * @version $Rev$ $Date$
- */
-public interface BindingProviderFactory<M extends Binding> extends ProviderFactory<M> {
-
-    /**
-     * Creates a new reference binding provider for the given component and
-     * reference.
-     * 
-     * @param component The runtime component
-     * @param reference The reference on the runtime component
-     * @param binding The binding assembly model object
-     * @return The binding provider
-     */
-    ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                            RuntimeComponentReference reference,
-                                                            M binding);
-
-    /**
-     * Creates a new service binding provider for the given component and
-     * service.
-     * 
-     * @param component The runtime component
-     * @param service The service on the runtime component
-     * @param binding The binding assembly model object
-     * @return The binding provider
-     */
-    ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                        RuntimeComponentService service,
-                                                        M binding);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
deleted file mode 100644
index 51e5e91589..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.provider;
-
-import java.lang.reflect.Constructor;
-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.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Default implementation of a provider factory extension point.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultProviderFactoryExtensionPoint implements ProviderFactoryExtensionPoint {
-
-    private ExtensionPointRegistry registry;
-    private final Map<Class<?>, ProviderFactory> providerFactories = new HashMap<Class<?>, ProviderFactory>();
-    private final List<PolicyProviderFactory> policyProviderFactories = new ArrayList<PolicyProviderFactory>();
-    private boolean loaded;
-
-    /**
-     * The default constructor. Does nothing.
-     *
-     */
-    public DefaultProviderFactoryExtensionPoint(ExtensionPointRegistry registry) {
-        this.registry = registry;
-    }
-
-    /**
-     * Add a provider factory.
-     * 
-     * @param providerFactory The provider factory
-     */
-    public void addProviderFactory(ProviderFactory providerFactory) {
-        if(providerFactory instanceof PolicyProviderFactory) {
-            policyProviderFactories.add((PolicyProviderFactory)providerFactory);
-        } 
-        providerFactories.put(providerFactory.getModelType(), providerFactory);
-    }
-
-    /**
-     * Remove a provider factory.
-     * 
-     * @param providerFactory The provider factory
-     */
-    public void removeProviderFactory(ProviderFactory providerFactory) {
-        if(providerFactory instanceof PolicyProviderFactory) {
-            policyProviderFactories.remove((PolicyProviderFactory)providerFactory);
-        }
-        providerFactories.remove(providerFactory.getModelType());
-    }
-
-    /**
-     * Returns the provider factory associated with the given model type.
-     * @param modelType A model type
-     * @return The provider factory associated with the given model type
-     */
-    public ProviderFactory getProviderFactory(Class<?> modelType) {
-        loadProviderFactories();
-
-        Class<?>[] classes = modelType.getInterfaces();
-        for (Class<?> c : classes) {
-            ProviderFactory factory = providerFactories.get(c);
-            if (factory != null) {
-                return factory;
-            }
-        }
-        return providerFactories.get(modelType);
-    }
-
-    public List<PolicyProviderFactory> getPolicyProviderFactories() {
-        loadProviderFactories();
-        return policyProviderFactories;
-    }
-
-    /**
-     * Load provider factories declared under META-INF/services.
-     * @param registry
-     */
-    private void loadProviderFactories() {
-        if (loaded)
-            return;
-
-        loadProviderFactories(BindingProviderFactory.class);
-        loadProviderFactories(ImplementationProviderFactory.class);
-        loadProviderFactories(PolicyProviderFactory.class);
-
-        loaded = true;
-    }
-
-    /**
-     * Load provider factories declared under META-INF/services.
-     * @param registry
-     * @param factoryClass
-     * @return
-     */
-    private List<ProviderFactory> loadProviderFactories(Class<?> factoryClass) {
-
-        // Get the provider factory service declarations
-        Set<ServiceDeclaration> factoryDeclarations;
-        ServiceDiscovery serviceDiscovery = ServiceDiscovery.getInstance();
-        try {
-            factoryDeclarations = serviceDiscovery.getServiceDeclarations(factoryClass);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-
-        // Get the target extension point
-        ProviderFactoryExtensionPoint factoryExtensionPoint =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        List<ProviderFactory> factories = new ArrayList<ProviderFactory>();
-
-        for (ServiceDeclaration factoryDeclaration : factoryDeclarations) {
-            Map<String, String> attributes = factoryDeclaration.getAttributes();
-
-            // Load an implementation provider factory
-            if (factoryClass == ImplementationProviderFactory.class) {
-                String modelTypeName = attributes.get("model");
-
-                // Create a provider factory wrapper and register it
-                ImplementationProviderFactory factory =
-                    new LazyImplementationProviderFactory(registry, modelTypeName, factoryDeclaration);
-                factoryExtensionPoint.addProviderFactory(factory);
-                factories.add(factory);
-
-            } else if (factoryClass == BindingProviderFactory.class) {
-
-                // Load a binding provider factory
-                String modelTypeName = attributes.get("model");
-
-                // Create a provider factory wrapper and register it
-                BindingProviderFactory factory =
-                    new LazyBindingProviderFactory(registry, modelTypeName, factoryDeclaration);
-                factoryExtensionPoint.addProviderFactory(factory);
-                factories.add(factory);
-            } else if (factoryClass == PolicyProviderFactory.class) {
-                // Load a policy provider factory
-                String modelTypeName = attributes.get("model");
-
-                // Create a provider factory wrapper and register it
-                PolicyProviderFactory factory =
-                    new LazyPolicyProviderFactory(registry, modelTypeName, factoryDeclaration);
-                factoryExtensionPoint.addProviderFactory(factory);
-                factories.add(factory);
-            }
-        }
-        return factories;
-    }
-
-    /**
-     * A wrapper around an implementation provider factory allowing lazy
-     * loading and initialization of implementation providers.
-     */
-    private static class LazyBindingProviderFactory implements BindingProviderFactory {
-
-        private ExtensionPointRegistry registry;
-        private String modelTypeName;
-        private ServiceDeclaration factoryDeclaration;
-        private BindingProviderFactory factory;
-        private Class modelType;
-
-        private LazyBindingProviderFactory(ExtensionPointRegistry registry,
-                                           String modelTypeName,
-                                           ServiceDeclaration factoryDeclaration) {
-            this.registry = registry;
-            this.modelTypeName = modelTypeName;
-            this.factoryDeclaration = factoryDeclaration;
-        }
-
-        @SuppressWarnings("unchecked")
-        private BindingProviderFactory getFactory() {
-            if (factory == null) {
-                try {
-                    Class<BindingProviderFactory> factoryClass =
-                        (Class<BindingProviderFactory>)factoryDeclaration.loadClass();
-                    Constructor<BindingProviderFactory> constructor =
-                        factoryClass.getConstructor(ExtensionPointRegistry.class);
-                    factory = constructor.newInstance(registry);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return factory;
-        }
-
-        @SuppressWarnings("unchecked")
-        public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                       RuntimeComponentReference reference,
-                                                                       Binding binding) {
-            return getFactory().createReferenceBindingProvider(component, reference, binding);
-        }
-
-        @SuppressWarnings("unchecked")
-        public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentService service,
-                                                                   Binding binding) {
-            return getFactory().createServiceBindingProvider(component, service, binding);
-        }
-
-        public Class getModelType() {
-            if (modelType == null) {
-                try {
-                    modelType = factoryDeclaration.loadClass(modelTypeName);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return modelType;
-        }
-
-    }
-
-    /**
-     * A wrapper around an implementation provider factory allowing lazy
-     * loading and initialization of implementation providers.
-     */
-    private class LazyImplementationProviderFactory implements ImplementationProviderFactory {
-
-        private ExtensionPointRegistry registry;
-        private String modelTypeName;
-        private ServiceDeclaration providerClass;
-        private ImplementationProviderFactory factory;
-        private Class modelType;
-
-        private LazyImplementationProviderFactory(ExtensionPointRegistry registry,
-                                                  String modelTypeName,
-                                                  ServiceDeclaration providerClass) {
-            this.registry = registry;
-            this.modelTypeName = modelTypeName;
-            this.providerClass = providerClass;
-        }
-
-        @SuppressWarnings("unchecked")
-        private ImplementationProviderFactory getFactory() {
-            if (factory == null) {
-                try {
-                    Class<ImplementationProviderFactory> factoryClass =
-                        (Class<ImplementationProviderFactory>)providerClass.loadClass();
-                    Constructor<ImplementationProviderFactory> constructor =
-                        factoryClass.getConstructor(ExtensionPointRegistry.class);
-                    factory = constructor.newInstance(registry);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return factory;
-        }
-
-        @SuppressWarnings("unchecked")
-        public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                                   Implementation Implementation) {
-            return getFactory().createImplementationProvider(component, Implementation);
-        }
-
-        public Class getModelType() {
-            if (modelType == null) {
-                try {
-
-                    modelType = providerClass.loadClass(modelTypeName);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return modelType;
-        }
-
-    }
-
-    /**
-     * A wrapper around an policy provider factory allowing lazy
-     * loading and initialization of policy providers.
-     */
-    private class LazyPolicyProviderFactory implements PolicyProviderFactory {
-        private ExtensionPointRegistry registry;
-        private String modelTypeName;
-        private ServiceDeclaration providerClass;
-        private PolicyProviderFactory factory;
-        private Class modelType;
-
-        private LazyPolicyProviderFactory(ExtensionPointRegistry registry,
-                                          String modelTypeName,
-                                          ServiceDeclaration providerClass) {
-            this.registry = registry;
-            this.modelTypeName = modelTypeName;
-            this.providerClass = providerClass;
-        }
-
-        @SuppressWarnings("unchecked")
-        private PolicyProviderFactory getFactory() {
-            if (factory == null) {
-                try {
-                    Class<PolicyProviderFactory> factoryClass = (Class<PolicyProviderFactory>)providerClass.loadClass();
-                    Constructor<PolicyProviderFactory> constructor =
-                        factoryClass.getConstructor(ExtensionPointRegistry.class);
-                    factory = constructor.newInstance(registry);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return factory;
-        }
-
-        public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component,
-                                                                 Implementation implementation) {
-            return getFactory().createImplementationPolicyProvider(component, implementation);
-        }
-
-        public PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                            RuntimeComponentReference reference,
-                                                            Binding binding) {
-            return getFactory().createReferencePolicyProvider(component, reference, binding);
-        }
-
-        public PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                                          RuntimeComponentService service,
-                                                          Binding binding) {
-            return getFactory().createServicePolicyProvider(component, service, binding);
-        }
-
-        public Class getModelType() {
-            if (modelType == null) {
-                try {
-                    modelType = providerClass.loadClass(modelTypeName);
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return modelType;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
deleted file mode 100644
index 068d0d12d7..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.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.provider;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Concrete Implementation for the SCADefinitionsProviderExtensionPoint
- *
- * @version $Rev$ $Date$
- */
-public class DefaultSCADefinitionsProviderExtensionPoint implements
-    SCADefinitionsProviderExtensionPoint {
-
-    private ExtensionPointRegistry extensionPointRegistry = null;
-    
-    private List<SCADefinitionsProvider> scaDefnsProviders = new ArrayList<SCADefinitionsProvider>();
-    
-    public DefaultSCADefinitionsProviderExtensionPoint(ExtensionPointRegistry extnPtReg) {
-        this.extensionPointRegistry = extnPtReg;
-    }
-
-    public void addSCADefinitionsProvider(SCADefinitionsProvider provider) {
-        scaDefnsProviders.add(provider);
-    }
-
-    public void removeSCADefinitionsProvider(SCADefinitionsProvider provider) {
-        scaDefnsProviders.remove(provider);
-    }
-
-    public List<SCADefinitionsProvider> getSCADefinitionsProviders() {
-        if (scaDefnsProviders.isEmpty()) {
-            loadProviders();
-        }
-        return scaDefnsProviders;
-    }
-
-    private void loadProviders() {
-        // Get the provider service declarations
-        Set<ServiceDeclaration> defnProviderDecls;
-        SCADefinitionsProvider aProvider = null;
-        Class providerClass = null;
-        Constructor constructor = null;
-
-        try {
-            defnProviderDecls =
-                ServiceDiscovery.getInstance().getServiceDeclarations(SCADefinitionsProvider.class);
-    
-            for (ServiceDeclaration aDefnProviderDecl : defnProviderDecls) {
-                providerClass = aDefnProviderDecl.loadClass();
-            
-                try {
-                    constructor = providerClass.getConstructor();
-                    aProvider = (SCADefinitionsProvider)constructor.newInstance();
-                } catch (NoSuchMethodException e1) {
-                        constructor = providerClass.getConstructor(ExtensionPointRegistry.class);
-                        aProvider = (SCADefinitionsProvider)constructor.newInstance(extensionPointRegistry);
-                } 
-                
-                scaDefnsProviders.add(aProvider);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
deleted file mode 100644
index 015c673d66..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.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.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * A component implementation can implement this interface in order to tie 
- * into the Tuscany runtime 
- * 
- * @version $Rev$ $Date$
- */
-public interface ImplementationProvider {
-
-    /**
-     * This method will be invoked when the component implementation
-     * is activated.
-     */
-    void start();
-
-    /**
-     * This method will be invoked when the component implementation
-     * is deactivated.
-     */
-    void stop();
-
-    /**
-     * Create an invoker for the component implementation in the invocation
-     * chain. The invoker will be responsible for calling the implementation
-     * logic for the given component.
-     * 
-     * @param service The component service
-     * @param operation The operation that the interceptor will handle
-     * @return An invoker that handles the invocation logic, null should be
-     *         returned if no invoker is required
-     */
-    Invoker createInvoker(RuntimeComponentService service, Operation operation);
-
-    /**
-     * For bindings that invoke one-way callback operations asynchronously,
-     * there is no need to perform a thread switch before calling the invoker.
-     * This method indicates whether the binding has this capability.
-     * 
-     * @return true if the callback invoker is able to invoke one-way operations
-     *         asynchronously, false if all invocations are synchronous
-     */
-    boolean supportsOneWayInvocation();
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
deleted file mode 100644
index 6a37d1e951..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.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.provider;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * An interface for factories that create implementation providers.  
- * 
- * @version $Rev$ $Date$
- */
-public interface ImplementationProviderFactory<M extends Implementation> extends ProviderFactory<M> {
-    
-    /**
-     * Creates a new implementation provider for the given
-     * component.
-     * 
-     * @param component The runtime component
-     * @param Implementation The implementation type
-     * @return The implementation provider
-     */
-    ImplementationProvider createImplementationProvider(RuntimeComponent component, M Implementation);
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
deleted file mode 100644
index f2b59a7c54..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.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.provider;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-/**
- * This interface can be optionally implemented by the Binding or Implementation providers to
- * indicate if they implement the policies in the binding/implementation provider.
- * 
- * @version $Rev$ $Date$
- */
-public interface PolicyImplementor {
-    /**
-     * Get a list of policy names that are implemented by this policy implementor
-     * @return A list of policy names
-     */
-    List<QName> getImplementedPolicies();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
deleted file mode 100644
index 644283dea1..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.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.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface PolicyProvider {
-    /**
-     * Create an interceptor for a given operation
-     * @param operation
-     * @return An interceptor that realize the policySet
-     */
-    Interceptor createInterceptor(Operation operation);
-
-    /**
-     * Get the phase that the interceptor should be added
-     * @return The phase that this interceptor belongs to
-     */
-    String getPhase();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
deleted file mode 100644
index b60a14d2da..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.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.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.policy.Policy;
-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 interface PolicyProviderFactory<M extends Policy> extends ProviderFactory<M> {
-    /**
-     * Create policy provider for a given reference binding
-     * @param component
-     * @param reference
-     * @param binding
-     * @return
-     */
-    PolicyProvider createReferencePolicyProvider(RuntimeComponent component,
-                                                 RuntimeComponentReference reference,
-                                                 Binding binding);
-
-    /**
-     * Create policy provider for a given service binding
-     * @param component
-     * @param service
-     * @param binding
-     * @return
-     */
-    PolicyProvider createServicePolicyProvider(RuntimeComponent component,
-                                               RuntimeComponentService service,
-                                               Binding binding);
-
-    /**
-     * Create policy provider for a given component implementation
-     * @param component
-     * @param implementation
-     * @return
-     */
-    PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
deleted file mode 100644
index 2102806881..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.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.provider;
-
-/**
- * A factory for runtime providers.
- *
- * @version $Rev$ $Date$
- */
-public interface ProviderFactory<M> {
-
-    /**
-     * The model type that this factory creates providers for.
-     * 
-     * @return the model type
-     */
-    Class<M> getModelType();
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
deleted file mode 100644
index d8f9973338..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.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.provider;
-
-import java.util.List;
-
-
-/**
- * An extension point for provider factories. Holds all of the provider
- * factories from loaded extension points. Allows a provider factory
- * to be located based on a given model type. Hence the runtime can 
- * generate runtime artifacts from the in memory assembly model. 
- *
- * @version $Rev$ $Date$
- */
-public interface ProviderFactoryExtensionPoint {
-
-
-    /**
-     * Add a provider factory.
-     * 
-     * @param providerFactory The provider factory
-     */
-    void addProviderFactory(ProviderFactory providerFactory);
-
-    /**
-     * Remove a provider factory.
-     * 
-     * @param providerFactory The provider factory
-     */
-    void removeProviderFactory(ProviderFactory providerFactory);
-
-    /**
-     * Returns the provider factory associated with the given model type.
-     * @param modelType A model type
-     * @return The provider factory associated with the given model type
-     */
-    ProviderFactory getProviderFactory(Class<?> modelType);
-    
-    /**
-     * Get a list of registered PolicyProviderFactory
-     * @return a list of registered PolicyProviderFactory
-     */
-    List<PolicyProviderFactory> getPolicyProviderFactories();
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
deleted file mode 100644
index b3ab1d8b87..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.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.provider;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-
-/**
- * A reference binding implementation can options implement this
- * interface to tie into the Tuscany SCA runtime
- * 
- * @version $Rev$ $Date$
- */
-public interface ReferenceBindingProvider {
-
-    /**
-     * This method will be invoked when the component reference binding is
-     * activated.
-     */
-    void start();
-
-    /**
-     * This method will be invoked when the component reference binding is
-     * deactivated.
-     */
-    void stop();
-
-    /**
-     * Create an invoker for the reference binding in the invocation chain. The
-     * invoker is responsible for making the outbound invocation over the
-     * binding protocol.
-     * 
-     * @param operation The operation that the interceptor will handle
-     * @return An invoker that handles the invocation logic, null should be
-     *         returned if no invoker is required
-     */
-    Invoker createInvoker(Operation operation);
-
-    /**
-     * Get the effective interface contract imposed by the binding. For example,
-     * it will be interface contract introspected from the WSDL portType used by
-     * the endpoint for a WebService binding.
-     * 
-     * @return The effective interface contract, if null is returned, the
-     *         interface contract for the component reference will be used
-     */
-    InterfaceContract getBindingInterfaceContract();
-
-    /**
-     * For bindings that invoke one-way operations asynchronously, there is no
-     * need to perform a thread switch before calling the invoker. This method
-     * indicates whether the binding has this capability.
-     * 
-     * @return true if the binding invoker is able to invoke one-way operations
-     *         asynchronously, false if all invocations are synchronous
-     */
-    boolean supportsOneWayInvocation();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
deleted file mode 100644
index bd0f4d4b75..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.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.provider;
-
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-
-/**
- * Models a provider of SCA Definitions.  Typically SCA Definitions providers 
- * may either load a definitions.xml file or create the SCA Definitions model
- * programmatically.
- *
- * @version $Rev$ $Date$
- */
-public interface SCADefinitionsProvider {
-    SCADefinitions getSCADefinition() throws SCADefinitionsProviderException ;
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
deleted file mode 100644
index b05130d6c8..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.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.provider;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SCADefinitionsProviderException extends Exception {
-   
-    public SCADefinitionsProviderException(Throwable e) {
-        super(e);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
deleted file mode 100644
index a5d60cc6eb..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.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.provider;
-
-import java.util.List;
-
-/**
- * An extension point for SCA Definitions Providers.  SCA Definition providers, load SCA Definitions
- * items that are being specifically contributed by the module that hosts the provider in question.
- *
- * @version $Rev$ $Date$
- */
-public interface SCADefinitionsProviderExtensionPoint {
-    
-    void addSCADefinitionsProvider(SCADefinitionsProvider provider);
-    void removeSCADefinitionsProvider(SCADefinitionsProvider provider);
-    List<SCADefinitionsProvider> getSCADefinitionsProviders();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
deleted file mode 100644
index e15234a549..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.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.provider;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * A service binding can optionally implement this interface to tie
- * into the Tuscany SCA runtime
- * 
- * @version $Rev$ $Date$
- */
-public interface ServiceBindingProvider {
-    /**
-     * This method will be invoked when the component service binding is
-     * activated.
-     */
-    void start();
-
-    /**
-     * This method will be invoked when the component service binding is
-     * deactivated.
-     */
-    void stop();
-
-    /**
-     * Get the effective interface contract imposed by the binding. For example,
-     * it will be interface contract introspected from the WSDL portType used by
-     * the endpoint for a WebService binding.
-     * 
-     * @return The effective interface contract, if null is returned, the
-     *         interface contract for the component service will be used
-     */
-    InterfaceContract getBindingInterfaceContract();
-
-    /**
-     * For bindings that invoke one-way callback operations asynchronously,
-     * there is no need to perform a thread switch before calling the invoker.
-     * This method indicates whether the binding has this capability.
-     * 
-     * @return true if the callback invoker is able to invoke one-way operations
-     *         asynchronously, false if all invocations are synchronous
-     */
-    boolean supportsOneWayInvocation();
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
deleted file mode 100644
index 851afee3c1..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.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.runtime;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * The default implementation of a <code>WireProcessorExtensionPoint</code>
- *
- * @version $Rev$ $Date$
- */
-public class DefaultWireProcessorExtensionPoint implements RuntimeWireProcessorExtensionPoint {
-
-	/**
-	 * The list of WireProcessors available to the runtime
-	 */
-    private final List<RuntimeWireProcessor> processors = new ArrayList<RuntimeWireProcessor>();
-
-    /**
-    * Registers a wire-processor in the runtime
-    * 
-    * @param processor The processor to register
-    */
-    public void addWireProcessor(RuntimeWireProcessor processor) {
-        processors.add(processor);
-    }
-
-    /**
-     * De-registers a wire-processor in the runtime
-     * 
-     * @param processor The processor to de-register
-     */
-    public void removeWireProcessor(RuntimeWireProcessor processor) {
-        processors.remove(processor);
-    }
-    
-    /**
-     * Returns a list of registered wire-processors.
-     * 
-     * @return The list of wire processors
-     */    
-    public List<RuntimeWireProcessor> getWireProcessors() {
-        return processors;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
deleted file mode 100644
index b6fafa5fb6..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.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.runtime;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * The endpoint reference for a component service or reference
- * 
- * @version $Rev$ $Date$
- */
-public interface EndpointReference extends Cloneable {
-    /**
-     * Get the component for the endpoint
-     * @return The component, null of the EPR is for a non-SCA service
-     */
-    RuntimeComponent getComponent();
-
-    /**
-     * Get the component service or reference for the endpoint
-     * @return The component service or reference, null if the EPR is for a non-SCA service
-     */
-    Contract getContract();
-
-    /**
-     * Get the binding for the endpoint
-     * @return The binding
-     */
-    Binding getBinding();
-
-    /**
-     * Get the interface contract for the endpoint
-     * @return The interface contract
-     */
-    InterfaceContract getInterfaceContract();
-    
-    /**
-     * Update the interface contract for the endpoint
-     * @param interfaceContract The updated interface contract
-     */
-    void setInterfaceContract(InterfaceContract interfaceContract);
-
-    /**
-     * Get the URI for this endpoint
-     * @return The URI of the endpoint
-     */
-    String getURI();
-
-    /**
-     * Set the URI for this endpoint
-     * @param uri The new URI of the endpoint
-     */
-    void setURI(String uri);
-
-    /**
-     * Get the callback endpoint for this endpoint
-     * @return The callback endpoint for this endpoint
-     */
-    EndpointReference getCallbackEndpoint();
-
-    /**
-     * Set the callback endpoint for this endpoint
-     * @param callbackEndpoint The new callback endpoint for this endpoint
-     */
-    void setCallbackEndpoint(EndpointReference callbackEndpoint);
-
-    Object clone() throws CloneNotSupportedException;   
-    
-    void setReferenceParameters(ReferenceParameters parameters);
-    ReferenceParameters getReferenceParameters();
-
-    void mergeEndpoint(EndpointReference epr);
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
deleted file mode 100644
index 0e19538aff..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.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.runtime;
-
-/**
- * Parameters for the EndPointReference
- * 
- * @version $Rev$ $Date$
- */
-public interface ReferenceParameters extends Cloneable {
-    /**
-     * Get the callback ID
-     * @return the callbackID
-     */
-    Object getCallbackID();
-
-    /**
-     * Set the callback ID
-     * @param callbackID the callbackID to set
-     */
-    void setCallbackID(Object callbackID);
-
-    /**
-     * Get the conversation ID
-     * @return the conversationID
-     */
-    Object getConversationID();
-
-    /**
-     * Set the conversation ID
-     * @param conversationID the conversationID to set
-     */
-    void setConversationID(Object conversationID);
-
-    /**
-     * Get the ID for the non-ServiceReference callback object
-     * @return
-     */
-    Object getCallbackObjectID();
-
-    /**
-     * Set the ID for the non-ServiceReference callback object
-     * @param callbackObjectID
-     */
-    void setCallbackObjectID(Object callbackObjectID);
-
-    EndpointReference getCallbackReference();
-
-    void setCallbackReference(EndpointReference callback);
-
-    Object clone() throws CloneNotSupportedException;
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
deleted file mode 100644
index 30bba78a40..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.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.runtime;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-
-/**
- * The runtime component interface. Provides the bridge between the
- * assembly model representation of a component and its runtime 
- * realization.
- * 
- * @version $Rev$ $Date$
- */
-public interface RuntimeComponent extends Component {
-    /**
-     * Set the implementation-specific configuration for this component
-     * @param implementationProvider The object that manages the component implementation
-     */
-    void setImplementationProvider(ImplementationProvider implementationProvider);
-
-    /**
-     * Get the implementation-specific configuration for this component
-     * @return The implementation provider for this component
-     */
-    ImplementationProvider getImplementationProvider();
-
-    /**
-     * Get the associated component context
-     * @return
-     */
-    RuntimeComponentContext getComponentContext();
-
-    /**
-     * Set the associated component context
-     * @param context
-     */
-    void setComponentContext(RuntimeComponentContext context);
-
-    /**
-     * Tests if the RuntimeComponent is started
-     * @return true if the RuntimeComponent is started otherwise false
-     */
-    boolean isStarted();
-
-    /**
-     * Sets the RuntimeComponent started state
-     * @param started the state to set
-     */
-    void setStarted(boolean started);
-    
-    /**
-     * Add a policy provider to the component
-     * @param policyProvider
-     */
-    void addPolicyProvider(PolicyProvider policyProvider);
-    
-    /**
-     * Get a list of policy providers configured for this component
-     * @return
-     */
-    List<PolicyProvider> getPolicyProviders();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
deleted file mode 100644
index 801bb9e294..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.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.runtime;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface RuntimeComponentContext extends ComponentContext {
-    /**
-     * Activate the reference (creating runtime wires)
-     * @param reference
-     */
-    void start(RuntimeComponentReference reference);
-
-    /**
-     * Deserialize the component reference
-     * @param reader
-     * @return A component that contains the reference
-     * @throws IOException
-     */
-    RuntimeComponent read(Reader reader) throws IOException;
-
-    /**
-     * Serialize the component reference
-     * @param reference
-     * @param writer
-     * @throws IOException
-     */
-    void write(RuntimeComponentReference reference, Writer writer) throws IOException;
-
-    /**
-     * Get the CallableReference for a given component reference
-     * @param <B>
-     * @param businessInterface The business interface
-     * @param reference The reference to be wired
-     * @param binding The binding to be used, if it's null, either binding.sca or the 1st binding
-     * will be selected
-     * @return A service reference representing the wire
-     */
-    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
-                                                RuntimeComponentReference reference,
-                                                Binding binding);
-
-    /**
-     * Bind the reference to a target component/componentService
-     * @param <B>
-     * @param businessInterface The business interface
-     * @param reference The reference to be wired
-     * @param component The target component
-     * @param service The target component service
-     * @return A service reference representing the wire
-     */
-    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
-                                                RuntimeComponentReference reference,
-                                                RuntimeComponent component,
-                                                RuntimeComponentService service);
-
-    /**
-     * Create a CallableReference for the given component service
-     * @param <B>
-     * @param businessInterface
-     * @param component
-     * @param service
-     * @return
-     */
-    <B> CallableReference<B> getCallableReference(Class<B> businessInterface,
-                                                  RuntimeComponent component,
-                                                  RuntimeComponentService service);
-
-    /**
-     * @param <B>
-     * @param businessInterface
-     * @param service
-     * @return
-     */
-    <B> ServiceReference<B> createSelfReference(Class<B> businessInterface, ComponentService service);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
deleted file mode 100644
index 44ae7f552a..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.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.runtime;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-
-/**
- * The runtime component reference. Provides the bridge between the 
- * assembly model representation of a component reference and its runtime 
- * realization
- * 
- * @version $Rev$ $Date$
- */
-public interface RuntimeComponentReference extends ComponentReference {
-
-    /**
-     * Get a list of runtime wires to the reference
-     * 
-     * @return The list of wires
-     */
-    List<RuntimeWire> getRuntimeWires();
-    
-    /**
-     * Get the runtime wire for the given binding
-     * @param binding The assembly model binding 
-     * @return The runtime wire
-     */
-    RuntimeWire getRuntimeWire(Binding binding);
-
-    /**
-     * Returns the reference binding provider associated with this
-     * component reference and the given binding.
-     * 
-     * @param binding The assembly model binding 
-     * @return The runtime reference binding provider
-     */
-    ReferenceBindingProvider getBindingProvider(Binding binding);
-    
-    /**
-     * Sets the reference binding provider associated with this
-     * component reference and the given binding.
-     * 
-     * @param binding The assembly model binding 
-     * @param bindingProvider The runtime reference binding provider
-     */
-    void setBindingProvider(Binding binding, ReferenceBindingProvider bindingProvider);
-    
-    /**
-     * Returns the endpoint resolver associated with this
-     * component reference and the given endpoint.
-     * 
-     * @param endpont The assembly model endpoint 
-     * @return The enpoint resolver
-     */
-    EndpointResolver getEndpointResolver(Endpoint endpoint);
-    
-    /**
-     * Sets the endpoint resolver associated with this
-     * component reference and the given endpoint.
-     * 
-     * @param binding The assembly model binding 
-     * @param bindingProvider The runtime reference binding provider
-     */
-    void setEndpointResolver(Endpoint endpoint, EndpointResolver endpointResolver);    
-    
-    /**
-     * Add a policy provider for the given binding to the reference
-     * @param binding The assembly model binding
-     * @param policyProvider The policy handler
-     */
-    void addPolicyProvider(Binding binding, PolicyProvider policyProvider);
-    
-    /**
-     * Get a list of policy providers for the given binding
-     * @param binding The assembly model binding
-     * @return A list of policy providers for the given binding
-     */
-    List<PolicyProvider> getPolicyProviders(Binding binding);    
-    
-    /**
-     * Get the invoker for the given binding and operation
-     * @param binding The assembly model binding
-     * @param operation The assembly model operation
-     * @return The runtime Invoker
-     */
-    Invoker getInvoker(Binding binding, Operation operation); 
-    
-    /**
-     * Set the owning component
-     * @param component
-     */
-    void setComponent(RuntimeComponent component);
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
deleted file mode 100644
index 982724d798..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.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.runtime;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentService;
-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.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-
-/**
- * The runtime component service. Provides the bridge between the 
- * assembly model representation of a component service and its runtime 
- * realization
- * 
- * @version $Rev$ $Date$
- */
-public interface RuntimeComponentService extends ComponentService {
-
-    /**
-     * Get a list of runtime wires to the service
-     * 
-     * @return The list of wires
-     */
-    List<RuntimeWire> getRuntimeWires();
-    /**
-     * Get the runtime wire for the given binding
-     * @param binding The assembly model binding 
-     * @return The runtime wire
-     */
-    RuntimeWire getRuntimeWire(Binding binding);
-    
-    /**
-     * Get the callback wires associated with this service
-     * 
-     * @return The list of runtime callback wires
-     */
-    List<RuntimeWire> getCallbackWires();
-
-    /**
-     * Returns the service binding provider associated with this
-     * component service and the given binding.
-     * 
-     * @param binding The assembly model binding 
-     * @return The runtime service binding provider
-     */
-    ServiceBindingProvider getBindingProvider(Binding binding);
-    
-    /**
-     * Returns the service binding provider associated with this
-     * component service and the given binding.
-     * 
-     * @param binding
-     * @param interfaceContract
-     * @return
-     */
-    RuntimeWire getRuntimeWire(Binding binding, InterfaceContract interfaceContract);
-    
-    /**
-     * Sets the service binding provider associated with this
-     * component service and the given binding.
-     *
-     * @param binding The assembly model binding 
-     * @param bindingProvider The runtime service binding provider
-     */
-    void setBindingProvider(Binding binding, ServiceBindingProvider bindingProvider);
-    
-    /**
-     * Get the invoker for the given binding and operation
-     * @param binding The assembly model binding 
-     * @param operation The assembly model operation
-     * @return The runtime invoker
-     */
-    Invoker getInvoker(Binding binding, Operation operation);    
-
-    /**
-     * Get the invoker for the given binding and operation
-     * @param binding The assembly model binding 
-     * @param interfaceContract the client interface contract
-     * @param operation The assembly model operation
-     * @return The runtime invoker
-     */
-    Invoker getInvoker(Binding binding, InterfaceContract interfaceContract, Operation operation);    
-    
-    /**
-     * Get the invocation chain for the given binding and operation
-     * @param binding The assembly model binding 
-     * @param operation The assembly model operation
-     * @return The runtime invocation chain
-     */
-    InvocationChain getInvocationChain(Binding binding, Operation operation);  
-    
-    /**
-     * Get the invocation chain for the given binding and operation
-     * @param binding The assembly model binding 
-     * @param operation The assembly model operation
-     * @param interfaceContract the client interface contract
-     * @return The runtime invocation chain
-     */
-    InvocationChain getInvocationChain(Binding binding, InterfaceContract interfaceContract, Operation operation);
-    
-    /**
-     * Add a policy provider for the given binding to the service
-     * @param binding The assembly model binding
-     * @param policyProvider The policy handler
-     */
-    void addPolicyProvider(Binding binding, PolicyProvider policyProvider);
-    
-    /**
-     * Get a list of policy providers for the given binding
-     * @param binding The assembly model binding
-     * @return A list of policy providers for the given binding
-     */
-    List<PolicyProvider> getPolicyProviders(Binding binding);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
deleted file mode 100644
index da37385af1..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.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 org.apache.tuscany.sca.runtime;
-
-import java.lang.reflect.InvocationTargetException;
-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;
-
-/**
- * The runtime wire interface that connects a component reference to a 
- *  component service (or an external service) over the selected binding
- * 
- * @version $Rev$ $Date$
- */
-public interface RuntimeWire extends Cloneable {
-
-    /**
-     * Get the source of the wire
-     * 
-     * @return The end point reference of the source
-     */
-    EndpointReference getSource();
-
-    /**
-     * Get the target of the wire
-     * 
-     * @return The end point reference of the target
-     */
-    EndpointReference getTarget();
-
-    /**
-     * Rebind the runtime wire with the given target
-     * @param target The target endpoint reference
-     */
-    void setTarget(EndpointReference target);
-    
-    /**
-     * Force the invocation chains to be rebuilt
-     */
-    void rebuild();
-
-    /**
-     * Returns the invocation chains for service operations associated with the
-     * wire
-     * 
-     * @return the invocation chains for service operations associated with the
-     *         wire
-     */
-    List<InvocationChain> getInvocationChains();
-    
-    /**
-     * Lookup the invocation chain by operation
-     * @param operation The operation
-     * @return The invocation chain for the given operation
-     */
-    InvocationChain getInvocationChain(Operation operation);
-    
-    /**
-     * Invoke an operation with given arguments
-     * @param operation The operation
-     * @param args The arguments
-     * @return The result
-     * @throws InvocationTargetException
-     */
-    Object invoke(Operation operation, Object[] args) throws InvocationTargetException;
-
-    /**
-     * Invoke an operation with a context message
-     * @param operation The operation
-     * @param msg The message
-     * @return The result
-     * @throws InvocationTargetException
-     */
-    Object invoke(Operation operation, Message msg) throws InvocationTargetException;
-
-    /**
-     * @return a clone of the runtime wire
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
deleted file mode 100644
index fbb7aae467..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.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.runtime;
-
-/**
- * Implementations are called after wires are decorated with policy and before they are connected.
- *
- * @version $Rev$ $Date$
- */
-public interface RuntimeWireProcessor {
-
-    /**
-     * Process the runtime wire to add interceptors
-     * 
-     * @param wire
-     */
-    void process(RuntimeWire wire);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
deleted file mode 100644
index 4b2c71b397..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.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.runtime;
-
-import java.util.List;
-
-/**
- * Acts as a delegating <code>WireProcessorExtensionPoint</code>, delegating
- * processing of wires after policies have been applied and source and targets
- * have been connected.
- * 
- * @version $Rev$ $Date$
- */
-public interface RuntimeWireProcessorExtensionPoint {
-
-    /**
-     * Registers a wire-processor in the runtime
-     * 
-     * @param processor The processor to register
-     */
-    void addWireProcessor(RuntimeWireProcessor processor);
-
-    /**
-     * De-registers a wire-processor in the runtime
-     * 
-     * @param processor The processor to de-register
-     */
-    void removeWireProcessor(RuntimeWireProcessor processor);
-
-    /**
-     * Returns a list of registered wire-processors.
-     * 
-     * @return The list of wire processors
-     */
-    List<RuntimeWireProcessor> getWireProcessors();
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
deleted file mode 100644
index 7d5cd6c54b..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.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.store;
-
-/**
- * thrown when a record already exists during an insert operation
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateRecordException extends StoreWriteException {
-    private static final long serialVersionUID = 3116253222569378447L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public DuplicateRecordException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public DuplicateRecordException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public DuplicateRecordException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public DuplicateRecordException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
deleted file mode 100644
index 9d965a3369..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.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.store;
-
-import java.util.UUID;
-
-/**
- * Implementations receive callback events during a store recovery operation
- *
- * @version $Rev$ $Date$
- */
-public interface RecoveryListener {
-
-    /**
-     * Signals the start of a recovery
-     */
-    void onBegin();
-
-    /**
-     * Received when a record is recovered
-     *
-     * @param id
-     */
-    void onRecord(UUID id);
-
-    /**
-     * Signals the end of recovery
-     */
-    void onEnd();
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
deleted file mode 100644
index b15cde066a..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.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.store;
-
-import org.apache.tuscany.sca.event.EventPublisher;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Implementations provide a persistent store for runtime data such as conversational state. A persistent store could be
- * implemented in a durable fashion using JDBC or a journaling system, or using a non-durable mechanism such as an
- * in-memory map.
- *
- * @version $Rev$ $Date$
- */
-public interface Store extends EventPublisher {
-
-    /* Used to indicate an the default expiration offset for records for the store */
-    long DEFAULT_EXPIRATION_OFFSET = -1;
-
-    /* Used to indicate an entry should not expire */
-    long NEVER = -2;
-
-    /**
-     * Adds the given record to the store. Implementations may choose different strategies for writing data such as
-     * write-through or write-behind.
-     *
-     * @param owner      the instance owner
-     * @param id         the unique id of the record
-     * @param object     the object representing the data to write
-     * @param expiration the time in milliseconds when the entry expires
-     * @throws StoreWriteException if an error occurs during the write operation
-     */
-    void insertRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException;
-
-    /**
-     * Updates a given record in the store, overwriting previous information.
-     *
-     * @param owner      the instance owner
-     * @param id         the unique id of the record
-     * @param object     the object representing the data to write
-     * @param expiration the time in milliseconds when the entry expires
-     * @throws StoreWriteException
-     */
-    void updateRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException;
-
-    /**
-     * Returns the deserialized object in the store corresponding to the given id
-     *
-     * @param owner the instance owner
-     * @param id    the unique id of the record
-     * @return the deserialized object or null if one is not found
-     * @throws StoreReadException
-     */
-    Object readRecord(RuntimeComponent owner, String id) throws StoreReadException;
-
-    /**
-     * Removes a record from the store
-     *
-     * @param owner the instance owner
-     * @param id    the unique id of the record
-     * @throws StoreWriteException
-     */
-    void removeRecord(RuntimeComponent owner, String id) throws StoreWriteException;
-
-    /**
-     * Removes all records from the store
-     *
-     * @throws StoreWriteException
-     */
-    void removeRecords() throws StoreWriteException;
-
-    /**
-     * Initiates a recovery operation, for example during restart after a crash
-     *
-     * @param listener the listener to receive recovery callback events
-     * @throws StoreReadException
-     */
-    void recover(RecoveryListener listener) throws StoreReadException;
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
deleted file mode 100644
index 24eaddd3e0..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.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.store;
-
-
-/**
- * Represents a generic exception thrown by a <code>Store</code>
- *
- * @version $Rev$ $Date$
- */
-public class StoreException extends Exception {
-    private static final long serialVersionUID = -319152147419962709L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
deleted file mode 100644
index 5c1a3ca79d..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.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.store;
-
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Fired when a store implementation expires a resource
- *
- * @version $Rev$ $Date$
- */
-public class StoreExpirationEvent implements Event {
-    private Object source;
-    private RuntimeComponent owner;
-    private Object instance;
-
-    /**
-     * Constructor.
-     *
-     * @param source   the source of the event
-     * @param owner    the owner of the expiring object
-     * @param instance the expiring object
-     */
-    public StoreExpirationEvent(Object source, RuntimeComponent owner, Object instance) {
-        assert source != null;
-        assert owner != null;
-        assert instance != null;
-        this.source = source;
-        this.owner = owner;
-        this.instance = instance;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-
-    /**
-     * Returns the owner of the expiring object.
-     *
-     * @return the owner of the expiring object.
-     */
-    public RuntimeComponent getOwner() {
-        return owner;
-    }
-
-    /**
-     * Returns the expiring object.
-     *
-     * @return the expiring object.
-     */
-    public Object getInstance() {
-        return instance;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
deleted file mode 100644
index 4bc7facf39..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.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.store;
-
-
-/**
- * A generic monitor interface for services to log events
- * 
- * @version $Rev$ $Date$
- */
-public interface StoreMonitor {
-
-    /**
-     * Signals the service has started
-     * 
-     * @param msg
-     */
-    void start(String msg);
-
-    /**
-     * Signals the service has been shutdown
-     * 
-     * @param msg
-     */
-    void stop(String msg);
-
-    /**
-     * Fired when recovery is started
-     */
-
-    void beginRecover();
-
-    /**
-     * Fired when recovery is completed
-     */
-
-    void endRecover();
-
-    /**
-     * Fired when a record is processed during recovery
-     * 
-     * @param recordId the id of the record being recovered
-     */
-
-    void recover(Object recordId);
-
-    /**
-     * Signals an error event
-     * 
-     * @param e the error
-     */
-
-    void error(Throwable e);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
deleted file mode 100644
index c2346bddca..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.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.store;
-
-/**
- * Thrown when an error occurs reading from persistent storage
- *
- * @version $Rev$ $Date$
- */
-public class StoreReadException extends StoreException {
-    private static final long serialVersionUID = -8624542082121467271L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreReadException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreReadException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreReadException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreReadException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
deleted file mode 100644
index b37519b31c..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.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.store;
-
-/**
- * Thrown when an error occurs writing to persistent storage
- *
- * @version $Rev$ $Date$
- */
-public class StoreWriteException extends StoreException {
-    private static final long serialVersionUID = 5539070473942048555L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreWriteException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreWriteException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreWriteException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public StoreWriteException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
deleted file mode 100644
index d32af450ff..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.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.work;
-
-/**
- * A callback interface that can be optionally used for registering 
- * interest in status of asynchronously scheduled unit of work.
- *
- * @version $Rev$ $Date$
- */
-public interface NotificationListener<T extends Runnable> {
-    
-    /**
-     * Callback method when the unit of work is accepted.
-     * 
-     * @param work Work that was accepted.
-     */
-    void workAccepted(T work);
-    
-    /**
-     * Callback method when the unit of work is successfully completed.
-     * 
-     * @param work Work that was successfully completed.
-     */
-    void workCompleted(T work);
-    
-    /**
-     * Callback when the unit of work is started.
-     * 
-     * @param work Unit of work that was started.
-     */
-    void workStarted(T work);
-    
-    /**
-     * Callback when the unit of work is rejected.
-     * 
-     * @param work Unit of work that was rejected.
-     */
-    void workRejected(T work);
-    
-    /**
-     * Callback when the unit of work fails to complete.
-     * 
-     * @param work Unit of work that failed to complete.
-     * @param error Error that caused the unit of work to fail.
-     */
-    void workFailed(T work, Throwable error);
-    
-    
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
deleted file mode 100644
index b1beac78e2..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.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.work;
-
-/**
- * Defines the contract for scheduling asynchronous units of work.
- * 
- * <p>
- * Units of work can be scheduled with an optional <code>NotificationListener</code>.
- * If a notification listener is specified, the caller will be notified regarding the 
- * status of the work. The unit of work can either be completed, rejected or completed 
- * with an error. If the work completed with an error, the caller is notified with the 
- * error details.
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public interface WorkScheduler {
-    
-    /**
-     * Schedules a unit of work for future execution. The notification listener 
-     * is used to register interest in callbacks regarding the status of the work.
-     * 
-     * @param work The unit of work that needs to be asynchronously executed.
-     * @param listener Notification listener for callbacks.
-     */
-    <T extends Runnable>void scheduleWork(T work, NotificationListener<T> listener);
-    
-    /**
-     * Schedules a unit of work for future execution. The notification listener 
-     * is used to register interest in callbacks regarding the status of the work.
-     * 
-     * @param work The unit of work that needs to be asynchronously executed.
-     */
-    <T extends Runnable>void scheduleWork(T work);
-
-    /**
-     * Destroys the work scheduler
-     */
-    void destroy();
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
deleted file mode 100644
index 18ec2dfeaa..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.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.work;
-
-
-/**
- * Exception thrown by the work scheduler in case of unexpected exceptions.
- *
- * @version $Rev$ $Date$
- *
- * @version $Rev$ $Date$
- */
-public class WorkSchedulerException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * {@inheritDoc}
-     */
-    public WorkSchedulerException() {
-        super();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public WorkSchedulerException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public WorkSchedulerException(String message) {
-        super(message);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public WorkSchedulerException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
deleted file mode 100644
index ddd91bceac..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ /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.context.DefaultContextFactoryExtensionPoint
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
deleted file mode 100644
index 91839e998f..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ /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.endpointresolver.DefaultEndpointResolverFactoryExtensionPoint
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
deleted file mode 100644
index e9de1f135f..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ /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.provider.DefaultProviderFactoryExtensionPoint
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
deleted file mode 100644
index 2f700671ca..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ /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.provider.DefaultSCADefinitionsProviderExtensionPoint

-										
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
deleted file mode 100644
index 95591dca5d..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ /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.runtime.DefaultWireProcessorExtensionPoint
diff --git a/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
deleted file mode 100644
index 3a27569a3b..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.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.context;
-
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * This test case will test the class
- * org.apache.tuscany.sca.context.DefaultContextFactoryExtensionPoint
- *
- * $Date$ $Rev$
- */
-public class DefaultContextFactoryExtensionPointTestCase {
-
-    /**
-     * Tests adding/getting/removing a factory with no interfaces
-     */
-    @Test
-    public void testFactoryWithNoInterfaces() {
-        Object factory = new FactoryWithNoInterfaces();
-        Class<?>[] ifaces = {};
-        addGetRemoveFactory(factory, ifaces);
-    }
-
-    /**
-     * Tests adding/getting/removing a factory with one interface
-     */
-    @Test
-    public void testFactoryWithOneInterface() {
-        Object factory = new FactoryWithOneInterface();
-        Class<?>[] ifaces = { FactoryOneInterface.class };
-        addGetRemoveFactory(factory, ifaces);
-    }
-
-    /**
-     * Tests adding/getting/removing a factory with two interfaces
-     */
-    @Test
-    public void testFactoryWithTwoInterfaces() {
-        Object factory = new FactoryWithTwoInterfaces();
-        Class<?>[] ifaces = { FactoryTwoInterfacesA.class, FactoryTwoInterfacesB.class };
-        addGetRemoveFactory(factory, ifaces);
-    }
-
-    /**
-     * Tests having multiple factories registered
-     */
-    @Test
-    public void testMultipleFactories() {
-        // Create new factories
-        FactoryWithOneInterface factory1 = new FactoryWithOneInterface();
-        FactoryWithTwoInterfaces factory2 = new FactoryWithTwoInterfaces();
-
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-
-        // Register the factories
-        DefaultContextFactoryExtensionPoint ctxFactory = new DefaultContextFactoryExtensionPoint(registry);
-        ctxFactory.addFactory(factory1);
-        ctxFactory.addFactory(factory2);
-
-        // Re-get each of the factories
-        FactoryOneInterface regotFactory1 = ctxFactory.getFactory(FactoryOneInterface.class);
-        Assert.assertNotNull(regotFactory1);
-        Assert.assertSame(factory1, regotFactory1);
-        FactoryTwoInterfacesA regotFactory2A = ctxFactory.getFactory(FactoryTwoInterfacesA.class);
-        Assert.assertNotNull(regotFactory2A);
-        Assert.assertSame(factory2, regotFactory2A);
-        FactoryTwoInterfacesB regotFactory2B = ctxFactory.getFactory(FactoryTwoInterfacesB.class);
-        Assert.assertNotNull(regotFactory1);
-        Assert.assertSame(factory2, regotFactory2B);
-    }
-
-    /**
-     * Tests passing in null to addFactory()
-     */
-    @Test
-    public void testAddingNullFactory() {
-
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-        DefaultContextFactoryExtensionPoint ctxFactory = new DefaultContextFactoryExtensionPoint(registry);
-        try {
-            ctxFactory.addFactory(null);
-            Assert.fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // As expected
-        }
-    }
-
-    /**
-     * Test passing in null to removeFactory()
-     */
-    @Test
-    public void testRemovingNullFactory() {
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-        DefaultContextFactoryExtensionPoint ctxFactory = new DefaultContextFactoryExtensionPoint(registry);
-        try {
-            ctxFactory.removeFactory(null);
-            Assert.fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // As expected
-        }
-    }
-
-    /**
-     * Test passing in null to getFactory()
-     */
-    @Test
-    public void testGetNullFactory() {
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-        DefaultContextFactoryExtensionPoint ctxFactory = new DefaultContextFactoryExtensionPoint(registry);
-        try {
-            ctxFactory.getFactory(null);
-            Assert.fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // As expected
-        }
-    }
-
-    /**
-     * Utility method for testing adding and removing a factory
-     *
-     * @param factory The factory class to test
-     * @param factoryInterfaces The list of interfaces implemented by the factory
-     */
-    private void addGetRemoveFactory(Object factory, Class<?>[] factoryInterfaces) {
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-        DefaultContextFactoryExtensionPoint ctxFactory = new DefaultContextFactoryExtensionPoint(registry);
-
-        // Make sure factory not already present
-        for (Class<?> iface : factoryInterfaces) {
-            Assert.assertNull(ctxFactory.getFactory(iface));
-        }
-
-        // Add the factory
-        ctxFactory.addFactory(factory);
-
-        // Make sure we can get the factory recently registered factory
-        for (Class<?> iface : factoryInterfaces) {
-            Object regot = ctxFactory.getFactory(iface);
-            Assert.assertNotNull(regot);
-            Assert.assertSame(factory, regot);
-        }
-
-        // Remove the factory
-        ctxFactory.removeFactory(factory);
-
-        // Make sure factory is no longer registered
-        for (Class<?> iface : factoryInterfaces) {
-            Assert.assertNull(ctxFactory.getFactory(iface));
-        }
-    }
-
-    /**
-     * Simple factory with no interfaces
-     */
-    private class FactoryWithNoInterfaces {
-    }
-
-    /**
-     * Simple interface for the factory with one interface
-     */
-    private interface FactoryOneInterface {
-    }
-
-    /**
-     * Simple factory with one interface
-     */
-    private class FactoryWithOneInterface implements FactoryOneInterface {
-    }
-
-    /**
-     * Simple interface for the factory with two interfaces
-     */
-    private interface FactoryTwoInterfacesA {
-    }
-
-    /**
-     * Simple interface for the factory with two interfaces
-     */
-    private interface FactoryTwoInterfacesB {
-    }
-
-    /**
-     * Simple factory with two interfaces
-     */
-    private class FactoryWithTwoInterfaces implements FactoryTwoInterfacesA, FactoryTwoInterfacesB {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java b/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
deleted file mode 100644
index 2425133273..0000000000
--- a/tags/java/sca/1.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.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.event;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test case for TrueFilter
- *
- * @version $Rev$ $Date$
- */
-public class TrueFilterTestCase {
-
-    /**
-     * Test TrueFilter matching an event
-     */
-    @Test
-    public void testTrueFilterMatch() {
-        EventFilter filter = new TrueFilter();
-
-        Assert.assertTrue(filter.match(new DummyEvent()));
-    }
-
-    /**
-     * Test TrueFilter matching null
-     */
-    @Test
-    public void testTrueFilterMatchNull() {
-        EventFilter filter = new TrueFilter();
-
-        Assert.assertTrue(filter.match(null));
-    }
-
-    /**
-     * Dummy Event implementation for testing
-     */
-    private class DummyEvent implements Event {
-
-        /**
-         * {@inheritDoc}
-         */
-        public Object getSource() {
-            throw new UnsupportedOperationException();
-        }
-   }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/LICENSE b/tags/java/sca/1.3/modules/core-spring/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/core-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/tags/java/sca/1.3/modules/core-spring/NOTICE b/tags/java/sca/1.3/modules/core-spring/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/pom.xml b/tags/java/sca/1.3/modules/core-spring/pom.xml
deleted file mode 100644
index feb6e99ae4..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-core-spring</artifactId>
-    <name>Apache Tuscany SCA Spring-based Core Runtime</name>
-
-    <dependencies>
-	
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <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>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</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.core.spring</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.core.spring*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
deleted file mode 100644
index 94bd5c8cf2..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.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.core.spring.assembly.impl;
-
-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.AssemblyFactory;
-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.ComponentType;
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An alternate implementation of the SCA assembly model factory that creates SCA
- * assembly model objects backed by Spring bean definitions.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanAssemblyFactory implements AssemblyFactory {
-    private AssemblyFactory defaultFactory;
-    private BeanDefinitionRegistry beanRegistry;
-
-    public BeanAssemblyFactory(AssemblyFactory defaultFactory, BeanDefinitionRegistry beanRegistry) {
-        this.defaultFactory = defaultFactory;
-        this.beanRegistry = beanRegistry;
-    }
-
-    public BeanAssemblyFactory(BeanDefinitionRegistry beanRegistry) {
-        this(new DefaultAssemblyFactory(), beanRegistry);
-    }
-
-    public AbstractProperty createAbstractProperty() {
-        return defaultFactory.createAbstractProperty();
-    }
-
-    public AbstractReference createAbstractReference() {
-        return defaultFactory.createAbstractReference();
-    }
-
-    public AbstractService createAbstractService() {
-        return defaultFactory.createAbstractService();
-    }
-
-    public Callback createCallback() {
-        return defaultFactory.createCallback();
-    }
-
-    public Component createComponent() {
-        return new BeanComponentImpl(beanRegistry);
-    }
-
-    public ComponentProperty createComponentProperty() {
-        return defaultFactory.createComponentProperty();
-    }
-
-    public ComponentReference createComponentReference() {
-        return defaultFactory.createComponentReference();
-    }
-
-    public ComponentService createComponentService() {
-        return defaultFactory.createComponentService();
-    }
-
-    public ComponentType createComponentType() {
-        return defaultFactory.createComponentType();
-    }
-
-    public Composite createComposite() {
-        return defaultFactory.createComposite();
-    }
-
-    public CompositeReference createCompositeReference() {
-        return defaultFactory.createCompositeReference();
-    }
-
-    public CompositeService createCompositeService() {
-        return defaultFactory.createCompositeService();
-    }
-
-    public ConstrainingType createConstrainingType() {
-        return defaultFactory.createConstrainingType();
-    }
-
-    public Property createProperty() {
-        return defaultFactory.createProperty();
-    }
-
-    public Reference createReference() {
-        return defaultFactory.createReference();
-    }
-
-    public Service createService() {
-        return defaultFactory.createService();
-    }
-
-    public Wire createWire() {
-        return defaultFactory.createWire();
-    }
-
-    public ConfiguredOperation createConfiguredOperation() {
-        return defaultFactory.createConfiguredOperation();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
deleted file mode 100644
index 2c27a5c6d5..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.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.core.spring.assembly.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.ChildBeanDefinition;
-
-/**
- * An implementation of the SCA assembly Component interface backed by a Spring
- * Bean definition.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanComponentImpl extends ChildBeanDefinition implements Component, Cloneable {
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    public IntentAttachPointType getType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        // TODO Auto-generated method stub
-
-    }
-
-    private static final long serialVersionUID = 1L;
-
-    private ConstrainingType constrainingType;
-    private Implementation implementation;
-    private String name;
-    private String uri;
-    private List<ComponentService> services = new ArrayList<ComponentService>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Object> extensions = new ArrayList<Object>();
-    private boolean unresolved = false;
-    private BeanDefinitionRegistry beanRegistry;
-
-    protected BeanComponentImpl(BeanDefinitionRegistry beanRegistry) {
-        super((String)"");
-        this.beanRegistry = beanRegistry;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        BeanComponentImpl clone = (BeanComponentImpl)super.clone();
-
-        clone.getProperties().clear();
-        for (ComponentProperty property : getProperties()) {
-            clone.getProperties().add((ComponentProperty)property.clone());
-        }
-        clone.getReferences().clear();
-        for (ComponentReference reference : getReferences()) {
-            clone.getReferences().add((ComponentReference)reference.clone());
-        }
-        clone.getServices().clear();
-        for (ComponentService service : getServices()) {
-            clone.getServices().add((ComponentService)service.clone());
-        }
-        return clone;
-    }
-
-    @Override
-    public String getParentName() {
-        //TODO find a better name for bean definitions representing component types
-        return String.valueOf(System.identityHashCode(implementation));
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    public Implementation getImplementation() {
-        return implementation;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-
-        // Register this bean definition in the bean registry
-        this.beanRegistry.registerBeanDefinition(uri, this);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    //TODO use a better list implementation
-    private List<ComponentProperty> properties = new ArrayList<ComponentProperty>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a property
-        @Override
-        public boolean add(ComponentProperty property) {
-
-            // Add corresponding bean property value
-            getPropertyValues().addPropertyValue(property.getName(), property.getValue());
-
-            return super.add(property);
-        }
-    };
-
-    public List<ComponentProperty> getProperties() {
-        return properties;
-    }
-
-    //TODO use a better list implementation
-    private List<ComponentReference> references = new ArrayList<ComponentReference>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a reference
-        @Override
-        public boolean add(ComponentReference reference) {
-
-            // Add corresponding bean property value
-            if (!reference.getName().startsWith("$self$.")) {
-                BeanReferenceImpl beanReference = new BeanReferenceImpl(reference);
-                getPropertyValues().addPropertyValue(reference.getName(), beanReference);
-            }
-            return super.add(reference);
-        }
-    };
-
-    public List<ComponentReference> getReferences() {
-        return references;
-    }
-
-    public List<ComponentService> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public void setImplementation(Implementation implementation) {
-        this.implementation = implementation;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public boolean isAutowire() {
-        return super.getAutowireMode() == AUTOWIRE_BY_TYPE;
-    }
-
-    public Boolean getAutowire() {
-        int autowire = super.getAutowireMode();
-        if (autowire == AUTOWIRE_BY_TYPE) {
-            return Boolean.TRUE;
-        } else if (autowire == AUTOWIRE_NO) {
-            return Boolean.FALSE;
-        } else {
-            return null;
-        }
-    }
-
-    public void setAutowire(Boolean autowire) {
-        super.setAutowireMode(autowire ? AUTOWIRE_BY_TYPE : AUTOWIRE_NO);
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
deleted file mode 100644
index 7b747372b4..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.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.core.spring.assembly.impl;
-
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
-
-/**
- * An implementation of RuntimeBeanReference wrapping an SCA assembly
- * Reference
- * 
- * @version $Rev$ $Date$
- */
-public class BeanReferenceImpl extends RuntimeBeanReference {
-    private Reference reference;
-
-    protected BeanReferenceImpl(Reference reference) {
-        super("temp");
-        this.reference = reference;
-    }
-
-    @Override
-    public String getBeanName() {
-        SCABinding binding = reference.getBinding(SCABinding.class);
-        String name = binding.getURI();
-        if (name.startsWith("/")) {
-            name = name.substring(1);
-        }
-        int s = name.lastIndexOf('/');
-        if (s != -1) {
-            name = name.substring(0, s);
-        }
-        return name;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this != other) {
-            if (other instanceof RuntimeBeanReference) {
-                RuntimeBeanReference br = (RuntimeBeanReference)other;
-                return (getBeanName().equals(br.getBeanName()) && this.isToParent() == br.isToParent());
-            } else
-                return false;
-        } else
-            return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return getBeanName().hashCode() * 29 + (this.isToParent() ? 1 : 0);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
deleted file mode 100644
index b275bfa9a7..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.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.core.spring.context;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * A default implementation of an artifact resolver, based on a map.
- *
- * @version $Rev$ $Date$
- */
-public class ModelResolverImpl implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    private WeakReference<ClassLoader> classLoader;
-    
-    public ModelResolverImpl(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) {
-            
-            // 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/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
deleted file mode 100644
index 7855818904..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.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.core.spring.context;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-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.Composite;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.spring.assembly.impl.BeanAssemblyFactory;
-import org.apache.tuscany.sca.core.spring.implementation.java.impl.BeanJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-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.ScopeProcessor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-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.policy.DefaultIntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-
-/**
- * A mini test runtime that uses the SCA assembly model variant implementation 
- * backed by Spring bean definitions.
- * 
- * @version $Rev$ $Date$
- */
-public class SCADomainContext {
-
-    private DefaultListableBeanFactory beanFactory;
-    
-    public SCADomainContext(String... compositeFiles) {
-
-        // Create Spring bean factory
-        beanFactory = new DefaultListableBeanFactory();
-
-        // Create SCA assembly and SCA Java factories
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = new BeanAssemblyFactory(new DefaultAssemblyFactory(), beanFactory);
-        modelFactories.addFactory(assemblyFactory);
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        modelFactories.addFactory(javaFactory);
-        JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
-        modelFactories.addFactory(javaImplementationFactory);
-        
-        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, javaFactory),
-            new ResourceProcessor(assemblyFactory),
-            new ScopeProcessor(assemblyFactory),
-            new ServiceProcessor(assemblyFactory, javaFactory),
-            new HeuristicPojoProcessor(assemblyFactory, javaFactory),
-            new PolicyProcessor(assemblyFactory, policyFactory)
-        };
-        for (JavaClassVisitor e : extensions) {
-            javaImplementationFactory.addClassVisitor(e);
-        }
-
-        // Populate ArtifactProcessor registry
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        StAXArtifactProcessor<Composite> compositeProcessor = staxProcessors.getProcessor(Composite.class);
-        
-        // Create a resolver
-        //FIXME The ClassLoader should be passed in 
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        ModelResolverImpl resolver = new ModelResolverImpl(classLoader);
-
-        try {
-            XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-            
-            // Read the composite files
-            List<Composite> composites = new ArrayList<Composite>();
-            for (String compositeFile: compositeFiles) {
-                InputStream is = classLoader.getResourceAsStream(compositeFile);
-                XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-                Composite composite = compositeProcessor.read(reader);
-                resolver.addModel(composite);
-                composites.add(composite);
-            }
-            
-            for (Composite composite: composites) {
-                
-                // Resolve the composite
-                compositeProcessor.resolve(composite, resolver);
-            }
-            
-            // Wire the top level component's composite
-            buildComposite(composites.get(0), assemblyFactory, scaBindingFactory, mapper);
-            
-        } catch (ContributionException e) {
-            throw new RuntimeException(e);
-        } catch (CompositeBuilderException e) {
-            throw new RuntimeException(e);
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        } 
-    }
-    
-    private void buildComposite(Composite composite, AssemblyFactory assemblyFactory,
-                                SCABindingFactory scaBindingFactory, InterfaceContractMapper interfaceContractMapper) throws CompositeBuilderException {
-
-        Monitor monitor = new Monitor() {
-
-            public void problem(Problem problem) {
-                System.out.println("Composite assembly problem: " + problem.toString());
-            }
-            public List<Problem> getProblems() {
-                return null;
-            }
-        };
-
-        // Configure and wire the composite
-        CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), interfaceContractMapper, monitor);
-        compositeUtil.build(composite);
-
-    }
-
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        Object bean = beanFactory.getBean(serviceName);
-        return businessInterface.cast(bean);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
deleted file mode 100644
index 9587a2b0ae..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-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.java.BaseJavaImplementation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-
-/**
- * An implementation of the SCA assembly JavaImplementation interface backed by a Spring
- * Bean definition.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanBaseJavaImplementationImpl extends RootBeanDefinition implements BaseJavaImplementation, Cloneable {
-    private static final long serialVersionUID = 1L;
-
-    private List<Service> services = new ArrayList<Service>();
-    private ConstrainingType constrainingType;
-    private List<Object> extensions = new ArrayList<Object>();
-    private boolean unresolved;
-    private BeanDefinitionRegistry beanRegistry;
-    private String uri;
-
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private List<ConfiguredOperation> configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private IntentAttachPointType type = null;
-
-    protected BeanBaseJavaImplementationImpl(BeanDefinitionRegistry beanRegistry) {
-        this.beanRegistry = beanRegistry;
-
-        // Register this bean definition in the bean registry
-        //TODO find a better name for bean definitions representing component types
-        String name = String.valueOf(System.identityHashCode(this));
-        this.beanRegistry.registerBeanDefinition(name, this);
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        BeanBaseJavaImplementationImpl clone = (BeanBaseJavaImplementationImpl)super.clone();
-
-        clone.getServices().clear();
-        for (Service service : getServices()) {
-            clone.getServices().add((Service)service.clone());
-        }
-        clone.getReferences().clear();
-        for (Reference reference : getReferences()) {
-            clone.getReferences().add((Reference)reference.clone());
-        }
-        clone.getProperties().clear();
-        for (Property property : getProperties()) {
-            clone.getProperties().add((Property)property.clone());
-        }
-        return clone;
-    }
-
-    public Class<?> getJavaClass() {
-        return super.getBeanClass();
-    }
-
-    public String getName() {
-        return super.getBeanClassName();
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        super.setBeanClass(javaClass);
-    }
-
-    public void setName(String className) {
-        super.setBeanClassName(className);
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    //TODO use a better list implementation
-    private List<Property> properties = new ArrayList<Property>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a property
-        @Override
-        public boolean add(Property property) {
-
-            // Add corresponding bean property value
-            getPropertyValues().addPropertyValue(property.getName(), property.getValue());
-
-            return super.add(property);
-        }
-    };
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    //TODO use a better list implementation
-    private List<Reference> references = new ArrayList<Reference>() {
-        private static final long serialVersionUID = 1L;
-
-        // Add a reference
-        @Override
-        public boolean add(Reference reference) {
-
-            // Add corresponding bean property value
-            String target;
-            if (!reference.getTargets().isEmpty()) {
-                //TODO handle multiplicity
-                target = reference.getTargets().get(0).getName();
-                int i = target.indexOf('/');
-                if (i != -1)
-                    target = target.substring(0, i);
-            } else {
-                target = null;
-            }
-            getPropertyValues().addPropertyValue(reference.getName(), target);
-
-            return super.add(reference);
-        }
-    };
-
-
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
deleted file mode 100644
index 6b19bac413..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.JavaClassIntrospectorImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An alternate implementation of the SCA Java assembly model factory that
- * creates SCA Java assembly model objects backed by Spring bean definitions.
- * 
- * @version $Rev$ $Date$
- */
-public class BeanJavaImplementationFactory implements JavaImplementationFactory {
-
-    private BeanDefinitionRegistry beanRegistry;
-    private List<JavaClassVisitor> visitors = new ArrayList<JavaClassVisitor>();
-    private JavaClassIntrospectorImpl introspector;
-
-    public BeanJavaImplementationFactory(BeanDefinitionRegistry beanRegistry) {
-        this.beanRegistry = beanRegistry;
-        introspector = new JavaClassIntrospectorImpl(visitors);
-    }
-
-    public JavaImplementation createJavaImplementation() {
-        return new BeanJavaImplementationImpl(beanRegistry);
-    }
-
-    public void createJavaImplementation(JavaImplementation javaImplementation, Class<?> implementationClass)
-        throws IntrospectionException {
-        introspector.introspectClass(javaImplementation, implementationClass);
-    }
-
-    public JavaImplementation createJavaImplementation(Class<?> implementationClass) throws IntrospectionException {
-        JavaImplementation javaImplementation = createJavaImplementation();
-        introspector.introspectClass(javaImplementation, implementationClass);
-        return javaImplementation;
-    }
-
-    public void addClassVisitor(JavaClassVisitor visitor) {
-        visitors.add(visitor);
-    }
-
-    public void removeClassVisitor(JavaClassVisitor visitor) {
-        visitors.remove(visitor);
-    }
-    
-    public List<JavaClassVisitor> getClassVisitors() {
-        return visitors;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
deleted file mode 100644
index 27dc7ec6c7..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.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.core.spring.implementation.java.impl;
-
-import java.lang.reflect.Constructor;
-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.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-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.impl.JavaScopeImpl;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-
-/**
- * An implementation of the SCA assembly JavaImplementation interface backed by a Spring
- * Bean definition.
- *
- * @version $Rev$ $Date$
- */
-public class BeanJavaImplementationImpl extends BeanBaseJavaImplementationImpl implements JavaImplementation {
-    private static final long serialVersionUID = 6792198458193774178L;
-    
-    private JavaConstructorImpl<?> constructorDefinition;
-    private Map<Constructor, JavaConstructorImpl> constructors = new HashMap<Constructor, JavaConstructorImpl>();
-    private Method initMethod;
-    private Method destroyMethod;
-    private final Map<String, JavaResourceImpl> resources = new HashMap<String, JavaResourceImpl>();
-    private final Map<String, JavaElementImpl> propertyMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, JavaElementImpl> referenceMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, Collection<JavaElementImpl>> callbackMembers = new HashMap<String, Collection<JavaElementImpl>>();
-    private List<Member> conversationIDMember = new ArrayList<Member>();
-    private boolean eagerInit;
-    private boolean allowsPassByReference;
-    private List<Method> allowsPassByReferenceMethods = new ArrayList<Method>();
-    private long maxAge = -1;
-    private long maxIdleTime = -1;
-    private JavaScopeImpl scope = JavaScopeImpl.STATELESS;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
-    
-    protected BeanJavaImplementationImpl(BeanDefinitionRegistry beanRegistry) {
-        super(beanRegistry);
-    }    
-
-    public JavaConstructorImpl<?> getConstructor() {
-        return constructorDefinition;
-    }
-
-    public void setConstructor(JavaConstructorImpl<?> definition) {
-        this.constructorDefinition = definition;
-    }
-
-    public Method getInitMethod() {
-        return initMethod;
-    }
-
-    public void setInitMethod(Method initMethod) {
-        this.initMethod = initMethod;
-    }
-
-    public Method getDestroyMethod() {
-        return destroyMethod;
-    }
-
-    public void setDestroyMethod(Method destroyMethod) {
-        this.destroyMethod = destroyMethod;
-    }
-
-    public Map<String, JavaResourceImpl> getResources() {
-        return resources;
-    }
-
-    public List<Member> getConversationIDMembers() {
-        return this.conversationIDMember;
-    }
-
-    public void addConversationIDMember(Member conversationIDMember) {
-        this.conversationIDMember.add(conversationIDMember);
-    }
-
-    public boolean isAllowsPassByReference() {
-        return allowsPassByReference;
-    }
-
-    public void setAllowsPassByReference(boolean allowsPassByReference) {
-        this.allowsPassByReference = allowsPassByReference;
-    }
-
-    public List<Method> getAllowsPassByReferenceMethods() {
-        return allowsPassByReferenceMethods;
-    }
-    
-    public boolean isAllowsPassByReference(Method method) {
-        return allowsPassByReference || allowsPassByReferenceMethods.contains(method);
-    }
-
-    public Map<Constructor, JavaConstructorImpl> getConstructors() {
-        return constructors;
-    }
-
-    public boolean isEagerInit() {
-        return eagerInit;
-    }
-
-    public void setEagerInit(boolean eagerInit) {
-        this.eagerInit = eagerInit;
-    }
-
-    public Map<String, Collection<JavaElementImpl>> getCallbackMembers() {
-        return callbackMembers;
-    }
-
-    public Map<String, JavaElementImpl> getPropertyMembers() {
-        return propertyMembers;
-    }
-
-    public Map<String, JavaElementImpl> getReferenceMembers() {
-        return referenceMembers;
-    }
-
-    public JavaScopeImpl getJavaScope() {
-        return scope;
-    }
-
-    public void setJavaScope(JavaScopeImpl scope) {
-        this.scope = scope;
-    }
-
-    public long getMaxAge() {
-        return maxAge;
-    }
-
-    public void setMaxAge(long maxAge) {
-        this.maxAge = maxAge;
-    }
-
-    public long getMaxIdleTime() {
-        return maxIdleTime;
-    }
-
-    public void setMaxIdleTime(long maxIdleTime) {
-        this.maxIdleTime = maxIdleTime;
-    }
-    
-    public Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames() {
-        return policyHandlerClassNames;
-    }
-
-    public void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
deleted file mode 100644
index 17a7e9084c..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.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.core.spring.implementation.java.impl;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceContractImpl;
-
-/**
- * An implementation of a Java interface contract. 
- *
- * @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceContractImpl extends JavaInterfaceContractImpl {
-    
-    protected BeanJavaInterfaceContractImpl() {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
deleted file mode 100644
index 492ab2732e..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.java.impl.JavaInterfaceIntrospectorImpl;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-
-/**
- * An alternate implementation of the SCA Java assembly model factory that creates SCA
- * Java assembly model objects backed by Spring bean definitions.
- *
- *  @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceFactory implements JavaInterfaceFactory {
-	
-    private List<JavaInterfaceVisitor> visitors = new ArrayList<JavaInterfaceVisitor>();
-    private JavaInterfaceIntrospectorImpl introspector;
-    
-        public BeanJavaInterfaceFactory() {
-            introspector = new JavaInterfaceIntrospectorImpl(this);
-        }
-
-	public JavaInterface createJavaInterface() {
-		return new BeanJavaInterfaceImpl();
-	}
-        
-        public JavaInterface createJavaInterface(Class<?> interfaceClass) throws InvalidInterfaceException {
-            JavaInterface javaInterface = createJavaInterface();
-            introspector.introspectInterface(javaInterface, interfaceClass);
-            return javaInterface;
-        }
-        
-        public void createJavaInterface(JavaInterface javaInterface, Class<?> interfaceClass) throws InvalidInterfaceException {
-            introspector.introspectInterface(javaInterface, interfaceClass);
-        }
-        
-        public JavaInterfaceContract createJavaInterfaceContract() {
-            return new BeanJavaInterfaceContractImpl();
-        }
-
-        public void addInterfaceVisitor(JavaInterfaceVisitor extension) {
-            visitors.add(extension);
-        }
-
-        public void removeInterfaceVisitor(JavaInterfaceVisitor extension) {
-            visitors.remove(extension);
-        }
-
-        public List<JavaInterfaceVisitor> getInterfaceVisitors() {
-            return visitors;
-        }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
deleted file mode 100644
index f3c84e900b..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.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.core.spring.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceImpl;
-import org.apache.tuscany.sca.policy.Intent;
-
-/**
- * An alternate implementation of the SCA Java assembly model JavaInterface
- * interface.
- * 
- * @version $Rev$ $Date$
- */
-public class BeanJavaInterfaceImpl extends JavaInterfaceImpl implements JavaInterface {
-
-    private String className;
-    private Class<?> javaClass;
-    private Class<?> callbackClass;
-    private boolean conversational;
-    private boolean remotable;
-    List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Operation> operations = new ArrayList<Operation>();
-    private boolean unresolved = false;
-    
-    protected BeanJavaInterfaceImpl() {
-    }
-
-    public String getName() {
-        if (isUnresolved()) {
-            return className;
-        }    
-        else {
-            return javaClass.getName();
-        }    
-    }
-
-    public void setName(String className) {
-        if (!isUnresolved())
-            throw new IllegalStateException();
-        this.className = className;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-    }
-
-    public Class<?> getCallbackClass() {
-        return callbackClass;
-    }
-
-    public void setCallbackClass(Class<?> callbackClass) {
-        this.callbackClass = callbackClass;
-    }
-
-    public boolean isConversational() {
-        return conversational;
-    }
-
-    public boolean isRemotable() {
-        return remotable;
-    }
-
-    public void setConversational(boolean conversational) {
-        this.conversational = conversational;
-    }
-
-    public void setRemotable(boolean local) {
-        this.remotable = local;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public List<Operation> getOperations() {
-        return operations;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    public void resetDataBinding(String dataBinding) {
-    }
-    
-    @Deprecated
-    public void setDefaultDataBinding(String dataBinding) {
-    }    
-
-    public boolean isDynamic() {
-        return false;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/AddService.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/AddService.java
deleted file mode 100644
index f3a24ed6b2..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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;
-
-/**
- * The Add Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 61654ea811..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java
deleted file mode 100644
index 73aa028084..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/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.core.spring.context.SCADomainContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * Calculator service and invoke it.
- *
- * @version $Rev$ $Date$
- */
-public class CalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomainContext context = new SCADomainContext("org/apache/tuscany/core/spring/Calculator.composite");
-
-        CalculatorService calculatorService = context.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));
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index e0cf23dc17..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c1fceb575d..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/DivideService.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 7c69b10b25..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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;
-
-/**
- * The Divide Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index e1f35f99b5..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/MultiplyService.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 686542c18e..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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;
-
-/**
- * The Multiply Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index d621407908..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
deleted file mode 100644
index e8e4a6f71b..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.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.core.spring.context.SCADomainContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * Calculator service and invoke it.
- *
- * @version $Rev$ $Date$
- */
-public class NestedCalculatorClient {
-    public static void main(String[] args) throws Exception {
-
-        SCADomainContext context = new SCADomainContext(
-                                            "org/apache/tuscany/core/spring/OuterCalculator.composite",
-                                            "org/apache/tuscany/core/spring/InnerCalculator.composite",
-                                            "org/apache/tuscany/core/spring/InnerOperations.composite");
-
-        CalculatorService calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent/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));
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/SubtractService.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index 30632688f9..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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;
-
-/**
- * The Subtract Service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 4fed0a8c6a..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/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/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
deleted file mode 100644
index 44b447cc64..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.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.core.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-import calculator.CalculatorService;
-
-/**
- * This shows how to test the Calculator service component.
- *
- * @version $Rev$ $Date$
- */
-public class CalculatorTestCase extends TestCase {
-
-    private SCADomainContext context;
-    private CalculatorService calculatorService;
-
-    @Override
-    protected void setUp() throws Exception {
-        context = new SCADomainContext("org/apache/tuscany/sca/core/spring/Calculator.composite");
-
-        calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    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/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
deleted file mode 100644
index baf73ac197..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.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.core.spring;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.spring.context.SCADomainContext;
-
-import calculator.CalculatorService;
-
-/**
- * This shows how to test the Calculator service component.
- *
- * @version $Rev$ $Date$
- */
-public class NestedCalculatorTestCaseFIXME extends TestCase {
-
-    private SCADomainContext context;
-    private CalculatorService calculatorService;
-
-    @Override
-    protected void setUp() throws Exception {
-        context = new SCADomainContext(
-                          "org/apache/tuscany/sca/core/spring/OuterCalculator.composite",
-                          "org/apache/tuscany/sca/core/spring/InnerCalculator.composite",
-                          "org/apache/tuscany/sca/core/spring/InnerOperations.composite");
-
-        calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent/InnerCalculatorServiceComponent");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-    }
-
-    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/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
deleted file mode 100644
index 6d998ba035..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/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"
-	xmlns:calc="http://sample.calculator"
-	name="calc:TestBeanCalculator">
-
-    <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 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/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
deleted file mode 100644
index 8b043f2b4f..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="InnerCalculator">
-
-    <service name="CalculatorService" promote="InnerCalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="InnerCalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService"/>
-        <reference name="subtractService"/>
-        <reference name="multiplyService"/>
-        <reference name="divideService"/>
-    </component>
-
-	<reference name="addService" promote="InnerCalculatorServiceComponent/addService"/>
-	<reference name="subtractService" promote="InnerCalculatorServiceComponent/subtractService"/>
-	<reference name="multiplyService" promote="InnerCalculatorServiceComponent/multiplyService"/>
-	<reference name="divideService" promote="InnerCalculatorServiceComponent/divideService"/>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
deleted file mode 100644
index d7d1124050..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="InnerOperations">
-
-    <service name="AddService" promote="AddServiceComponent">
-        <interface.java interface="calculator.AddService"/>
-    </service>
-
-    <service name="SubtractService" promote="SubtractServiceComponent">
-        <interface.java interface="calculator.SubtractService"/>
-    </service>
-
-    <service name="MultiplyService" promote="MultiplyServiceComponent">
-        <interface.java interface="calculator.MultiplyService"/>
-    </service>
-
-    <service name="DivideService" promote="DivideServiceComponent">
-        <interface.java interface="calculator.DivideService"/>
-    </service>
-
-    <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/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
deleted file mode 100644
index c2b6cced36..0000000000
--- a/tags/java/sca/1.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.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:calc="http://calc"
-	targetNamespace="http://calc"
-	name="OuterCalculator">
-
-    <service name="CalculatorService" promote="CalculatorServiceComponent">
-        <interface.java interface="calculator.CalculatorService"/>
-    </service>
-
-    <component name="CalculatorServiceComponent">
-		<implementation.composite name="calc:InnerCalculator"/>
-        <reference name="addService" target="OperationsServiceComponent/AddService"/>
-        <reference name="subtractService" target="OperationsServiceComponent/SubtractService"/>
-        <reference name="multiplyService" target="OperationsServiceComponent/MultiplyService"/>
-        <reference name="divideService" target="OperationsServiceComponent/DivideService"/>
-    </component>
-
-    <component name="OperationsServiceComponent">
-		<implementation.composite name="calc:InnerOperations"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/core/LICENSE b/tags/java/sca/1.3/modules/core/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/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/tags/java/sca/1.3/modules/core/NOTICE b/tags/java/sca/1.3/modules/core/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/core/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/tags/java/sca/1.3/modules/core/pom.xml b/tags/java/sca/1.3/modules/core/pom.xml
deleted file mode 100644
index 5534344b6e..0000000000
--- a/tags/java/sca/1.3/modules/core/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-core</artifactId>
-    <name>Apache Tuscany SCA Core Runtime</name>
-
-    <dependencies>
-    	<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-commonj_1.1_spec</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</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.core</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.core*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
deleted file mode 100644
index c86c876075..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.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.core.assembly;
-
-
-/**
- * Denotes an error starting the runtime
- *
- * @version $Rev$ $Date$
- */
-public class ActivationException extends Exception {
-    private static final long serialVersionUID = 8612661660934426123L;
-
-    public ActivationException(String message) {
-        super(message);
-    }
-
-    public ActivationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
deleted file mode 100644
index 29dcc20f0b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.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.core.assembly;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.core.context.ComponentContextHelper;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Start/stop a composite
- * 
- * @version $Rev$ $Date$
- */
-public interface CompositeActivator {
-    /**
-     * Activate a composite
-     * @param composite
-     */
-    void activate(Composite composite) throws ActivationException;
-
-    /**
-     * Activate a component reference
-     * @param component
-     * @param ref
-     */
-    void start(RuntimeComponent component, RuntimeComponentReference ref);
-    
-    /**
-     * Activate a component reference
-     * @param component
-     * @param ref
-     */
-    void activate(RuntimeComponent component, RuntimeComponentReference ref);
-
-    /**
-     * Activate a component reference
-     * @param component
-     * @param ref
-     */
-    void activate(RuntimeComponent component, RuntimeComponentService service);
-
-    /**
-     * De-activate a component reference
-     * @param component
-     * @param ref
-     */
-    void deactivate(RuntimeComponent component, RuntimeComponentReference ref);
-
-    /**
-     * De-activate a component reference
-     * @param component
-     * @param ref
-     */
-    void deactivate(RuntimeComponent component, RuntimeComponentService service);
-
-    /**
-     * Stop a composite
-     * @param composite
-     */
-    void deactivate(Composite composite) throws ActivationException;
-
-    /**
-     * Start a component
-     * @param component
-     */
-    void start(Component component) throws ActivationException;
-
-    /**
-     * Stop a component
-     * @param component
-     */
-    void stop(Component component) throws ActivationException;
-
-    /**
-     * Start components in a composite
-     * @param composite
-     */
-    void start(Composite composite) throws ActivationException;
-
-    /**
-     * Stop components in a composite
-     * @param composite
-     */
-    void stop(Composite composite) throws ActivationException;
-
-    /**
-     * Get the component context helper
-     * @return
-     */
-    ComponentContextHelper getComponentContextHelper();
-
-    /**
-     * Get the proxy factory
-     * @return
-     */
-    ProxyFactory getProxyFactory();
-
-    /**
-     * Get the java interface factory
-     * @return
-     */
-    JavaInterfaceFactory getJavaInterfaceFactory();
-    
-    ConversationManager getConversationManager();
-
-    /**
-     * Configure the runtime component with component context
-     * @param component
-     */
-    void configureComponentContext(RuntimeComponent component);
-
-    /**
-     * Resolve a component by URI in the domain
-     * @param componentURI
-     * @return
-     */
-    Component resolve(String componentURI);
-
-    /**
-     * Set the domain composite
-     * @param domainComposite
-     */
-    void setDomainComposite(Composite domainComposite);
-
-    /**
-     * Get the domain composite
-     * @return
-     */
-    Composite getDomainComposite();
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
deleted file mode 100644
index d205cbf823..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.core.assembly;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.ComponentReference;
-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.Endpoint;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.context.ComponentContextHelper;
-import org.apache.tuscany.sca.core.context.ComponentContextImpl;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.ConversationalScopeContainer;
-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.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CompositeActivatorImpl implements CompositeActivator {
-    private static final Logger logger = Logger.getLogger(CompositeActivatorImpl.class.getName());
-
-    private final AssemblyFactory assemblyFactory;
-    private final MessageFactory messageFactory;
-    private final InterfaceContractMapper interfaceContractMapper;
-    private final ScopeRegistry scopeRegistry;
-    private final WorkScheduler workScheduler;
-    private final RuntimeWireProcessor wireProcessor;
-    private final ProviderFactoryExtensionPoint providerFactories;
-    private final EndpointResolverFactoryExtensionPoint endpointResolverFactories;
-
-    private final RequestContextFactory requestContextFactory;
-    private final ProxyFactory proxyFactory;
-    private final JavaInterfaceFactory javaInterfaceFactory;
-    private final ConversationManager conversationManager;
-
-    private final ComponentContextHelper componentContextHelper;
-
-    private Composite domainComposite;
-
-    /**
-     * @param assemblyFactory
-     * @param interfaceContractMapper
-     * @param workScheduler
-     * @param conversationManager TODO
-     * @param workContext
-     * @param wirePostProcessorRegistry
-     */
-    public CompositeActivatorImpl(AssemblyFactory assemblyFactory,
-                                  MessageFactory messageFactory,
-                                  JavaInterfaceFactory javaInterfaceFactory,
-                                  SCABindingFactory scaBindingFactory,
-                                  InterfaceContractMapper interfaceContractMapper,
-                                  ScopeRegistry scopeRegistry,
-                                  WorkScheduler workScheduler,
-                                  RuntimeWireProcessor wireProcessor,
-                                  RequestContextFactory requestContextFactory,
-                                  ProxyFactory proxyFactory,
-                                  ProviderFactoryExtensionPoint providerFactories,
-                                  EndpointResolverFactoryExtensionPoint endpointResolverFactories,
-                                  StAXArtifactProcessorExtensionPoint processors,
-                                  ConversationManager conversationManager) {
-        this.assemblyFactory = assemblyFactory;
-        this.messageFactory = messageFactory;
-        this.interfaceContractMapper = interfaceContractMapper;
-        this.scopeRegistry = scopeRegistry;
-        this.workScheduler = workScheduler;
-        this.wireProcessor = wireProcessor;
-        this.providerFactories = providerFactories;
-        this.endpointResolverFactories = endpointResolverFactories;
-        this.javaInterfaceFactory = javaInterfaceFactory;
-        this.requestContextFactory = requestContextFactory;
-        this.proxyFactory = proxyFactory;
-        this.conversationManager = conversationManager;
-        this.componentContextHelper = new ComponentContextHelper(assemblyFactory, javaInterfaceFactory, processors);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.assembly.CompositeActivator#activate(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference)
-     */
-    public void activate(RuntimeComponent component, RuntimeComponentReference ref) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Activating component reference: " + component.getURI() + "#" + ref.getName());
-        }
-        resolveTargets(ref);
-        for (Binding binding : ref.getBindings()) {
-            addReferenceBindingProvider(component, ref, binding);
-        }
-        
-        for (Endpoint endpoint : ref.getEndpoints()){
-            // TODO - source component should be set in the builder but the 
-            //        way the builder is written it's difficult to get at it
-            endpoint.setSourceComponent(component);
-            
-            addEndpointResolver(component, ref, endpoint);
-        }
-    }
-
-    public void start(RuntimeComponent component, RuntimeComponentReference ref) {
-        synchronized (ref) {
-            resolveTargets(ref);
-            for (Binding binding : ref.getBindings()) {
-                ReferenceBindingProvider provider = ref.getBindingProvider(binding);
-                if (provider == null) {
-                    provider = addReferenceBindingProvider(component, ref, binding);
-                }
-                if (provider != null) {
-                    provider.start();
-                }
-                addReferenceWire(component, ref, binding);
-            }
-            
-            // targets now have an endpoint representation. We can use this to 
-            // look for unresolved endpoints using dummy wires for late resolution
-            for (Endpoint endpoint : ref.getEndpoints()){
-                addReferenceEndpointWire(component, ref, endpoint);
-            }
-        }
-    }
-
-    public void stop(Component component, ComponentReference reference) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Stopping component reference: " + component.getURI() + "#" + reference.getName());
-        }
-        RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
-        for (Binding binding : reference.getBindings()) {
-            ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(binding);
-            if (bindingProvider != null) {
-                bindingProvider.stop();
-            }
-        }
-    }
-
-    public void deactivate(RuntimeComponent component, RuntimeComponentReference ref) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Deactivating component reference: " + component.getURI() + "#" + ref.getName());
-        }
-        removeReferenceWires(ref);
-        for (Binding binding : ref.getBindings()) {
-            removeReferenceBindingProvider(component, ref, binding);
-        }
-
-    }
-
-    /**
-     * @param component
-     * @param reference
-     * @param binding
-     */
-    private EndpointResolver addEndpointResolver(RuntimeComponent component,
-                                                 RuntimeComponentReference reference,
-                                                 Endpoint endpoint){
-        
-        // only create endpoint resolvers for unresolved endpoints currently
-        // this will also prevent a wire from being created later
-        if (!endpoint.isUnresolved()){
-            return null;
-        }
-        
-        // This souldn't happen as the endpoint resolver extension point is in core-spi but 
-        // just in case returning null here will mean that no wire is created and calling 
-        // the reference will fail with NPE
-        if (endpointResolverFactories == null){
-            return null;
-        }
-        
-        EndpointResolverFactory<Endpoint> resolverFactory =
-            (EndpointResolverFactory<Endpoint>)endpointResolverFactories.getEndpointResolverFactory(endpoint.getClass());
-        
-        if (resolverFactory != null) {
-            @SuppressWarnings("unchecked")
-            EndpointResolver endpointResolver =
-                resolverFactory.createEndpointResolver(endpoint, null);
-            if (endpointResolver != null) {
-                ((RuntimeComponentReference)reference).setEndpointResolver(endpoint, endpointResolver);
-            }
-            
-            return endpointResolver;
-        } else {
-            // TODO - for the time being allow the lack of an endpoint provider to be the 
-            //        switch to turn off endpoint processing
-            return null;
-            //throw new IllegalStateException("Endpoint provider factory not found for class: " + endpoint.getClass().getName());
-        }
-    }
-    
-    public void addReferenceBindingProviderForEndpoint(Endpoint endpoint){
-        addReferenceBindingProvider((RuntimeComponent)endpoint.getSourceComponent(),
-                                    (RuntimeComponentReference)endpoint.getSourceComponentReference(),
-                                    endpoint.getSourceBinding());
-    }
-
-    /**
-     * @param component
-     * @param reference
-     * @param binding
-     */
-    private ReferenceBindingProvider addReferenceBindingProvider(RuntimeComponent component,
-                                                                 RuntimeComponentReference reference,
-                                                                 Binding binding) {
-        BindingProviderFactory providerFactory =
-            (BindingProviderFactory)providerFactories.getProviderFactory(binding.getClass());
-        if (providerFactory != null) {
-            @SuppressWarnings("unchecked")
-            ReferenceBindingProvider bindingProvider =
-                providerFactory.createReferenceBindingProvider((RuntimeComponent)component,
-                                                               (RuntimeComponentReference)reference,
-                                                               binding);
-            if (bindingProvider != null) {
-                ((RuntimeComponentReference)reference).setBindingProvider(binding, bindingProvider);
-            }
-            for (PolicyProviderFactory f : providerFactories.getPolicyProviderFactories()) {
-                PolicyProvider policyProvider = f.createReferencePolicyProvider(component, reference, binding);
-                if (policyProvider != null) {
-                    reference.addPolicyProvider(binding, policyProvider);
-                }
-            }
-
-            return bindingProvider;
-        } else {
-            throw new IllegalStateException("Provider factory not found for class: " + binding.getClass().getName());
-        }
-    }
-
-    /**
-     * @param reference
-     */
-    private void resolveTargets(RuntimeComponentReference reference) {
-        // The code that used to be here to resolved unresolved targets is now 
-        // at the bottom of BaseWireBuilder.connectComponentReferences()
-    }
-    
-    /**
-     * Create the runtime wires for a reference endpoint. Currently this method
-     * only deals with the late binding case and creates a dummy wire that 
-     * will use the Endpoint to resolve the target at the point when the 
-     * wire chains are created.
-     * 
-     * @param component
-     * @param reference
-     * @param binding
-     */
-    private void addReferenceEndpointWire(Component component, ComponentReference reference, Endpoint endpoint) {
-        // only deal with unresolved endpoints as, to prevent breaking changes, targets that are resolved
-        // at build time are still represented as bindings in the binding list
-        if (((RuntimeComponentReference)reference).getEndpointResolver(endpoint) == null){ 
-            // no endpoint provider has previously been created so don't create the 
-            // wire
-            return;
-        }
-        
-        RuntimeWire wire = new EndpointWireImpl(endpoint, this);
-        
-        RuntimeComponentReference runtimeRef = (RuntimeComponentReference)reference;
-        runtimeRef.getRuntimeWires().add(wire);
-    }
-    
-
-    /**
-     * Create the runtime wires for a reference binding
-     * 
-     * @param component
-     * @param reference
-     * @param binding
-     */
-    private void addReferenceWire(Component component, ComponentReference reference, Binding binding) {
-        if (!(reference instanceof RuntimeComponentReference)) {
-            return;
-        }
-        
-        // create wire if binding has an endpoint
-        Component targetComponent = null;
-        ComponentService targetComponentService = null;
-        Binding targetBinding = null;
-    
-        if (binding instanceof OptimizableBinding) {
-            OptimizableBinding endpoint = (OptimizableBinding)binding;
-            targetComponent = endpoint.getTargetComponent();
-            targetComponentService = endpoint.getTargetComponentService();
-            targetBinding = endpoint.getTargetBinding();
-            // FIXME: TUSCANY-2136, For unresolved binding, don't add wire. Is it the right solution?
-            if (!reference.isCallback() && binding.getURI() == null && targetComponentService == null) {
-                return;
-            }
-        }
-
-        // create a forward wire, either static or dynamic
-        addReferenceWire(component, reference, binding, targetComponent, targetComponentService, targetBinding);
-
-        /*
-        // if static forward wire (not from self-reference), try to create a static callback wire 
-        if (targetComponentService != null && !reference.getName().startsWith("$self$.")) {
-            ComponentReference callbackReference = targetComponentService.getCallbackReference();
-            if (callbackReference != null) {
-                Binding callbackBinding = null;
-                Binding callbackServiceBinding = null;
-                // select a service callback binding that can be wired back to this component
-                for (Binding refBinding : callbackReference.getBindings()) {
-                    // first look for a callback binding whose name matches the target binding name
-                    if (refBinding.getName().equals(targetBinding.getName())) {
-                        callbackBinding = refBinding;
-                        break;
-                    }
-                }
-                // see if there is a matching reference callback binding 
-                if (callbackBinding != null) {
-                    callbackServiceBinding = reference.getCallbackService().getBinding(callbackBinding.getClass());
-                }
-                // if there isn't an end-to-end match, try again based on target binding type
-                if (callbackBinding == null || callbackServiceBinding == null) {
-                    callbackBinding = callbackReference.getBinding(targetBinding.getClass());
-                    if (callbackBinding != null) {
-                        callbackServiceBinding = reference.getCallbackService().getBinding(callbackBinding.getClass());
-                    }
-                }
-                if (callbackBinding != null && callbackServiceBinding != null) {
-                    // end-to-end match, so create a static callback wire as well as the static forward wire
-        
-                    addReferenceWire(targetComponent, callbackReference, callbackBinding, component, reference
-                        .getCallbackService(), callbackServiceBinding);
-                } else {
-                    // no end-to-end match, so do not create a static callback wire
-                }
-            }
-        }
-        */
-    }
-
-    public void addReferenceWireForEndpoint(Endpoint endpoint){
-        addReferenceWire(endpoint.getSourceComponent(),
-                         endpoint.getSourceComponentReference(),
-                         endpoint.getSourceBinding(),
-                         endpoint.getTargetComponent(),
-                         endpoint.getTargetComponentService(),
-                         endpoint.getTargetBinding());
-    }
-    /**
-     * Create a reference wire for a forward call or a callback
-     * @param reference
-     * @param service
-     * @param serviceBinding
-     * @param component
-     * @param referenceBinding
-     */
-    private RuntimeWire addReferenceWire(Component refComponent,
-                                         ComponentReference reference,
-                                         Binding refBinding,
-                                         Component serviceComponent,
-                                         ComponentService service,
-                                         Binding serviceBinding) {
-        RuntimeComponentReference runtimeRef = (RuntimeComponentReference)reference;
-        InterfaceContract bindingContract = getInterfaceContract(reference, refBinding);
-
-        // Use the interface contract of the reference on the component type
-        Reference componentTypeRef = reference.getReference();
-        InterfaceContract sourceContract =
-            componentTypeRef == null ? reference.getInterfaceContract() : componentTypeRef.getInterfaceContract();
-        sourceContract = sourceContract.makeUnidirectional(false);
-
-        EndpointReference wireSource =
-            new EndpointReferenceImpl((RuntimeComponent)refComponent, reference, refBinding, sourceContract);
-        ComponentService callbackService = reference.getCallbackService();
-        if (callbackService != null) {
-            // select a reference callback binding to pass with invocations on this wire
-            Binding callbackBinding = null;
-            for (Binding binding : callbackService.getBindings()) {
-                // first look for a callback binding whose name matches the reference binding name
-            	if (refBinding.getName().startsWith(binding.getName())) {
-                    callbackBinding = binding;
-                    break;
-                }
-            }
-            // if no callback binding found, try again based on reference binding type
-            if (callbackBinding == null) {
-                callbackBinding = callbackService.getBinding(refBinding.getClass());
-            }
-            InterfaceContract callbackContract = callbackService.getInterfaceContract();
-            EndpointReference callbackEndpoint =
-                new EndpointReferenceImpl((RuntimeComponent)refComponent, callbackService, callbackBinding,
-                                          callbackContract);
-            wireSource.setCallbackEndpoint(callbackEndpoint);
-        }
-
-        EndpointReference wireTarget =
-            new EndpointReferenceImpl((RuntimeComponent)serviceComponent, service, serviceBinding, bindingContract);
-        
-        // TUSCANY-2029 - We should use the URI of the serviceBinding because the target may be a Component in a
-        // nested composite.
-        if (serviceBinding != null) {
-            wireTarget.setURI(serviceBinding.getURI());
-        }
-
-        RuntimeWire wire =
-            new RuntimeWireImpl(wireSource, wireTarget, interfaceContractMapper, workScheduler, wireProcessor,
-                                messageFactory, conversationManager);
-        runtimeRef.getRuntimeWires().add(wire);
-
-        return wire;
-    }
-
-    private void addImplementationProvider(RuntimeComponent component, Implementation implementation) {
-        ImplementationProviderFactory providerFactory =
-            (ImplementationProviderFactory)providerFactories.getProviderFactory(implementation.getClass());
-        if (providerFactory != null) {
-            @SuppressWarnings("unchecked")
-            ImplementationProvider implementationProvider =
-                providerFactory.createImplementationProvider(component, implementation);
-            if (implementationProvider != null) {
-                component.setImplementationProvider(implementationProvider);
-            }
-        } else {
-            throw new IllegalStateException("Provider factory not found for class: " + implementation.getClass()
-                .getName());
-        }
-        for (PolicyProviderFactory f : providerFactories.getPolicyProviderFactories()) {
-            PolicyProvider policyProvider = f.createImplementationPolicyProvider(component, implementation);
-            if (policyProvider != null) {
-                component.addPolicyProvider(policyProvider);
-            }
-        }
-        
-    }
-
-    private void removeImplementationProvider(RuntimeComponent component) {
-        component.setImplementationProvider(null);
-        component.getPolicyProviders().clear();
-    }
-
-    /**
-     * @param component
-     * @param service
-     * @param binding
-     */
-    private ServiceBindingProvider addServiceBindingProvider(RuntimeComponent component,
-                                                             RuntimeComponentService service,
-                                                             Binding binding) {
-        BindingProviderFactory providerFactory =
-            (BindingProviderFactory)providerFactories.getProviderFactory(binding.getClass());
-        if (providerFactory != null) {
-            @SuppressWarnings("unchecked")
-            ServiceBindingProvider bindingProvider =
-                providerFactory.createServiceBindingProvider((RuntimeComponent)component,
-                                                             (RuntimeComponentService)service,
-                                                             binding);
-            if (bindingProvider != null) {
-                ((RuntimeComponentService)service).setBindingProvider(binding, bindingProvider);
-            }
-            for (PolicyProviderFactory f : providerFactories.getPolicyProviderFactories()) {
-                PolicyProvider policyProvider = f.createServicePolicyProvider(component, service, binding);
-                if (policyProvider != null) {
-                    service.addPolicyProvider(binding, policyProvider);
-                }
-            }
-            return bindingProvider;
-        } else {
-            throw new IllegalStateException("Provider factory not found for class: " + binding.getClass().getName());
-        }
-    }
-
-    private void removeServiceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentService service,
-                                              Binding binding) {
-        service.setBindingProvider(binding, null);
-        for (Binding b : service.getBindings()) {
-            List<PolicyProvider> pps = service.getPolicyProviders(b);
-            if (pps != null) {
-                pps.clear();
-            }
-        }
-    }
-
-    private void removeReferenceBindingProvider(RuntimeComponent component,
-                                                RuntimeComponentReference reference,
-                                                Binding binding) {
-        reference.setBindingProvider(binding, null);
-        for (Binding b : reference.getBindings()) {
-            List<PolicyProvider> pps = reference.getPolicyProviders(b);
-            if (pps != null) {
-                pps.clear();
-            }
-        }
-    }
-
-    public void start(Composite composite) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Starting composite: " + composite.getName());
-        }
-        for (Component component : composite.getComponents()) {
-            start(component);
-        }
-    }
-
-    public void stop(Composite composite) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Stopping composite: " + composite.getName());
-        }
-        for (final Component component : composite.getComponents()) {
-            stop(component);
-        }
-    }
-
-    public void start(Component component) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Starting component: " + component.getURI());
-        }
-        RuntimeComponent runtimeComponent = ((RuntimeComponent)component);
-        if(runtimeComponent.isStarted()) {
-        	return;
-        }
-        
-        configureComponentContext(runtimeComponent);
-
-        for (ComponentReference reference : component.getReferences()) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Starting component reference: " + component.getURI() + "#" + reference.getName());
-            }
-            RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
-            runtimeRef.setComponent(runtimeComponent);
-            
-            for (Endpoint endpoint : reference.getEndpoints()) {
-                final EndpointResolver endpointResolver = runtimeRef.getEndpointResolver(endpoint);
-                if (endpointResolver != null) {
-                    // Allow endpoint resolvers to do any startup reference manipulation
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            endpointResolver.start();
-                            return null;
-                          }
-                    });                       
-                }
-            }
-            
-            for (Binding binding : reference.getBindings()) {
-                final ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(binding);
-                if (bindingProvider != null) {
-                    // Allow bindings to add shutdown hooks. Requires RuntimePermission shutdownHooks in policy. 
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            bindingProvider.start();
-                            return null;
-                          }
-                    });                       
-                }
-            }
-        }
-
-        for (ComponentService service : component.getServices()) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Starting component service: " + component.getURI() + "#" + service.getName());
-            }
-            RuntimeComponentService runtimeService = (RuntimeComponentService)service;
-            for (Binding binding : service.getBindings()) {
-                final ServiceBindingProvider bindingProvider = runtimeService.getBindingProvider(binding);
-                if (bindingProvider != null) {
-                    // bindingProvider.start();
-                    // Allow bindings to add shutdown hooks. Requires RuntimePermission shutdownHooks in policy. 
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            bindingProvider.start();
-                            return null;
-                          }
-                    });                       
-                }
-            }
-        }
-
-        Implementation implementation = component.getImplementation();
-        if (implementation instanceof Composite) {
-            start((Composite)implementation);
-        } else {
-            ImplementationProvider implementationProvider = runtimeComponent.getImplementationProvider();
-            if (implementationProvider != null) {
-                implementationProvider.start();
-            }
-        }
-
-        if (component instanceof ScopedRuntimeComponent) {
-            ScopedRuntimeComponent scopedRuntimeComponent = (ScopedRuntimeComponent)component;
-            if (scopedRuntimeComponent.getScopeContainer() != null) {
-                scopedRuntimeComponent.getScopeContainer().start();
-            }
-        }
-
-        runtimeComponent.setStarted(true);
-    }
-
-    /**
-     * @param runtimeComponent
-     */
-    public void configureComponentContext(RuntimeComponent runtimeComponent) {
-        RuntimeComponentContext componentContext =
-            new ComponentContextImpl(this, assemblyFactory, proxyFactory, interfaceContractMapper,
-                                     requestContextFactory, javaInterfaceFactory, runtimeComponent);
-        runtimeComponent.setComponentContext(componentContext);
-    }
-
-    /**
-     * Stop a component
-     */
-    public void stop(Component component) {
-    	if (!((RuntimeComponent)component).isStarted()) {
-    		return;
-        }
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Stopping component: " + component.getURI());
-        }
-        for (ComponentService service : component.getServices()) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Stopping component service: " + component.getURI() + "#" + service.getName());
-            }
-            for (Binding binding : service.getBindings()) {
-                final ServiceBindingProvider bindingProvider = ((RuntimeComponentService)service).getBindingProvider(binding);
-                if (bindingProvider != null) {
-                    // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            bindingProvider.stop();
-                            return null;
-                          }
-                    });                       
-                }
-            }
-        }
-        for (ComponentReference reference : component.getReferences()) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Starting component reference: " + component.getURI() + "#" + reference.getName());
-            }
-            RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
-            
-            for (Binding binding : reference.getBindings()) {
-                final ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(binding);
-                if (bindingProvider != null) {
-                    // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            bindingProvider.stop();
-                            return null;
-                          }
-                    });                       
-                }
-            } 
-            
-            for (Endpoint endpoint : reference.getEndpoints()) {
-                final EndpointResolver endpointResolver = runtimeRef.getEndpointResolver(endpoint);
-                if (endpointResolver != null) {
-                    // Allow endpoint resolvers to do any shutdown reference manipulation
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            endpointResolver.stop();
-                            return null;
-                          }
-                    });                       
-                }
-            }             
-        }
-        Implementation implementation = component.getImplementation();
-        if (implementation instanceof Composite) {
-            stop((Composite)implementation);
-        } else {
-            final ImplementationProvider implementationProvider = ((RuntimeComponent)component).getImplementationProvider();
-            if (implementationProvider != null) {
-                // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        implementationProvider.stop();
-                        return null;
-                      }
-                });                       
-            }
-        }
-
-        if (component instanceof ScopedRuntimeComponent) {
-            ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
-            if (runtimeComponent.getScopeContainer() != null && 
-            		runtimeComponent.getScopeContainer().getLifecycleState() != ScopeContainer.STOPPED) {
-                runtimeComponent.getScopeContainer().stop();
-            }
-        }
-
-        ((RuntimeComponent)component).setStarted(false);
-    }
-
-    /**
-     * Get the effective interface contract for a reference binding
-     * 
-     * @param reference
-     * @param binding
-     * @return
-     */
-    private InterfaceContract getInterfaceContract(ComponentReference reference, Binding binding) {
-        InterfaceContract interfaceContract = reference.getInterfaceContract();
-        ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
-        if (provider != null) {
-            InterfaceContract bindingContract = provider.getBindingInterfaceContract();
-            if (bindingContract != null) {
-                interfaceContract = bindingContract;
-            }
-        }
-        return interfaceContract.makeUnidirectional(false);
-    }
-
-    /**
-     * Remove the runtime wires for a reference binding
-     * @param reference
-     */
-    private void removeReferenceWires(ComponentReference reference) {
-        if (!(reference instanceof RuntimeComponentReference)) {
-            return;
-        }
-        // [rfeng] Comment out the following statements to avoid the on-demand activation
-        // RuntimeComponentReference runtimeRef = (RuntimeComponentReference)reference;
-        // runtimeRef.getRuntimeWires().clear();
-    }
-
-    /**
-     * Get the effective interface contract for the service binding
-     * 
-     * @param service
-     * @param binding
-     * @return
-     */
-    private InterfaceContract getInterfaceContract(ComponentService service, Binding binding) {
-        InterfaceContract interfaceContract = service.getInterfaceContract();
-
-        ServiceBindingProvider provider = ((RuntimeComponentService)service).getBindingProvider(binding);
-        if (provider != null) {
-            InterfaceContract bindingContract = provider.getBindingInterfaceContract();
-            if (bindingContract != null) {
-                interfaceContract = bindingContract;
-            }
-        }
-        return interfaceContract.makeUnidirectional(false);
-    }
-
-    /**
-     * Remove runtime wires for a service binding
-     * 
-     * @param component
-     * @param service
-     */
-    private void removeServiceWires(ComponentService service) {
-        if (!(service instanceof RuntimeComponentService)) {
-            return;
-        }
-        RuntimeComponentService runtimeService = (RuntimeComponentService)service;
-        runtimeService.getRuntimeWires().clear();
-    }
-
-    /**
-     * Create a service wire for a forward call or a callback
-     * @param service
-     * @param serviceBinding
-     * @param reference
-     * @param component
-     * @param referenceBinding
-     */
-    private RuntimeWire addServiceWire(Component serviceComponent, ComponentService service, Binding serviceBinding) {
-        if (!(service instanceof RuntimeComponentService)) {
-            return null;
-        }
-        RuntimeComponentService runtimeService = (RuntimeComponentService)service;
-
-        // FIXME: [rfeng] We might need a better way to get the impl interface contract
-        Service targetService = service.getService();
-        if (targetService == null) {
-            targetService = service;
-        }
-        InterfaceContract targetContract = targetService.getInterfaceContract().makeUnidirectional(false);
-
-        InterfaceContract sourceContract = getInterfaceContract(service, serviceBinding);
-
-        EndpointReference wireSource = new EndpointReferenceImpl(null, null, serviceBinding, sourceContract);
-
-        EndpointReference wireTarget =
-            new EndpointReferenceImpl((RuntimeComponent)serviceComponent, (RuntimeComponentService)service,
-                                      serviceBinding, targetContract);
-
-        RuntimeWire wire =
-            new RuntimeWireImpl(wireSource, wireTarget, interfaceContractMapper, workScheduler, wireProcessor,
-                                messageFactory, conversationManager);
-        runtimeService.getRuntimeWires().add(wire);
-
-        return wire;
-    }
-
-    public void activate(RuntimeComponent component, RuntimeComponentService service) {
-        if (service.getService() == null) {
-            if (logger.isLoggable(Level.WARNING)) {
-                logger.warning("Skipping component service not defined in the component type: " + component.getURI()
-                    + "#"
-                    + service.getName());
-            }
-            return;
-        }
-        if (service.getService() instanceof CompositeService) {
-            return;
-        }
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Activating component service: " + component.getURI() + "#" + service.getName());
-        }
-
-        for (Binding binding : service.getBindings()) {
-            addServiceBindingProvider(component, service, binding);
-            addServiceWire(component, service, binding);
-        }
-    }
-
-    public void deactivate(RuntimeComponent component, RuntimeComponentService service) {
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Deactivating component service: " + component.getURI() + "#" + service.getName());
-        }
-        removeServiceWires(service);
-        for (Binding binding : service.getBindings()) {
-            removeServiceBindingProvider(component, service, binding);
-        }
-    }
-
-    private void addScopeContainer(Component component) {
-        if (!(component instanceof ScopedRuntimeComponent)) {
-            return;
-        }
-        ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
-        ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(runtimeComponent);
-        if (scopeContainer != null && scopeContainer.getScope() == Scope.CONVERSATION) {
-            conversationManager.addListener((ConversationalScopeContainer)scopeContainer);
-        }
-        runtimeComponent.setScopeContainer(scopeContainer);
-    }
-
-    private void removeScopeContainer(Component component) {
-        if (!(component instanceof ScopedRuntimeComponent)) {
-            return;
-        }
-        ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
-        ScopeContainer scopeContainer = runtimeComponent.getScopeContainer();
-        if(scopeContainer != null && scopeContainer.getScope() == Scope.CONVERSATION) {
-            conversationManager.removeListener((ConversationalScopeContainer) scopeContainer);
-        }        
-        runtimeComponent.setScopeContainer(null);
-    }
-    
-    public void activateComponent(Component component)
-            throws ActivationException {
-        try {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Activating component: " + component.getURI());
-            }
-
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                activate((Composite) implementation);
-            } else if (implementation != null) {
-                addImplementationProvider((RuntimeComponent) component,
-                        implementation);
-                addScopeContainer(component);
-            }
-
-            for (ComponentService service : component.getServices()) {
-                activate((RuntimeComponent) component,
-                        (RuntimeComponentService) service);
-            }
-
-            for (ComponentReference reference : component.getReferences()) {
-                activate((RuntimeComponent) component,
-                        (RuntimeComponentReference) reference);
-            }
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }
-
-    public void deactivateComponent(Component component)
-            throws ActivationException {
-        try {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Deactivating component: " + component.getURI());
-            }
-            for (ComponentService service : component.getServices()) {
-                deactivate((RuntimeComponent) component,
-                        (RuntimeComponentService) service);
-            }
-
-            for (ComponentReference reference : component.getReferences()) {
-                deactivate((RuntimeComponent) component,
-                        (RuntimeComponentReference) reference);
-            }
-
-            Implementation implementation = component.getImplementation();
-            if (implementation instanceof Composite) {
-                deactivate((Composite) implementation);
-            } else if (implementation != null) {
-                removeImplementationProvider((RuntimeComponent) component);
-                removeScopeContainer(component);
-            }
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }    
-
-    public void activate(Composite composite) throws ActivationException {
-        try {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Activating composite: " + composite.getName());
-            }
-            for (Component component : composite.getComponents()) {
-                if (logger.isLoggable(Level.FINE)) {
-                    logger.fine("Activating component: " + component.getURI());
-                }
-
-                Implementation implementation = component.getImplementation();
-                if (implementation instanceof Composite) {
-                    activate((Composite)implementation);
-                } else if (implementation != null) {
-                    addImplementationProvider((RuntimeComponent)component, implementation);
-                    addScopeContainer(component);
-                }
-
-                for (ComponentService service : component.getServices()) {
-                    activate((RuntimeComponent)component, (RuntimeComponentService)service);
-                }
-
-                for (ComponentReference reference : component.getReferences()) {
-                    activate((RuntimeComponent)component, (RuntimeComponentReference)reference);
-                }
-            }
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }
-
-    public void deactivate(Composite composite) throws ActivationException {
-        try {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.fine("Deactivating composite: " + composite.getName());
-            }
-            for (Component component : composite.getComponents()) {
-                if (logger.isLoggable(Level.FINE)) {
-                    logger.fine("Deactivating component: " + component.getURI());
-                }
-                for (ComponentService service : component.getServices()) {
-                    deactivate((RuntimeComponent)component, (RuntimeComponentService)service);
-                }
-
-                for (ComponentReference reference : component.getReferences()) {
-                    deactivate((RuntimeComponent)component, (RuntimeComponentReference)reference);
-                }
-
-                Implementation implementation = component.getImplementation();
-                if (implementation instanceof Composite) {
-                    deactivate((Composite)implementation);
-                } else if (implementation != null) {
-                    removeImplementationProvider((RuntimeComponent)component);
-                    removeScopeContainer(component);
-                }
-            }
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }
-
-    /**
-     * @return the referenceHelper
-     */
-    public ComponentContextHelper getComponentContextHelper() {
-        return componentContextHelper;
-    }
-
-    /**
-     * @return the proxyFactory
-     */
-    public ProxyFactory getProxyFactory() {
-        return proxyFactory;
-    }
-
-    /**
-     * @return the domainComposite
-     */
-    public Composite getDomainComposite() {
-        return domainComposite;
-    }
-
-    /**
-     * @param domainComposite the domainComposite to set
-     */
-    public void setDomainComposite(Composite domainComposite) {
-        this.domainComposite = domainComposite;
-    }
-
-    public Component resolve(String componentURI) {
-        for (Composite composite : domainComposite.getIncludes()) {
-            Component component = resolve(composite, componentURI);
-            if (component != null) {
-                return component;
-            }
-        }
-        return null;
-    }
-
-    public Component resolve(Composite composite, String componentURI) {
-        for (Component component : composite.getComponents()) {
-            String uri = component.getURI();
-            if (uri.equals(componentURI)) {
-                return component;
-            }
-            if (componentURI.startsWith(uri)) {
-                Implementation implementation = component.getImplementation();
-                if (!(implementation instanceof Composite)) {
-                    return null;
-                }
-                return resolve((Composite)implementation, componentURI);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return the javaInterfaceFactory
-     */
-    public JavaInterfaceFactory getJavaInterfaceFactory() {
-        return javaInterfaceFactory;
-    }
-
-    /**
-     * @return the conversationManager
-     */
-    public ConversationManager getConversationManager() {
-        return conversationManager;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
deleted file mode 100644
index 78096b20ab..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.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.core.assembly;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EndpointReferenceImpl implements EndpointReference {
-    private RuntimeComponent component;
-    private Contract contract;
-    private Binding binding;
-    private InterfaceContract interfaceContract;
-    private String uri;
-    private EndpointReference callbackEndpoint;
-    private ReferenceParameters parameters = new ReferenceParametersImpl();
-
-    /**
-     * @param component
-     * @param contract
-     * @param binding
-     * @param interfaceContract
-     */
-    public EndpointReferenceImpl(RuntimeComponent component,
-                                 Contract contract,
-                                 Binding binding,
-                                 InterfaceContract interfaceContract) {
-        super();
-        this.component = component;
-        this.contract = contract;
-        this.binding = binding;
-        this.interfaceContract = interfaceContract;
-        this.uri = (component != null ? component.getURI() : "") + '/' +
-                   (contract != null ? contract.getName() : "");
-    }
-
-    /**
-     * @param uri
-     */
-    public EndpointReferenceImpl(String uri) {
-        super();
-        this.uri = uri;
-    }
-
-    public Binding getBinding() {
-        return binding;
-    }
-
-    public void setBinding(Binding binding) {
-        this.binding = binding;
-    }
-
-    public RuntimeComponent getComponent() {
-        return component;
-    }
-
-    public void setComponent(RuntimeComponent component) {
-        this.component = component;
-    }
-
-    public Contract getContract() {
-        return contract;
-    }
-
-    public void setContract(Contract contract) {
-        this.contract = contract;
-    }
-
-    public InterfaceContract getInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public void setInterfaceContract(InterfaceContract interfaceContract) {
-        this.interfaceContract = interfaceContract;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public EndpointReference getCallbackEndpoint() {
-        return callbackEndpoint;
-    }
-
-    public void setCallbackEndpoint(EndpointReference callbackEndpoint) {
-        this.callbackEndpoint = callbackEndpoint;
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((uri == null) ? 0 : uri.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 EndpointReferenceImpl other = (EndpointReferenceImpl)obj;
-        if (uri == null) {
-            if (other.uri != null) {
-                return false;
-            }
-        } else if (!uri.equals(other.uri)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        EndpointReferenceImpl copy = (EndpointReferenceImpl)super.clone();
-        /* [nash] no need to copy callback endpoint
-        if (callbackEndpoint != null) {
-            copy.callbackEndpoint = (EndpointReference)callbackEndpoint.clone();
-        }
-        */
-        if (parameters != null) {
-            copy.parameters = (ReferenceParameters)parameters.clone();
-        }
-        return copy;
-    }
-
-    /**
-     * @return the parameters
-     */
-    public ReferenceParameters getReferenceParameters() {
-        return parameters;
-    }
-
-    /**
-     * @param parameters the parameters to set
-     */
-    public void setReferenceParameters(ReferenceParameters parameters) {
-        this.parameters = parameters;
-    }
-
-    public void mergeEndpoint(EndpointReference epr) {
-        this.component = epr.getComponent();
-        this.contract = epr.getContract();
-        this.binding = epr.getBinding();
-        this.interfaceContract = epr.getInterfaceContract();
-        this.uri = epr.getURI();
-        this.callbackEndpoint = epr.getCallbackEndpoint();
-    }
-   
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
deleted file mode 100644
index 87dbf0eeac..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.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.core.assembly;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-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.Message;
-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;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceUnavailableException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EndpointWireImpl implements RuntimeWire {
-
-    private Endpoint endpoint;
-    private CompositeActivatorImpl compositeActivator;
-    
-    private EndpointResolver endpointResolver;
-    private EndpointReference source;
-    private RuntimeWire wire;
-
-    /**
-     * @param endpoint
-     */
-    public EndpointWireImpl(Endpoint endpoint, CompositeActivator compositeActivator) {
-        super();
-        this.endpoint = endpoint;
-        // TODO - improve the SPI to get rid of this cast
-        this.compositeActivator = (CompositeActivatorImpl)compositeActivator;
-        
-        // store source configuration as we have most of this now. We don't though know what the 
-        // target is yet. 
-        Reference componentTypeRef = endpoint.getSourceComponentReference().getReference();
-        InterfaceContract sourceContract =
-            componentTypeRef == null ? endpoint.getSourceComponentReference().getInterfaceContract() : componentTypeRef.getInterfaceContract();
-        sourceContract = sourceContract.makeUnidirectional(false);
-
-        source = new EndpointReferenceImpl((RuntimeComponent)endpoint.getSourceComponent(), 
-                                            endpoint.getSourceComponentReference(), 
-                                            null, 
-                                            sourceContract);
-        
-        RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)endpoint.getSourceComponentReference());
-        endpointResolver = runtimeRef.getEndpointResolver(endpoint);
-        
-    }
-
-    public synchronized List<InvocationChain> getInvocationChains() {
-        // where late binding happens. Find the endpoint provider and
-        // ask it to do the endpoint resolution.
-        if (endpoint.isUnresolved()){
-            
-            // this method should locate a viable target service and complete the 
-            // endpoint configuration
-            endpointResolver.resolve();
-            
-            if (endpoint.isUnresolved()){
-                throw new ServiceUnavailableException("Unable to resolve service for component: " +
-                        endpoint.getSourceComponent().getName() +
-                        " reference: " + 
-                        endpoint.getSourceComponentReference().getName() +
-                        " target: " + 
-                        endpoint.getTargetName());
-            } 
-        }
-        
-        if (wire == null){           
-            RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)endpoint.getSourceComponentReference());
-            
-            // add the resolved binding into the reference
-            runtimeRef.getBindings().add(endpoint.getSourceBinding());
-            
-            // add a binding provider into the reference for the resolved binding 
-            compositeActivator.addReferenceBindingProviderForEndpoint(endpoint);
-            
-            // extract the binding provider that has been created
-            ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(endpoint.getSourceBinding());
-            
-            // start the binding provider  
-            bindingProvider.start();
-            
-            // create the wire
-            compositeActivator.addReferenceWireForEndpoint(endpoint);
-            
-            // extract the wire that has been created
-            wire = runtimeRef.getRuntimeWire(endpoint.getSourceBinding());
-        }            
-
-        return wire.getInvocationChains();
-    }
-
-    public InvocationChain getInvocationChain(Operation operation) {
-        if (wire ==null){
-            return null;
-        } else {
-            return wire.getInvocationChain(operation);
-        }
-    }
-
-    public Object invoke(Operation operation, Object[] args) throws InvocationTargetException {
-        // not called as the endpoint wire only appears on the reference side
-        return null;
-    }
-
-    public Object invoke(Operation operation, Message msg) throws InvocationTargetException {
-        // not called as the endpoint wire only appears on the reference side
-        return null;
-    }
-
-
-    public EndpointReference getSource() {
-        return source;
-    }
-
-    public EndpointReference getTarget() {
-        return null;
-    }
-
-    public void setTarget(EndpointReference target) {
-    }
-
-    public void rebuild() {
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        EndpointWireImpl copy = (EndpointWireImpl)super.clone();
-        return copy;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
deleted file mode 100644
index c82543c4ca..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.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 org.apache.tuscany.sca.core.assembly;
-
-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;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-
-/**
- * Artifact processor for reference parameters.
- * 
- * @version $Rev$ $Date$
- */
-public class ReferenceParameterProcessor implements StAXArtifactProcessor<ReferenceParameters> {
-    private static final QName REFERENCE_PARAMETERS =
-        new QName("http://tuscany.apache.org/xmlns/sca/1.0", "referenceParameters", "tuscany");
-    
-    /**
-     * Constructs a new processor.
-     * 
-     * @param modelFactories
-     */
-    public ReferenceParameterProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#getArtifactType()
-     */
-    public QName getArtifactType() {
-        return REFERENCE_PARAMETERS;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#read(javax.xml.stream.XMLStreamReader)
-     */
-    public ReferenceParameters read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        ReferenceParameters parameters = new ReferenceParametersImpl();
-        parameters.setConversationID(reader.getAttributeValue(null, "conversationID"));
-        parameters.setCallbackID(reader.getAttributeValue(null, "callbackID"));
-        return parameters;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor#write(java.lang.Object, javax.xml.stream.XMLStreamWriter)
-     */
-    public void write(ReferenceParameters model, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        writer.writeStartElement(REFERENCE_PARAMETERS.getPrefix(),
-                                 REFERENCE_PARAMETERS.getLocalPart(),
-                                 REFERENCE_PARAMETERS.getNamespaceURI());
-        writer.writeNamespace(REFERENCE_PARAMETERS.getPrefix(), REFERENCE_PARAMETERS.getNamespaceURI());
-        if (model.getConversationID() != null) {
-            writer.writeAttribute("conversationID", model.getConversationID().toString());
-        }
-        if (model.getCallbackID() != null) {
-            writer.writeAttribute("callbackID", model.getCallbackID().toString());
-        }
-        writer.writeEndElement();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.ArtifactProcessor#getModelType()
-     */
-    public Class<ReferenceParameters> getModelType() {
-        return ReferenceParameters.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.contribution.processor.ArtifactProcessor#resolve(java.lang.Object, org.apache.tuscany.sca.contribution.resolver.ModelResolver)
-     */
-    public void resolve(ReferenceParameters model, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
deleted file mode 100644
index 14a5f565fc..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.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.core.assembly;
-
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReferenceParametersImpl implements ReferenceParameters {
-    private Object callbackID;
-    private Object conversationID;
-    private EndpointReference callbackReference;
-    private Object callbackObjectID;
-    
-    /**
-     * @return the callbackID
-     */
-    public Object getCallbackID() {
-        return callbackID;
-    }
-    /**
-     * @param callbackID the callbackID to set
-     */
-    public void setCallbackID(Object callbackID) {
-        this.callbackID = callbackID;
-    }
-    /**
-     * @return the conversationID
-     */
-    public Object getConversationID() {
-        return conversationID;
-    }
-    /**
-     * @param conversationID the conversationID to set
-     */
-    public void setConversationID(Object conversationID) {
-        this.conversationID = conversationID;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.runtime.ReferenceParameters#getCallbackReference()
-     */
-    public EndpointReference getCallbackReference() {
-        return callbackReference;
-    }
-    /**
-     * @see org.apache.tuscany.sca.runtime.ReferenceParameters#setCallback(java.lang.Object)
-     */
-    public void setCallbackReference(EndpointReference callback) {
-        this.callbackReference = callback;
-    }
-    
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    /**
-     * @return the callbackObjectID
-     */
-    public Object getCallbackObjectID() {
-        return callbackObjectID;
-    }
-    /**
-     * @param callbackObjectID the callbackObjectID to set
-     */
-    public void setCallbackObjectID(Object callbackObjectID) {
-        this.callbackObjectID = callbackObjectID;
-    }
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((callbackID == null) ? 0 : callbackID.hashCode());
-        result = prime * result + ((callbackObjectID == null) ? 0 : callbackObjectID.hashCode());
-        result = prime * result + ((callbackReference == null) ? 0 : callbackReference.hashCode());
-        result = prime * result + ((conversationID == null) ? 0 : conversationID.hashCode());
-        return result;
-    }
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (!(obj instanceof ReferenceParametersImpl))
-            return false;
-        final ReferenceParametersImpl other = (ReferenceParametersImpl)obj;
-        if (callbackID == null) {
-            if (other.callbackID != null)
-                return false;
-        } else if (!callbackID.equals(other.callbackID))
-            return false;
-        if (callbackObjectID == null) {
-            if (other.callbackObjectID != null)
-                return false;
-        } else if (!callbackObjectID.equals(other.callbackObjectID))
-            return false;
-        if (callbackReference == null) {
-            if (other.callbackReference != null)
-                return false;
-        } else if (!callbackReference.equals(other.callbackReference))
-            return false;
-        if (conversationID == null) {
-            if (other.conversationID != null)
-                return false;
-        } else if (!conversationID.equals(other.conversationID))
-            return false;
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
deleted file mode 100644
index b174dea6ce..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.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.core.assembly;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.DefaultAssemblyFactory;
-
-/**
- * The runtime version of assembly factory
- * @version $Rev$ $Date$
- */
-public class RuntimeAssemblyFactory extends DefaultAssemblyFactory implements AssemblyFactory {
-   
-    public RuntimeAssemblyFactory() {
-        super();
-    }
-
-    @Override
-    public Component createComponent() {
-        return new RuntimeComponentImpl();
-    }
-
-    @Override
-    public ComponentReference createComponentReference() {
-        return new RuntimeComponentReferenceImpl();
-    }
-
-    @Override
-    public ComponentService createComponentService() {
-        return new RuntimeComponentServiceImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
deleted file mode 100644
index be594994cc..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.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.core.assembly;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.impl.ComponentImpl;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ResolverExtension;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RuntimeComponentImpl extends ComponentImpl implements RuntimeComponent,
-                                              ScopedRuntimeComponent, ResolverExtension {
-    protected RuntimeComponentContext componentContext;
-    protected ImplementationProvider implementationProvider;
-    protected List<PolicyProvider> policyProviders = new ArrayList<PolicyProvider>();
-    protected ScopeContainer scopeContainer;
-    protected boolean started;
-    protected ModelResolver modelResolver;
-
-    /**
-     */
-    public RuntimeComponentImpl() {
-        super();
-    }
-
-    public ImplementationProvider getImplementationProvider() {
-        return implementationProvider;
-    }
-
-    public void setImplementationProvider(ImplementationProvider provider) {
-        this.implementationProvider = provider;
-    }
-
-    public ScopeContainer getScopeContainer() {
-        return scopeContainer;
-    }
-
-    public void setScopeContainer(ScopeContainer scopeContainer) {
-        this.scopeContainer = scopeContainer;
-    }
-    
-    public boolean isStarted() {
-        return started;
-    }
-
-    public void setStarted(boolean started) {
-        this.started = started;
-    }
-
-    /**
-     * @return the componentContext
-     */
-    public RuntimeComponentContext getComponentContext() {
-        return componentContext;
-    }
-
-    /**
-     * @param componentContext the componentContext to set
-     */
-    public void setComponentContext(RuntimeComponentContext componentContext) {
-        this.componentContext = componentContext;
-    }
-
-    public void addPolicyProvider(PolicyProvider policyProvider) {
-        policyProviders.add(policyProvider);
-    }
-
-    public List<PolicyProvider> getPolicyProviders() {
-        return policyProviders;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-    
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
deleted file mode 100644
index b840de42a8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.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.core.assembly;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.impl.ComponentReferenceImpl;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-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.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Implementation of a Component Reference.
- *
- * @version $Rev$ $Date$
- */
-public class RuntimeComponentReferenceImpl extends ComponentReferenceImpl implements RuntimeComponentReference {
-    private ArrayList<RuntimeWire> wires;
-    private HashMap<Binding, ReferenceBindingProvider> bindingProviders =
-        new HashMap<Binding, ReferenceBindingProvider>();
-    private HashMap<Endpoint, EndpointResolver> endpointResolvers =
-        new HashMap<Endpoint, EndpointResolver>();    
-    private HashMap<Binding, List<PolicyProvider>> policyProviders = new HashMap<Binding, List<PolicyProvider>>();
-
-    private RuntimeComponent component;
-
-    public RuntimeComponentReferenceImpl() {
-        super();
-    }
-
-    public synchronized List<RuntimeWire> getRuntimeWires() {
-        if (wires == null) {
-            wires = new ArrayList<RuntimeWire>();
-            component.getComponentContext().start(this);
-        }
-        return wires;
-    }
-
-    public RuntimeWire getRuntimeWire(Binding binding) {
-        for (RuntimeWire wire : getRuntimeWires()) {
-            if (wire.getSource().getBinding() == binding) {
-                return wire;
-            }
-        }
-        return null;
-    }
-
-    public ReferenceBindingProvider getBindingProvider(Binding binding) {
-        return bindingProviders.get(binding);
-    }
-
-    public void setBindingProvider(Binding binding, ReferenceBindingProvider bindingProvider) {
-        bindingProviders.put(binding, bindingProvider);
-    }
-    
-    public EndpointResolver getEndpointResolver(Endpoint endpoint){
-        return endpointResolvers.get(endpoint);
-    }
-    
-    public void setEndpointResolver(Endpoint endpoint, EndpointResolver endpointResolver){
-        endpointResolvers.put(endpoint, endpointResolver);
-    }
-
-    public Invoker getInvoker(Binding binding, Operation operation) {
-        RuntimeWire wire = getRuntimeWire(binding);
-        if (wire == null) {
-            return null;
-        }
-        InvocationChain chain = wire.getInvocationChain(operation);
-        return chain == null ? null : chain.getHeadInvoker();
-    }
-
-    /**
-     * @return the component
-     */
-    public RuntimeComponent getComponent() {
-        return component;
-    }
-
-    /**
-     * @param component the component to set
-     */
-    public void setComponent(RuntimeComponent component) {
-        this.component = component;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.assembly.impl.ComponentReferenceImpl#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        RuntimeComponentReferenceImpl ref = (RuntimeComponentReferenceImpl)super.clone();
-        ref.wires = null;
-        ref.bindingProviders = new HashMap<Binding, ReferenceBindingProvider>();
-        ref.policyProviders = new HashMap<Binding, List<PolicyProvider>>();
-        return ref;
-    }
-
-    public void addPolicyProvider(Binding binding, PolicyProvider policyProvider) {
-        List<PolicyProvider> providers = policyProviders.get(binding);
-        if (providers == null) {
-            providers = new ArrayList<PolicyProvider>();
-            policyProviders.put(binding, providers);
-        }
-        providers.add(policyProvider);
-    }
-
-    public List<PolicyProvider> getPolicyProviders(Binding binding) {
-        return policyProviders.get(binding);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
deleted file mode 100644
index 14b38fdd73..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.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.core.assembly;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.impl.ComponentServiceImpl;
-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.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Implementation of a Component Service.
- *
- * @version $Rev$ $Date$
- */
-public class RuntimeComponentServiceImpl extends ComponentServiceImpl implements RuntimeComponentService {
-    private ArrayList<RuntimeWire> wires = new ArrayList<RuntimeWire>();
-    private ArrayList<RuntimeWire> callbackWires = new ArrayList<RuntimeWire>();
-    private HashMap<Binding, ServiceBindingProvider> bindingProviders = new HashMap<Binding, ServiceBindingProvider>();
-    private HashMap<Binding, List<PolicyProvider>> policyProviders = new HashMap<Binding, List<PolicyProvider>>();
-
-    public RuntimeComponentServiceImpl() {
-        super();
-    }
-
-    public List<RuntimeWire> getRuntimeWires() {
-        return wires;
-    }
-
-    public RuntimeWire getRuntimeWire(Binding binding) {
-        for (RuntimeWire wire : wires) {
-            if (wire.getTarget().getBinding() == binding) {
-                return wire;
-            }
-        }
-        return null;
-    }
-
-    public RuntimeWire getRuntimeWire(Binding binding, InterfaceContract interfaceContract) {
-        RuntimeWire wire = getRuntimeWire(binding);
-        if (wire == null) {
-            return null;
-        }
-        if (interfaceContract != null && interfaceContract != wire.getSource().getInterfaceContract()) {
-            try {
-                // FIXME: [rfeng] We could avoid clone() using a better comparison of the two interface contracts
-                wire = (RuntimeWire)wire.clone();
-                wire.getSource().setInterfaceContract(interfaceContract);
-                wire.rebuild();
-            } catch (CloneNotSupportedException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        return wire;
-    }
-
-    public List<RuntimeWire> getCallbackWires() {
-        return callbackWires;
-    }
-
-    public ServiceBindingProvider getBindingProvider(Binding binding) {
-        return bindingProviders.get(binding);
-    }
-
-    public void setBindingProvider(Binding binding, ServiceBindingProvider bindingProvider) {
-        bindingProviders.put(binding, bindingProvider);
-    }
-
-    public Invoker getInvoker(Binding binding, Operation operation) {
-        return getInvoker(binding, null, operation);
-    }
-
-    public Invoker getInvoker(Binding binding, InterfaceContract interfaceContract, Operation operation) {
-        InvocationChain chain = getInvocationChain(binding, interfaceContract, operation);
-        if (chain != null) {
-            return chain.getHeadInvoker();
-        } else {
-            return null;
-        }
-    }
-
-    public InvocationChain getInvocationChain(Binding binding, InterfaceContract interfaceContract, Operation operation) {
-        RuntimeWire wire = getRuntimeWire(binding);
-        if (wire == null) {
-            return null;
-        }
-        if (interfaceContract != null && interfaceContract != wire.getSource().getInterfaceContract()) {
-            try {
-                // FIXME: [rfeng] We could avoid clone() using a better comparison of the two interface contracts
-                wire = (RuntimeWire)wire.clone();
-                wire.getSource().setInterfaceContract(interfaceContract);
-                wire.rebuild();
-            } catch (CloneNotSupportedException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-        return wire.getInvocationChain(operation);
-    }
-
-    public InvocationChain getInvocationChain(Binding binding, Operation operation) {
-        return getInvocationChain(binding, null, operation);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.assembly.impl.ComponentServiceImpl#clone()
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        RuntimeComponentServiceImpl clone = (RuntimeComponentServiceImpl)super.clone();
-        clone.bindingProviders = (HashMap<Binding, ServiceBindingProvider>)bindingProviders.clone();
-        clone.wires = (ArrayList<RuntimeWire>)wires.clone();
-        clone.callbackWires = (ArrayList<RuntimeWire>)callbackWires.clone();
-        clone.policyProviders = (HashMap<Binding, List<PolicyProvider>>)policyProviders.clone();
-        return clone;
-    }
-
-    public void addPolicyProvider(Binding binding, PolicyProvider policyProvider) {
-        List<PolicyProvider> providers = policyProviders.get(binding);
-        if (providers == null) {
-            providers = new ArrayList<PolicyProvider>();
-            policyProviders.put(binding, providers);
-        }
-        providers.add(policyProvider);
-    }
-
-    public List<PolicyProvider> getPolicyProviders(Binding binding) {
-        return policyProviders.get(binding);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
deleted file mode 100644
index c67ead43e9..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.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.core.assembly;
-
-import java.lang.reflect.InvocationTargetException;
-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.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.invocation.InvocationChainImpl;
-import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
-import org.apache.tuscany.sca.core.invocation.RuntimeWireInvoker;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-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.invocation.Phase;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-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.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.work.WorkScheduler;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RuntimeWireImpl implements RuntimeWire {
-    private EndpointReference wireSource;
-    private EndpointReference wireTarget;
-
-    private transient RuntimeWireProcessor wireProcessor;
-    private transient InterfaceContractMapper interfaceContractMapper;
-    private transient WorkScheduler workScheduler;
-    private transient MessageFactory messageFactory;
-    private transient ConversationManager conversationManager;
-    private transient RuntimeWireInvoker invoker;
-
-    // the following is a very simple cache that avoids re-cloning a wire
-    // when consecutive callbacks to the same endpoint are made
-    private EndpointReference lastCallback;
-    private RuntimeWire cachedWire;
-    private boolean wireReserved;
-    private RuntimeWireImpl clonedFrom;
-
-    private List<InvocationChain> chains;
-
-    /**
-     * @param source
-     * @param target
-     * @param interfaceContractMapper 
-     * @param workScheduler 
-     * @param wireProcessor 
-     * @param messageFactory 
-     * @param conversationManager 
-     */
-    public RuntimeWireImpl(EndpointReference source,
-                           EndpointReference target,
-                           InterfaceContractMapper interfaceContractMapper,
-                           WorkScheduler workScheduler,
-                           RuntimeWireProcessor wireProcessor,
-                           MessageFactory messageFactory,
-                           ConversationManager conversationManager) {
-        super();
-        this.wireSource = source;
-        this.wireTarget = target;
-        this.interfaceContractMapper = interfaceContractMapper;
-        this.workScheduler = workScheduler;
-        this.wireProcessor = wireProcessor;
-        this.messageFactory = messageFactory;
-        this.conversationManager = conversationManager;
-        this.invoker = new RuntimeWireInvoker(this.messageFactory, this.conversationManager, this);
-    }
-
-    public synchronized List<InvocationChain> getInvocationChains() {
-        if (chains == null) {
-            initInvocationChains();
-        }
-        return chains;
-    }
-
-    public InvocationChain getInvocationChain(Operation operation) {
-        for (InvocationChain chain : getInvocationChains()) {
-            Operation op = null;
-            if (wireSource.getContract() != null) {
-                // Reference chain
-                op = chain.getSourceOperation();
-            } else {
-                // Service chain
-                op = chain.getTargetOperation();
-            }
-            if (interfaceContractMapper.isCompatible(operation, op, op.getInterface().isRemotable())) {
-                return chain;
-            }
-        }
-        return null;
-    }
-
-    public Object invoke(Operation operation, Object[] args) throws InvocationTargetException {
-        Message msg = messageFactory.createMessage();
-        msg.setBody(args);
-        return invoker.invoke(operation, msg);
-    }
-
-    public Object invoke(Operation operation, Message msg) throws InvocationTargetException {
-        return invoker.invoke(operation, msg);
-    }
-
-    /**
-     * Initialize the invocation chains
-     */
-    private void initInvocationChains() {
-        chains = new ArrayList<InvocationChain>();
-        InterfaceContract sourceContract = wireSource.getInterfaceContract();
-        InterfaceContract targetContract = wireTarget.getInterfaceContract();
-
-        Contract source = wireSource.getContract();
-        if (source instanceof RuntimeComponentReference) {
-            // It's the reference wire
-            RuntimeComponentReference reference = (RuntimeComponentReference)wireSource.getContract();
-            Binding refBinding = wireSource.getBinding();
-            for (Operation operation : sourceContract.getInterface().getOperations()) {
-                Operation targetOperation = interfaceContractMapper.map(targetContract.getInterface(), operation);
-                if (targetOperation == null) {
-                    throw new ServiceRuntimeException("No matching operation for " + operation.getName()
-                        + " is found in reference "
-                        + wireSource.getComponent().getURI()
-                        + "#"
-                        + reference.getName());
-                }
-                InvocationChain chain = new InvocationChainImpl(operation, targetOperation, true);
-                if (operation.isNonBlocking()) {
-                    addNonBlockingInterceptor(reference, refBinding, chain);
-                }
-                addReferenceBindingInterceptor(reference, refBinding, chain, operation);
-                chains.add(chain);
-            }
-        } else {
-            // It's the service wire
-            RuntimeComponentService service = (RuntimeComponentService)wireTarget.getContract();
-            RuntimeComponent serviceComponent = wireTarget.getComponent();
-            Binding serviceBinding = wireTarget.getBinding();
-            for (Operation operation : sourceContract.getInterface().getOperations()) {
-                Operation targetOperation = interfaceContractMapper.map(targetContract.getInterface(), operation);
-                if (targetOperation == null) {
-                    throw new ServiceRuntimeException("No matching operation for " + operation.getName()
-                        + " is found in service "
-                        + serviceComponent.getURI()
-                        + "#"
-                        + service.getName());
-                }
-                InvocationChain chain = new InvocationChainImpl(operation, targetOperation, false);
-                if (operation.isNonBlocking()) {
-                    addNonBlockingInterceptor(service, serviceBinding, chain);
-                }
-                addImplementationInterceptor(serviceComponent, service, chain, targetOperation);
-                chains.add(chain);
-            }
-        }
-        wireProcessor.process(this);
-    }
-
-    public EndpointReference getSource() {
-        return wireSource;
-    }
-
-    public EndpointReference getTarget() {
-        return wireTarget;
-    }
-
-    public void setTarget(EndpointReference target) {
-        if (this.wireTarget != target) {
-            rebuild();
-        }
-        this.wireTarget = target;
-    }
-
-    public void rebuild() {
-        this.chains = null;
-    }
-
-    /**
-     * Add the interceptor for a reference binding
-     * 
-     * @param reference
-     * @param binding
-     * @param chain
-     * @param operation
-     */
-    private void addReferenceBindingInterceptor(ComponentReference reference,
-                                                Binding binding,
-                                                InvocationChain chain,
-                                                Operation operation) {
-        ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
-        if (provider != null) {
-            Invoker invoker = provider.createInvoker(operation);
-            if (invoker != null) {
-                chain.addInvoker(invoker);
-            }
-        }
-        List<PolicyProvider> pps = ((RuntimeComponentReference)reference).getPolicyProviders(binding);
-        if (pps != null) {
-            for (PolicyProvider p : pps) {
-                Interceptor interceptor = p.createInterceptor(operation);
-                if (interceptor != null) {
-                    chain.addInterceptor(p.getPhase(), p.createInterceptor(operation));
-                }
-            }
-        }
-    }
-
-    /**
-     * Add the interceptor for a binding
-     * 
-     * @param reference
-     * @param binding
-     * @param chain
-     * @param operation
-     */
-    private void addServiceBindingInterceptor(ComponentReference service,
-                                              Binding binding,
-                                              InvocationChain chain,
-                                              Operation operation) {
-        List<PolicyProvider> pps = ((RuntimeComponentService)service).getPolicyProviders(binding);
-        if (pps != null) {
-            for (PolicyProvider p : pps) {
-                Interceptor interceptor = p.createInterceptor(operation);
-                if (interceptor != null) {
-                    chain.addInterceptor(p.getPhase(), p.createInterceptor(operation));
-                }
-            }
-        }
-    }
-
-    /**
-     * Add a non-blocking interceptor if the reference binding needs it
-     * 
-     * @param reference
-     * @param binding
-     * @param chain
-     */
-    private void addNonBlockingInterceptor(ComponentReference reference, Binding binding, InvocationChain chain) {
-        ReferenceBindingProvider provider = ((RuntimeComponentReference)reference).getBindingProvider(binding);
-        if (provider != null) {
-            boolean supportsOneWayInvocation = provider.supportsOneWayInvocation();
-            if (!supportsOneWayInvocation) {
-                chain.addInterceptor(Phase.REFERENCE, new NonBlockingInterceptor(workScheduler));
-            }
-        }
-    }
-
-    /**
-     * Add a non-blocking interceptor if the service binding needs it
-     *
-     * @param service
-     * @param binding
-     * @param chain
-     */
-    private void addNonBlockingInterceptor(ComponentService service, Binding binding, InvocationChain chain) {
-        ServiceBindingProvider provider = ((RuntimeComponentService)service).getBindingProvider(binding);
-        if (provider != null) {
-            if (!provider.supportsOneWayInvocation()) {
-                chain.addInterceptor(Phase.SERVICE, new NonBlockingInterceptor(workScheduler));
-            }
-        }
-    }
-
-    /**
-     * Add the interceptor for a component implementation
-     * 
-     * @param component
-     * @param service
-     * @param chain
-     * @param operation
-     */
-    private void addImplementationInterceptor(Component component,
-                                              ComponentService service,
-                                              InvocationChain chain,
-                                              Operation operation) {
-        ImplementationProvider provider = ((RuntimeComponent)component).getImplementationProvider();
-        if (provider != null) {
-            Invoker invoker = null;
-            invoker = provider.createInvoker((RuntimeComponentService)service, operation);
-            chain.addInvoker(invoker);
-        }
-        List<PolicyProvider> pps = ((RuntimeComponent)component).getPolicyProviders();
-        if (pps != null) {
-            for (PolicyProvider p : pps) {
-                Interceptor interceptor = p.createInterceptor(operation);
-                if (interceptor != null) {
-                    chain.addInterceptor(p.getPhase(), p.createInterceptor(operation));
-                }
-            }
-        }
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        RuntimeWireImpl copy = (RuntimeWireImpl)super.clone();
-        copy.wireSource = (EndpointReference)wireSource.clone();
-        copy.wireTarget = (EndpointReference)wireTarget.clone();
-        copy.invoker = new RuntimeWireInvoker(copy.messageFactory, copy.conversationManager, copy);
-        return copy;
-    }
-
-    /**
-     * @return the conversationManager
-     */
-    public ConversationManager getConversationManager() {
-        return conversationManager;
-    }
-
-    public synchronized RuntimeWire lookupCache(EndpointReference callback) {
-        if (lastCallback != null && callback.getURI().equals(lastCallback.getURI()) && !wireReserved) {
-            wireReserved = true;
-            return cachedWire;
-        } else {
-            return null;
-        }
-    }
-
-    public synchronized void addToCache(EndpointReference callback, RuntimeWire clonedWire) {
-        ((RuntimeWireImpl)clonedWire).setClonedFrom(this);
-        lastCallback = callback;
-        cachedWire = clonedWire;
-        wireReserved = true;
-    }
-
-    public synchronized void releaseClonedWire(RuntimeWire wire) {
-        if (cachedWire == wire) {
-            wireReserved = false;
-        }
-    }
-
-    public synchronized void releaseWire() {
-        clonedFrom.releaseClonedWire(this);
-    }
-
-    private void setClonedFrom(RuntimeWireImpl wire) {
-        clonedFrom = wire;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
deleted file mode 100644
index 5b8ad81545..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.core.context;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.UUID;
-
-import javax.xml.stream.XMLStreamReader;
-
-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.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl;
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.core.assembly.EndpointWireImpl;
-import org.apache.tuscany.sca.core.assembly.ReferenceParametersImpl;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.conversation.ConversationState;
-import org.apache.tuscany.sca.core.conversation.ExtendedConversation;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-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.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Base class for implementations of service and callback references.
- * 
- * @version $Rev$ $Date$
- * @param <B> the type of the business interface
- */
-public class CallableReferenceImpl<B> implements CallableReference<B>, Externalizable {
-    static final long serialVersionUID = -521548304761848325L;
-    protected transient CompositeActivator compositeActivator;
-    protected transient ProxyFactory proxyFactory;
-    protected transient Class<B> businessInterface;
-    protected transient Object proxy;
-
-    // if the wire targets a conversational service this holds the conversation state 
-    protected transient ConversationManager conversationManager;
-    protected transient ExtendedConversation conversation;
-    protected transient Object conversationID;
-    protected Object callbackID; // The callbackID should be serializable
-
-    protected transient RuntimeComponent component;
-    protected transient RuntimeComponentReference reference;
-    protected transient Binding binding;
-
-    protected String scdl;
-
-    private transient RuntimeComponentReference clonedRef;
-    private transient ReferenceParameters refParams;
-    private transient XMLStreamReader xmlReader;
-    
-    private transient RuntimeWire endpointWire;
-
-    /*
-     * Public constructor for Externalizable serialization/deserialization
-     */
-    public CallableReferenceImpl() {
-        super();
-    }
-
-    /*
-     * Public constructor for use by XMLStreamReader2CallableReference
-     */
-    public CallableReferenceImpl(XMLStreamReader xmlReader) throws Exception {
-        this.xmlReader = xmlReader;
-        resolve();
-    }
-
-    protected CallableReferenceImpl(Class<B> businessInterface,
-                                    RuntimeComponent component,
-                                    RuntimeComponentReference reference,
-                                    Binding binding,
-                                    ProxyFactory proxyFactory,
-                                    CompositeActivator compositeActivator) {
-        this.proxyFactory = proxyFactory;
-        this.businessInterface = businessInterface;
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-        // FIXME: The SCA Specification is not clear how we should handle multiplicity 
-        // for CallableReference
-        if (this.binding == null) {
-            this.binding = this.reference.getBinding(SCABinding.class);
-            if (this.binding == null) {
-                this.binding = this.reference.getBindings().get(0);
-            }
-        }
-
-        // FIXME: Should we normalize the componentName/serviceName URI into an absolute SCA URI in the SCA binding?
-        // sca:component1/component11/component112/service1?
-        this.compositeActivator = compositeActivator;
-        this.conversationManager = this.compositeActivator.getConversationManager();
-        initCallbackID();
-    }
-
-    public CallableReferenceImpl(Class<B> businessInterface, RuntimeWire wire, ProxyFactory proxyFactory) {
-        this.proxyFactory = proxyFactory;
-        this.businessInterface = businessInterface;
-        bind(wire);
-    }
-
-    public RuntimeWire getRuntimeWire() {
-        try {
-            resolve();
-            if (endpointWire != null){
-                return endpointWire;
-            } else if (reference != null) {
-                return reference.getRuntimeWire(binding);
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    protected void bind(RuntimeWire wire) {
-        if (wire != null) {
-            
-            if (wire instanceof EndpointWireImpl){
-                endpointWire = wire;
-            }
-            this.component = wire.getSource().getComponent();
-            this.reference = (RuntimeComponentReference)wire.getSource().getContract();
-            this.binding = wire.getSource().getBinding();
-            this.compositeActivator = ((ComponentContextImpl)component.getComponentContext()).getCompositeActivator();
-            this.conversationManager = this.compositeActivator.getConversationManager();
-            initCallbackID();
-        }
-    }
-
-    protected void initCallbackID() {
-        if (reference.getInterfaceContract().getCallbackInterface() != null) {
-            this.callbackID = createCallbackID();
-        }
-    }
-
-    public B getProxy() throws ObjectCreationException {
-        try {
-            if (proxy == null) {
-                proxy = createProxy(); 
-            }
-            return businessInterface.cast(proxy);
-        } catch (Exception e) {
-            throw new ObjectCreationException(e);
-        }
-    }
-
-	public void setProxy(Object proxy) {
-	    this.proxy = proxy;
-	}
-
-    protected Object createProxy() throws Exception {
-        return proxyFactory.createProxy(this);
-	}
-
-    public B getService() {
-        try {
-            resolve();
-            return getProxy();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Class<B> getBusinessInterface() {
-        try {
-            resolve();
-            return businessInterface;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }            
-    }
-
-    public boolean isConversational() {
-        try {
-            resolve();        
-            return reference == null ? false : reference.getInterfaceContract().getInterface().isConversational();
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Conversation getConversation() {
-        try {
-            // resolve from XML just in case this CallableReference is the result of
-            // passing a CallableReference as a parameter
-            resolve();
-            
-            if (conversation == null || conversation.getState() == ConversationState.ENDED) {
-                conversation = null;
-            }
-            return conversation;
-        
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public Object getCallbackID() {
-        try {
-            resolve();        
-            return callbackID;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }        
-    }
-
-    /**
-     * @see java.io.Externalizable#readExternal(java.io.ObjectInput)
-     */
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        final boolean hasSCDL = in.readBoolean();
-        if (hasSCDL) {
-            this.scdl = in.readUTF();
-        } else {
-            this.scdl = null;
-        }
-    }
-
-    /**
-     * @throws IOException
-     */
-    private synchronized void resolve() throws Exception {
-        if ((scdl != null || xmlReader != null) && component == null && reference == null) {
-            ComponentContextHelper componentContextHelper = ComponentContextHelper.getCurrentComponentContextHelper();
-            if (componentContextHelper != null) {
-                this.compositeActivator = ComponentContextHelper.getCurrentCompositeActivator();
-                this.conversationManager = this.compositeActivator.getConversationManager();
-                Component c;
-                if (xmlReader != null) {
-                    c = componentContextHelper.fromXML(xmlReader);
-                    xmlReader = null;  // OK to GC this now
-                } else {
-                    c = componentContextHelper.fromXML(scdl);
-                    scdl = null;  // OK to GC this now
-                }
-                this.component = (RuntimeComponent)c;
-                compositeActivator.configureComponentContext(this.component);
-                this.reference = (RuntimeComponentReference)c.getReferences().get(0);
-                this.reference.setComponent(this.component);
-                clonedRef = reference;
-                ReferenceParameters parameters = null;
-                for (Object ext : reference.getExtensions()) {
-                    if (ext instanceof ReferenceParameters) {
-                        parameters = (ReferenceParameters)ext;
-                        break;
-                    }
-                }
-                if (parameters != null) {
-                    refParams = parameters;
-                    this.callbackID = parameters.getCallbackID();
-                    attachConversation(parameters.getConversationID());
-                }
-
-                for (Binding binding : reference.getBindings()) {
-                    if (binding instanceof OptimizableBinding) {
-                        // Split up the URI
-                        final String[] splitURI = splitComponentURI(binding.getURI());
-                        final String componentURI = splitURI[0];
-                        final String serviceName = splitURI[1];
-                        
-                        // Resolve the Component
-                        final Component targetComponent = resolveComponentURI(componentURI);
-                        
-                        // Find the Service
-                        final ComponentService targetService = resolveService(serviceName, targetComponent);
-
-                        OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
-                        optimizableBinding.setTargetComponent(targetComponent);
-                        optimizableBinding.setTargetComponentService(targetService);
-                        if (targetService != null) {
-                            for (Binding serviceBinding : targetService.getBindings()) {
-                                if (serviceBinding.getClass() == binding.getClass()) {
-                                    optimizableBinding.setTargetBinding(serviceBinding);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-                // FIXME: The SCA Specification is not clear how we should handle multiplicity 
-                // for CallableReference
-                if (binding == null) {
-                    binding = reference.getBinding(SCABinding.class);
-                    if (binding == null) {
-                        binding = reference.getBindings().get(0);
-                    }
-                }
-                Interface i = reference.getInterfaceContract().getInterface();
-                if (i instanceof JavaInterface) {
-                    JavaInterface javaInterface = (JavaInterface)i;
-                    if (javaInterface.isUnresolved()) {
-                        // Allow privileged access to get ClassLoader. Requires RuntimePermission in
-                        // security policy.
-                        ClassLoader classLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                            public ClassLoader run() {
-                                return Thread.currentThread().getContextClassLoader();
-                            }
-                        });
-                        javaInterface.setJavaClass(classLoader.loadClass(javaInterface.getName()));
-                        compositeActivator.getJavaInterfaceFactory().createJavaInterface(javaInterface,
-                                                                                       javaInterface.getJavaClass());
-                        //FIXME: If the interface needs XSDs to be loaded (e.g., for static SDO),
-                        // this needs to be done here.  We usually search for XSDs in the current
-                        // contribution at resolve time.  Is it possible to locate the current
-                        // contribution at runtime?
-                        }
-                    this.businessInterface = (Class<B>)javaInterface.getJavaClass();
-                }
-                if (binding instanceof BindingBuilderExtension) {
-                    ((BindingBuilderExtension)binding).getBuilder().build(component, reference, binding, null);
-                }
-                this.proxyFactory = compositeActivator.getProxyFactory();
-            }
-        } else {
-            this.compositeActivator = ComponentContextHelper.getCurrentCompositeActivator();
-            if (this.compositeActivator != null) {
-                this.proxyFactory = this.compositeActivator.getProxyFactory();
-            }
-        }
-    }
-
-    /**
-     * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
-     */
-    public void writeExternal(ObjectOutput out) throws IOException {
-        try {
-            final String xml = toXMLString();
-            if (xml == null) {
-                out.writeBoolean(false);
-            } else {
-                out.writeBoolean(true);
-                out.writeUTF(toXMLString());
-            }
-        } catch (Exception e) {
-            // e.printStackTrace();
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    public String toXMLString() throws IOException {
-        if (reference != null) {
-            if (clonedRef == null) {
-                try {
-                    clonedRef = (RuntimeComponentReference)reference.clone();
-                } catch (CloneNotSupportedException e) {
-                    // will not happen
-                }
-            }
-            if (refParams == null) {
-                refParams = new ReferenceParametersImpl();
-               
-                // remove any existing reference parameters from the clone                
-                Object toRemove = null;
-                for (Object extension : clonedRef.getExtensions()){
-                    if (extension instanceof ReferenceParameters){
-                        toRemove = extension;
-                    }
-                }
-               
-                if (toRemove != null){
-                    clonedRef.getExtensions().remove(toRemove);
-                }
-                
-                // add the new reference parameter object
-                clonedRef.getExtensions().add(refParams);
-            }
-            refParams.setCallbackID(callbackID);
-            if (conversation != null){
-                refParams.setConversationID(conversation.getConversationID());
-            }
-            return ((CompositeActivatorImpl)compositeActivator).getComponentContextHelper()
-                    .toXML(component, clonedRef);
-        } else { 
-            return scdl;
-        }
-    }
-
-    /**
-     * Create a callback id
-     * 
-     * @return the callback id
-     */
-    private String createCallbackID() {
-        return UUID.randomUUID().toString();
-    }
-
-    public void attachCallbackID(Object callbackID) {
-        this.callbackID = callbackID;
-    }
-
-    public void attachConversationID(Object conversationID) {
-        this.conversationID = conversationID;
-    }
-    
-    public void attachConversation(ExtendedConversation conversation) {
-        this.conversation = conversation;
-    }
-
-    public void attachConversation(Object conversationID) {
-        if (conversationID != null) {
-            ExtendedConversation conversation = conversationManager.getConversation(conversationID);
-            if (conversation == null){
-                conversation = conversationManager.startConversation(conversationID);
-            }
-            this.conversation = conversation;
-        } else {
-            this.conversation = null;
-        }
-    }
-
-    protected ReferenceParameters getReferenceParameters() {
-        ReferenceParameters parameters = new ReferenceParametersImpl();
-        parameters.setCallbackID(callbackID);
-        if (getConversation() != null) {
-            parameters.setConversationID(conversation.getConversationID());
-        }
-        return parameters;
-    }
-
-    public EndpointReference getEndpointReference() {
-        try {
-            resolve();  
-            
-            // Use the interface contract of the reference on the component type
-            Reference componentTypeRef = reference.getReference();
-            InterfaceContract sourceContract =
-                componentTypeRef == null ? reference.getInterfaceContract() : componentTypeRef.getInterfaceContract();
-            sourceContract = sourceContract.makeUnidirectional(false);
-            EndpointReference epr = new EndpointReferenceImpl(component, reference, binding, sourceContract);
-            ReferenceParameters parameters = getReferenceParameters();
-            epr.setReferenceParameters(parameters);
-            return epr;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }        
-    }
-
-    public XMLStreamReader getXMLReader() {
-        return xmlReader;
-    }
-
-    /**
-     * Resolves the specified URI to a Component using the compositeActivator.
-     * 
-     * @param componentURI The URI of the Component to resolve
-     * @return The Component for the specified URI or null if not founds
-     */
-    protected Component resolveComponentURI(String componentURI) {
-        final String[] splitUri = splitComponentURI(componentURI);
-        return compositeActivator.resolve(splitUri[0]);
-    }
-
-    /**
-     * This method will split the specified URI into the Component URI
-     * and Service Name.
-     * 
-     * @param componentURI The URI to split
-     * @return [0] = Component URI [1] = ServiceName
-     */
-    protected String[] splitComponentURI(String componentURI) {
-        final String[] result = new String[2];
-
-        if (componentURI.startsWith("/")) {
-            componentURI = componentURI.substring(1);
-        }
-        final int index = componentURI.lastIndexOf('/');
-        String serviceName = "";
-        if (index > -1) {
-            serviceName = componentURI.substring(index + 1);
-            componentURI = componentURI.substring(0, index);
-        }
-
-        // Return the results
-        result[0] = componentURI;
-        result[1] = serviceName;
-        return result;
-    }
-
-    /**
-     * Examines the Services on the specified Component and returns the Service that matches the
-     * specified name.
-     * 
-     * @param serviceName The name of the Service to resolve on the Component
-     * @param targetComponent The Component containing the Services
-     * @return The Service with the specified serviceName or null if no such Service found.
-     */
-    protected ComponentService resolveService(String serviceName, Component targetComponent) {
-        ComponentService targetService = null;
-        if (targetComponent != null) {
-            if ("".equals(serviceName)) {
-                targetService = ComponentContextHelper.getSingleService(targetComponent);
-            } else {
-                for (ComponentService service : targetComponent.getServices()) {
-                    if (service.getName().equals(serviceName)) {
-                        targetService = service;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return targetService;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
deleted file mode 100644
index 78b0887482..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.core.context;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
-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.AssemblyFactory;
-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.Multiplicity;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.Message;
-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.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentContextHelper {
-
-    private final AssemblyFactory assemblyFactory;
-    private final JavaInterfaceFactory javaInterfaceFactory;
-    private final StAXArtifactProcessorExtensionPoint staxProcessors;
-
-    /**
-     * @param assemblyFactory The factory to create assembly models
-     * @param processors The extension point for StAX artifact processors
-     */
-    public ComponentContextHelper(AssemblyFactory assemblyFactory,
-                                  JavaInterfaceFactory javaInterfaceFactory,
-                                  StAXArtifactProcessorExtensionPoint processors) {
-        this.assemblyFactory = assemblyFactory;
-        this.javaInterfaceFactory = javaInterfaceFactory;
-        this.staxProcessors = processors;
-    }
-
-    /**
-     * Create a self-reference for a component service
-     * @param component
-     * @param service
-     * @throws CloneNotSupportedException 
-     * @throws InvalidInterfaceException 
-     */
-    public ComponentReference createSelfReference(Component component,
-                                                  ComponentService service,
-                                                  Class<?> businessInterface) throws CloneNotSupportedException,
-        InvalidInterfaceException {
-        ComponentReference componentReference = assemblyFactory.createComponentReference();
-        componentReference.setName("$self$." + service.getName());
-        for (Binding binding : service.getBindings()) {
-            if (binding instanceof OptimizableBinding) {
-                OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
-                optimizableBinding.setTargetBinding(binding);
-                optimizableBinding.setTargetComponent(component);
-                optimizableBinding.setTargetComponentService(service);
-                componentReference.getBindings().add(optimizableBinding);
-            } else {
-                componentReference.getBindings().add(binding);
-            }
-        }
-
-        componentReference.setCallback(service.getCallback());
-        componentReference.getTargets().add(service);
-        componentReference.getPolicySets().addAll(service.getPolicySets());
-        componentReference.getRequiredIntents().addAll(service.getRequiredIntents());
-
-        InterfaceContract interfaceContract = service.getInterfaceContract();
-        Service componentTypeService = service.getService();
-        if (componentTypeService != null && componentTypeService.getInterfaceContract() != null) {
-            interfaceContract = componentTypeService.getInterfaceContract();
-        }
-        interfaceContract = getInterfaceContract(interfaceContract, businessInterface);
-        componentReference.setInterfaceContract(interfaceContract);
-        componentReference.setMultiplicity(Multiplicity.ONE_ONE);
-        // component.getReferences().add(componentReference);
-        return componentReference;
-    }
-
-    /**
-     * @param interfaceContract
-     * @param businessInterface
-     * @return
-     * @throws CloneNotSupportedException
-     * @throws InvalidInterfaceException
-     */
-    private InterfaceContract getInterfaceContract(InterfaceContract interfaceContract, Class<?> businessInterface)
-        throws CloneNotSupportedException, InvalidInterfaceException {
-        Interface interfaze = interfaceContract.getInterface();
-        boolean compatible = false;
-        if (interfaze instanceof JavaInterface) {
-            Class<?> cls = ((JavaInterface)interfaze).getJavaClass();
-            if (businessInterface.isAssignableFrom(cls)) {
-                compatible = true;
-            }
-        }
-        if (!compatible) {
-            // The interface is not assignable from the interface contract
-            interfaceContract = (InterfaceContract)interfaceContract.clone();
-            interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
-        }
-
-        return interfaceContract;
-    }
-
-    /**
-     * Bind a component reference to a component service
-     * @param <B>
-     * @param businessInterface
-     * @param reference
-     * @param service
-     * @return
-     * @throws CloneNotSupportedException
-     * @throws InvalidInterfaceException
-     */
-    public RuntimeComponentReference bindComponentReference(Class<?> businessInterface,
-                                                            RuntimeComponentReference reference,
-                                                            RuntimeComponent component,
-                                                            RuntimeComponentService service)
-        throws CloneNotSupportedException, InvalidInterfaceException {
-        RuntimeComponentReference ref = (RuntimeComponentReference)reference.clone();
-        InterfaceContract interfaceContract = reference.getInterfaceContract();
-        Reference componentTypeReference = reference.getReference();
-        if (componentTypeReference != null && componentTypeReference.getInterfaceContract() != null) {
-            interfaceContract = componentTypeReference.getInterfaceContract();
-        }
-        InterfaceContract refInterfaceContract = getInterfaceContract(interfaceContract, businessInterface);
-        if (refInterfaceContract != interfaceContract) {
-            ref = (RuntimeComponentReference)reference.clone();
-            ref.setInterfaceContract(interfaceContract);
-        }
-        ref.setComponent(component);
-        ref.getTargets().add(service);
-        ref.getBindings().clear();
-        for (Binding binding : service.getBindings()) {
-            if (binding instanceof OptimizableBinding) {
-                OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
-                optimizableBinding.setTargetBinding(binding);
-                optimizableBinding.setTargetComponent(component);
-                optimizableBinding.setTargetComponentService(service);
-                ref.getBindings().add(optimizableBinding);
-            } else {
-                ref.getBindings().add(binding);
-            }
-        }
-        return ref;
-    }
-
-    public void write(Component component, ComponentReference reference, Writer writer) throws IOException {
-        write(component, reference, null, writer);
-    }
-
-    public void write(Component component, ComponentReference reference, ComponentService service, Writer writer) throws IOException {
-        try {
-            StAXArtifactProcessor<Composite> processor = staxProcessors.getProcessor(Composite.class);
-            Composite composite = assemblyFactory.createComposite();
-            composite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "default"));
-            Component comp = assemblyFactory.createComponent();
-            comp.setName("default");
-            comp.setURI(component.getURI());
-            composite.getComponents().add(comp);
-            if (reference != null) {
-                comp.getReferences().add(reference);
-            }
-            if (service != null) {
-                comp.getServices().add(service);
-            }
-
-            XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-            XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
-            processor.write(composite, streamWriter);
-        } catch (Exception e) {
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    public String toXML(Component component, ComponentReference reference) throws IOException {
-        StringWriter writer = new StringWriter();
-        write(component, reference, writer);
-        return writer.toString();
-    }
-
-    public String toXML(Component component, ComponentService service) throws IOException {
-        StringWriter writer = new StringWriter();
-        write(component, null, service, writer);
-        return writer.toString();
-    }
-
-    public RuntimeComponent read(Reader reader) throws IOException {
-        try {
-            XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(reader);
-            return read(streamReader);
-        } catch (Exception e) {
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    public RuntimeComponent read(XMLStreamReader streamReader) throws IOException {
-        try {
-            StAXArtifactProcessor<Composite> processor = staxProcessors.getProcessor(Composite.class);
-            Composite composite = processor.read(streamReader);
-            RuntimeComponent component = (RuntimeComponent)composite.getComponents().get(0);
-            return component;
-        } catch (Exception e) {
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    public Component fromXML(String xml) throws IOException {
-        return read(new StringReader(xml));
-    }
-
-    public Component fromXML(XMLStreamReader streamReader) throws IOException {
-        return read(streamReader);
-    }
-
-    public static RuntimeComponent getCurrentComponent() {
-        Message message = ThreadMessageContext.getMessageContext();
-        if (message != null) {
-            EndpointReference to = message.getTo();
-            if (to == null) {
-                return null;
-            }
-            RuntimeComponent component = message.getTo().getComponent();
-            return component;
-        }
-        return null;
-    }
-
-    public static CompositeActivator getCurrentCompositeActivator() {
-        RuntimeComponent component = getCurrentComponent();
-        if (component != null) {
-            ComponentContextImpl context = (ComponentContextImpl)component.getComponentContext();
-            return context.getCompositeActivator();
-        }
-        return null;
-    }
-
-    public static ComponentContextHelper getCurrentComponentContextHelper() {
-        CompositeActivator activator = getCurrentCompositeActivator();
-        if (activator != null) {
-            return activator.getComponentContextHelper();
-        }
-        return null;
-    }
-
-    /**
-     * @param component
-     */
-    public static ComponentService getSingleService(Component component) {
-        ComponentService targetService;
-        List<ComponentService> services = component.getServices();
-        List<ComponentService> regularServices = new ArrayList<ComponentService>();
-        for (ComponentService service : services) {
-            if (service.isCallback()) {
-                continue;
-            }
-            String name = service.getName();
-            if (!name.startsWith("$") || name.startsWith("$dynamic$")) {
-                regularServices.add(service);
-            }
-        }
-        if (regularServices.size() == 0) {
-            throw new ServiceRuntimeException("No service is declared on component " + component.getURI());
-        }
-        if (regularServices.size() != 1) {
-            throw new ServiceRuntimeException("More than one service is declared on component " + component.getURI()
-                + ". Service name is required to get the service.");
-        }
-        targetService = regularServices.get(0);
-        return targetService;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
deleted file mode 100644
index 33de9f34bb..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.core.context;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-
-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.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.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.context.PropertyValueFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Implementation of ComponentContext that delegates to a ComponentContextProvider.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentContextImpl implements RuntimeComponentContext {
-    private final RuntimeComponent component;
-
-    private final CompositeActivator compositeActivator;
-    private final RequestContextFactory requestContextFactory;
-    private final ProxyFactory proxyFactory;
-    private final AssemblyFactory assemblyFactory;
-    private final JavaInterfaceFactory javaInterfaceFactory;
-
-    /**
-     * This is a reference to the PropertyValueFactory that is provided by the Implementation
-     * that can be used to get the value from a Property Object.
-     * 
-     * @see #setPropertyValueFactory(PropertyValueFactory)
-     * @see #getProperty(Class, String)
-     */
-    private PropertyValueFactory propertyFactory;
-    
-    public ComponentContextImpl(CompositeActivator compositeActivator,
-                                AssemblyFactory assemblyFactory,
-                                ProxyFactory proxyFactory,
-                                InterfaceContractMapper interfaceContractMapper,
-                                RequestContextFactory requestContextFactory,
-                                JavaInterfaceFactory javaInterfaceFactory,
-                                RuntimeComponent component) {
-        super();
-        this.compositeActivator = compositeActivator;
-        this.assemblyFactory = assemblyFactory;
-        this.proxyFactory = proxyFactory;
-        this.requestContextFactory = requestContextFactory;
-        this.javaInterfaceFactory = javaInterfaceFactory;
-        this.component = component;
-    }
-
-    public String getURI() {
-        return component.getURI();
-    }
-
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)proxyFactory.cast(target);
-    }
-
-    public <B> B getService(Class<B> businessInterface, String referenceName) {
-        ServiceReference<B> serviceRef = getServiceReference(businessInterface, referenceName);
-        return serviceRef.getService();
-    }
-
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) {
-        try {
-            for (ComponentReference ref : component.getReferences()) {
-                if (referenceName.equals(ref.getName())) {
-                    return getServiceReference(businessInterface, (RuntimeComponentReference)ref, null);
-                }
-            }
-            throw new ServiceRuntimeException("Reference not found: " + referenceName);
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * The Implementation is responsible for calling this method to set the 
-     * PropertyValueFactory that is used to get the Property Value from 
-     * a Tuscany Property object.
-     *   
-     * @param factory The PropertyValueFactory to use
-     * 
-     * @see #getProperty(Class, String)
-     */
-    public void setPropertyValueFactory(PropertyValueFactory factory) {
-        propertyFactory = factory;
-    }
-
-    /**
-     * Gets the value for the specified property with the specified type.
-     * 
-     * @param type The type of the property value we are getting
-     * @param propertyName The name of the property we are getting
-     * @param B The class of the property value we are getting
-     * 
-     * @throws ServiceRuntimeException If a Property for the specified propertyName
-     *         is not found 
-     *         
-     * @see #setPropertyValueFactory(PropertyValueFactory)         
-     */
-    public <B> B getProperty(Class<B> type, String propertyName) {
-        for (ComponentProperty p : component.getProperties()) {
-            if (propertyName.equals(p.getName())) {
-                return propertyFactory.createPropertyValue(p, type);
-            }
-        }
-        throw new ServiceRuntimeException("Property not found: " + propertyName);
-    }
-
-    public <B> ServiceReference<B> createSelfReference(Class<B> businessInterface) {
-        ComponentService service = ComponentContextHelper.getSingleService(component);
-        try {
-            return createSelfReference(businessInterface, service);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e.getMessage(), e);
-        }
-    }
-
-    public <B> ServiceReference<B> createSelfReference(Class<B> businessInterface, String serviceName) {
-        try {
-            for (ComponentService service : component.getServices()) {
-                if (serviceName.equals(service.getName())) {
-                    return createSelfReference(businessInterface, service);
-                }
-            }
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        } catch (ServiceRuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * @param <B>
-     * @param businessInterface
-     * @param service
-     * @return
-     */
-    public <B> ServiceReference<B> createSelfReference(Class<B> businessInterface, ComponentService service) {
-        try {
-            RuntimeComponentReference ref =
-                (RuntimeComponentReference)createSelfReference(component, service, businessInterface);
-            ref.setComponent(component);
-            return getServiceReference(businessInterface, ref, null);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public RequestContext getRequestContext() {
-        if (requestContextFactory != null) {
-            return requestContextFactory.createRequestContext();
-        } else {
-            return new RequestContextImpl(proxyFactory);
-        }
-    }
-
-    /**
-     * @param businessInterface
-     * @param reference
-     * @return
-     * @throws CloneNotSupportedException
-     * @throws InvalidInterfaceException
-     */
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, RuntimeComponentReference reference, Binding binding) {
-        try {
-            RuntimeComponentReference ref = (RuntimeComponentReference)reference;
-            InterfaceContract interfaceContract = reference.getInterfaceContract();
-            Reference componentTypeReference = reference.getReference();
-            if (componentTypeReference != null && componentTypeReference.getInterfaceContract() != null) {
-                interfaceContract = componentTypeReference.getInterfaceContract();
-            }
-            InterfaceContract refInterfaceContract = getInterfaceContract(interfaceContract, businessInterface);
-            if (refInterfaceContract != interfaceContract) {
-                ref = (RuntimeComponentReference)reference.clone();
-                ref.setInterfaceContract(interfaceContract);
-            }
-            ref.setComponent(component);
-            return new ServiceReferenceImpl<B>(businessInterface, component, ref, binding, proxyFactory, compositeActivator);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }    
-
-    /**
-     * Bind a component reference to a component service
-     * @param <B>
-     * @param businessInterface
-     * @param reference
-     * @param service
-     * @return
-     * @throws CloneNotSupportedException
-     * @throws InvalidInterfaceException
-     */
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
-                                                       RuntimeComponentReference reference,
-                                                       RuntimeComponent component,
-                                                       RuntimeComponentService service) {
-        try {
-            RuntimeComponentReference ref = (RuntimeComponentReference)reference.clone();
-            InterfaceContract interfaceContract = reference.getInterfaceContract();
-            Reference componentTypeReference = reference.getReference();
-            if (componentTypeReference != null && componentTypeReference.getInterfaceContract() != null) {
-                interfaceContract = componentTypeReference.getInterfaceContract();
-            }
-            InterfaceContract refInterfaceContract = getInterfaceContract(interfaceContract, businessInterface);
-            if (refInterfaceContract != interfaceContract) {
-                ref = (RuntimeComponentReference)reference.clone();
-                ref.setInterfaceContract(interfaceContract);
-            }
-            ref.getTargets().add(service);
-            ref.getBindings().clear();
-            for (Binding binding : service.getBindings()) {
-                if (binding instanceof OptimizableBinding) {
-                    OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
-                    optimizableBinding.setTargetBinding(binding);
-                    optimizableBinding.setTargetComponent(component);
-                    optimizableBinding.setTargetComponentService(service);
-                    ref.getBindings().add(optimizableBinding);
-                } else {
-                    ref.getBindings().add(binding);
-                }
-            }
-            return new ServiceReferenceImpl<B>(businessInterface, component, ref, proxyFactory, compositeActivator);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public <B> CallableReference<B> getCallableReference(Class<B> businessInterface,
-                                                         RuntimeComponent component,
-                                                         RuntimeComponentService service) {
-        try {
-            if (businessInterface == null) {
-                InterfaceContract contract = service.getInterfaceContract();
-                businessInterface = (Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
-            }
-            RuntimeComponentReference ref =
-                (RuntimeComponentReference)createSelfReference(component, service, businessInterface);
-            ref.setComponent(component);
-            return new CallableReferenceImpl<B>(businessInterface, component, ref, null, proxyFactory,
-                                                compositeActivator);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Create a self-reference for a component service
-     * @param component
-     * @param service
-     * @throws CloneNotSupportedException 
-     * @throws InvalidInterfaceException 
-     */
-    private ComponentReference createSelfReference(Component component,
-                                                   ComponentService service,
-                                                   Class<?> businessInterface) throws CloneNotSupportedException,
-        InvalidInterfaceException {
-        ComponentReference componentReference = assemblyFactory.createComponentReference();
-        componentReference.setName("$self$." + service.getName());
-        for (Binding binding : service.getBindings()) {
-            if (binding instanceof OptimizableBinding) {
-                OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();
-                optimizableBinding.setTargetBinding(binding);
-                optimizableBinding.setTargetComponent(component);
-                optimizableBinding.setTargetComponentService(service);
-                componentReference.getBindings().add(optimizableBinding);
-            } else {
-                componentReference.getBindings().add(binding);
-            }
-        }
-
-        componentReference.setCallback(service.getCallback());
-        componentReference.getTargets().add(service);
-        componentReference.getPolicySets().addAll(service.getPolicySets());
-        componentReference.getRequiredIntents().addAll(service.getRequiredIntents());
-
-        InterfaceContract interfaceContract = service.getInterfaceContract();
-        Service componentTypeService = service.getService();
-        if (componentTypeService != null && componentTypeService.getInterfaceContract() != null) {
-            interfaceContract = componentTypeService.getInterfaceContract();
-        }
-        interfaceContract = getInterfaceContract(interfaceContract, businessInterface);
-        componentReference.setInterfaceContract(interfaceContract);
-        componentReference.setMultiplicity(Multiplicity.ONE_ONE);
-        // component.getReferences().add(componentReference);
-        return componentReference;
-    }
-
-    /**
-     * @param interfaceContract
-     * @param businessInterface
-     * @return
-     * @throws CloneNotSupportedException
-     * @throws InvalidInterfaceException
-     */
-    private InterfaceContract getInterfaceContract(InterfaceContract interfaceContract, Class<?> businessInterface)
-        throws CloneNotSupportedException, InvalidInterfaceException {
-        Interface interfaze = interfaceContract.getInterface();
-        boolean compatible = false;
-        if (interfaze instanceof JavaInterface) {
-            Class<?> cls = ((JavaInterface)interfaze).getJavaClass();
-            if (businessInterface.isAssignableFrom(cls)) {
-                compatible = true;
-            }
-        }
-        if (!compatible) {
-            // The interface is not assignable from the interface contract
-            interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-            JavaInterface callInterface = javaInterfaceFactory.createJavaInterface(businessInterface);
-            interfaceContract.setInterface(callInterface);
-            if (callInterface.getCallbackClass() != null) {
-                interfaceContract.setCallbackInterface(javaInterfaceFactory.createJavaInterface(callInterface
-                    .getCallbackClass()));
-            }
-        }
-
-        return interfaceContract;
-    }
-
-    /**
-     * @return the compositeActivator
-     */
-    public CompositeActivator getCompositeActivator() {
-        return compositeActivator;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.runtime.RuntimeComponentContext#start(org.apache.tuscany.sca.runtime.RuntimeComponentReference)
-     */
-    public void start(RuntimeComponentReference reference) {
-        compositeActivator.start(component, reference);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.runtime.RuntimeComponentContext#read(java.io.Reader)
-     */
-    public RuntimeComponent read(Reader reader) throws IOException {
-        RuntimeComponent component = compositeActivator.getComponentContextHelper().read(reader);
-        compositeActivator.configureComponentContext(component);
-        return component;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.runtime.RuntimeComponentContext#write(org.apache.tuscany.sca.runtime.RuntimeComponentReference, java.io.Writer)
-     */
-    public void write(RuntimeComponentReference reference, Writer writer) throws IOException {
-        compositeActivator.getComponentContextHelper().write(component, reference, writer);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
deleted file mode 100644
index c5b68389b2..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.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.core.context;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.context.ComponentContextFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.ComponentContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultComponentContextFactory implements ComponentContextFactory {
-    private final CompositeActivator compositeActivator;
-    private final RequestContextFactory requestContextFactory;
-    private final ProxyFactory proxyFactory;
-    private final AssemblyFactory assemblyFactory;
-    private final JavaInterfaceFactory javaInterfaceFactory;
-    private final InterfaceContractMapper interfaceContractMapper;
-
-    public DefaultComponentContextFactory(CompositeActivator compositeActivator,
-                                          AssemblyFactory assemblyFactory,
-                                          ProxyFactory proxyFactory,
-                                          InterfaceContractMapper interfaceContractMapper,
-                                          RequestContextFactory requestContextFactory,
-                                          JavaInterfaceFactory javaInterfaceFactory) {
-        super();
-        this.compositeActivator = compositeActivator;
-        this.assemblyFactory = assemblyFactory;
-        this.proxyFactory = proxyFactory;
-        this.requestContextFactory = requestContextFactory;
-        this.javaInterfaceFactory = javaInterfaceFactory;
-        this.interfaceContractMapper = interfaceContractMapper;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.context.ComponentContextFactory#createComponentContext(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.context.RequestContextFactory)
-     */
-    public ComponentContext createComponentContext(RuntimeComponent component,
-                                                   RequestContextFactory requestContextFactory) {
-        if (requestContextFactory == null) {
-            requestContextFactory = this.requestContextFactory;
-        }
-        return new ComponentContextImpl(compositeActivator, assemblyFactory, proxyFactory, interfaceContractMapper,
-                                        requestContextFactory, javaInterfaceFactory, component);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
deleted file mode 100644
index b577180291..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.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.core.context;
-
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetInitializationException;
-
-
-/**
- * Provides lifecycle management for an implementation instance associated with
- * a component for use by the component's associated {@link org.apache.tuscany.sca.core.scope.ScopeContainer}
- * 
- * @version $Rev$ $Date$
- */
-public interface InstanceWrapper<T> {
-
-    /**
-     * @return
-     */
-    T getInstance();
-
-    /**
-     * @throws TargetInitializationException
-     */
-    void start() throws TargetInitializationException;
-
-    /**
-     * @throws TargetDestructionException
-     */
-    void stop() throws TargetDestructionException;
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
deleted file mode 100644
index aa69bb3ae5..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.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.core.context;
-
-import java.util.List;
-
-import javax.security.auth.Subject;
-
-import org.apache.tuscany.sca.core.invocation.CallbackReferenceImpl;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-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.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.RequestContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RequestContextImpl implements RequestContext {
-
-    private ProxyFactory proxyFactory;
-
-    public RequestContextImpl(ProxyFactory proxyFactory) {
-        this.proxyFactory = proxyFactory;
-    }
-
-    public Subject getSecuritySubject() {
-        throw new UnsupportedOperationException();
-    }
-
-    public String getServiceName() {
-        return ThreadMessageContext.getMessageContext().getTo().getContract().getName();
-    }
-
-    @SuppressWarnings("unchecked")
-    public <B> CallableReference<B> getServiceReference() {
-        Message msgContext = ThreadMessageContext.getMessageContext();
-        // FIXME: [rfeng] Is this the service reference matching the caller side?
-        EndpointReference to = msgContext.getTo();
-        RuntimeComponentService service = (RuntimeComponentService) to.getContract();
-        RuntimeComponent component = (RuntimeComponent) to.getComponent();
-        
-        CallableReference<B> callableReference = component.getComponentContext().getCallableReference(null, component, service);
-        ReferenceParameters parameters = msgContext.getFrom().getReferenceParameters();
-        ((CallableReferenceImpl<B>) callableReference).attachCallbackID(parameters.getCallbackID());
-        ((CallableReferenceImpl<B>) callableReference).attachConversation(parameters.getConversationID());
-        return callableReference;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <CB> CB getCallback() {
-        CallableReference<CB> cb = getCallbackReference(); 
-        if (cb == null) {
-            return null;
-        }
-        return cb.getService();
-    }
-
-    @SuppressWarnings("unchecked")
-    public <CB> CallableReference<CB> getCallbackReference() {
-        Message msgContext = ThreadMessageContext.getMessageContext();
-        EndpointReference to = msgContext.getTo();
-        RuntimeComponentService service = (RuntimeComponentService) to.getContract();
-        RuntimeComponentReference callbackReference = (RuntimeComponentReference)service.getCallbackReference();
-        if (callbackReference == null) {
-            return null;
-        }
-        JavaInterface javaInterface = (JavaInterface) callbackReference.getInterfaceContract().getInterface();
-        Class<CB> javaClass = (Class<CB>)javaInterface.getJavaClass();
-        List<RuntimeWire> wires = callbackReference.getRuntimeWires();
-        CallbackReferenceImpl ref = CallbackReferenceImpl.newInstance(javaClass, proxyFactory, wires);
-        if (ref != null) {  
-            //ref.resolveTarget();
-            ReferenceParameters parameters = msgContext.getFrom().getReferenceParameters();
-            ref.attachCallbackID(parameters.getCallbackID());
-            if (ref.getConversation() != null) {
-                ref.attachConversationID(parameters.getConversationID());
-            }
-        }
-        return ref;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
deleted file mode 100644
index 857a193260..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.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.core.context;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.conversation.ConversationState;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- * Default implementation of a ServiceReference.
- *
- * @version $Rev$ $Date$
- * @param <B> the type of the business interface
- */
-public class ServiceReferenceImpl<B> extends CallableReferenceImpl<B> implements ServiceReference<B> {
-    private static final long serialVersionUID = 6763709434194361540L;
-
-    protected transient Object callback;
-
-    /*
-     * Public constructor for Externalizable serialization/deserialization
-     */
-    public ServiceReferenceImpl() {
-        super();
-    }
-
-    /*
-     * Public constructor for use by XMLStreamReader2CallableReference
-     */
-    public ServiceReferenceImpl(XMLStreamReader xmlReader) throws Exception {
-        super(xmlReader);
-    }
-
-    /**
-     * @param businessInterface
-     * @param wire
-     * @param proxyFactory
-     */
-    public ServiceReferenceImpl(Class<B> businessInterface, RuntimeWire wire, ProxyFactory proxyFactory) {
-        super(businessInterface, wire, proxyFactory);
-    }
-
-    public ServiceReferenceImpl(Class<B> businessInterface,
-                                RuntimeComponent component,
-                                RuntimeComponentReference reference,
-                                ProxyFactory proxyFactory,
-                                CompositeActivator compositeActivator) {
-        super(businessInterface, component, reference, null, proxyFactory, compositeActivator);
-    }
-
-    public ServiceReferenceImpl(Class<B> businessInterface,
-                                RuntimeComponent component,
-                                RuntimeComponentReference reference,
-                                Binding binding,
-                                ProxyFactory proxyFactory,
-                                CompositeActivator compositeActivator) {
-        super(businessInterface, component, reference, binding, proxyFactory, compositeActivator);
-    }
-
-    public Object getConversationID() {
-        return conversationID;
-    }
-
-    public void setConversationID(Object conversationID) throws IllegalStateException {
-        if (conversation == null || conversation.getState() != ConversationState.ENDED) {
-            this.conversationID = conversationID;
-            this.conversation = null;
-        } else {
-            throw new IllegalStateException("Trying to set the conversationId on a service reference but the state of the conversation " 
-                + conversation.getConversationID()
-                + " is "
-                + conversation.getState());
-        }
-    }
-
-    public void setCallbackID(Object callbackID) {
-        this.callbackID = callbackID;
-    }
-
-    public Object getCallback() {
-        return callback;
-    }
-
-    public void setCallback(Object callback) {
-        if (callback != null && !(callback instanceof CallableReference)) {
-            //FIXME: need to check if callback object supports the callback interface
-            // returned by reference.getInterfaceContract().getCallbackInterface()
-        }
-        this.callback = callback;
-    }
-
-    protected ReferenceParameters getReferenceParameters() {
-        ReferenceParameters parameters = super.getReferenceParameters();
-        if (callback != null) {
-            if (callback instanceof ServiceReference) {
-                EndpointReference callbackRef = ((CallableReferenceImpl)callback).getEndpointReference();
-                parameters.setCallbackReference(callbackRef);
-            } else {
-                EndpointReference callbackRef = getRuntimeWire().getSource().getCallbackEndpoint();
-                parameters.setCallbackReference(callbackRef);
-                parameters.setCallbackObjectID(callback);
-            }
-        }
-        return parameters;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
deleted file mode 100644
index efa362a929..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.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.core.conversation;
-
-/**
- * Listener for the events of a conversation
- * 
- * @version $Rev$ $Date$
- */
-public interface ConversationListener {
-    /**
-     * The conversation is started
-     */
-    void conversationStarted(ExtendedConversation conversation);
-    /**
-     * The conversation is ended
-     */
-    void conversationEnded(ExtendedConversation conversation);
-    /**
-     * The conversation is expired
-     */
-    void conversationExpired(ExtendedConversation conversation);
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
deleted file mode 100644
index 28e22b4f2c..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.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.core.conversation;
-
-/**
- * The manager of conversations
- * 
- * @version $Rev$ $Date$
- */
-public interface ConversationManager {
-    /**
-     * @param conversationID
-     * @return
-     */
-    ExtendedConversation startConversation(Object conversationID);
-
-    /**
-     * @param conversationID
-     */
-    void endConversation(Object conversationID);
-
-    /**
-     * @param conversationID
-     * @return
-     */
-    ExtendedConversation getConversation(Object conversationID);
-
-    /**
-     * @param conversationID
-     */
-    void expireConversation(Object conversationID);
-
-    /**
-     * Add a listener to this conversation
-     * @param listener
-     */
-    void addListener(ConversationListener listener);
-
-    /**
-     * Remove a listener from this conversation
-     * @param listener
-     */
-    void removeListener(ConversationListener listener);
-    
-    /**
-     * @return the default max age for a conversation
-     */
-    long getMaxAge();
-    
-    /**
-     * @return the default max idle time for a conversation
-     */
-    long getMaxIdleTime();
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
deleted file mode 100644
index 0aa9430666..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.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.core.conversation;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationManagerImpl implements ConversationManager {
-	
-    private List<ConversationListener> listeners = Collections.synchronizedList(new ArrayList<ConversationListener>());
-    private Map<Object, ExtendedConversation> conversations = new ConcurrentHashMap<Object, ExtendedConversation>();
-
-    /**
-     * the default max age. this is set to 1 hour
-     */
-    private static final long DEFAULT_MAX_AGE = 60 * 60 * 1000; ;
-    
-    /**
-     * the default max idle time. this is set to 1 hour
-     */
-    private static final long DEFAULT_MAX_IDLE_TIME = 60 * 60 * 1000; 
-    
-    /**
-     * the globally used max age
-     */
-    private final long maxAge;
-
-    /**
-     * the globally used max idle time
-     */
-    private final long maxIdleTime; 
-
-    /**
-     * the reaper thread
-     */
-    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
-    
-    /**
-     * constructor
-     */
-    public ConversationManagerImpl() {
-    	long mit = DEFAULT_MAX_IDLE_TIME;
-    	long ma = DEFAULT_MAX_AGE;
-    	
-    	// Allow privileged access to read system property. Requires PropertyPermission in security
-        // policy.
-        String aProperty = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            public String run() {
-                return System.getProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.MaxIdleTime");
-            }
-        });
-    	if (aProperty != null) {
-    		try {
-    			mit = (new Long(aProperty) * 1000);
-    		} catch (NumberFormatException nfe) {
-    			// Ignore
-    		}
-    	}
-
-    	// Allow privileged access to read system property. Requires PropertyPermission in security
-        // policy.
-        aProperty = AccessController.doPrivileged(new PrivilegedAction<String>() {
-            public String run() {
-                return System.getProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.MaxAge");
-            }
-        });
-        if (aProperty != null) {
-            try {
-                ma = (new Long(aProperty) * 1000);
-            } catch (NumberFormatException nfe) {
-                // Ignore
-            }
-        }
-
-        maxAge = ma;
-        maxIdleTime = mit;
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.core.conversation.ConversationManager#addListener(org.apache.tuscany.sca.core.conversation.ConversationListener)
-     */
-    public void addListener(ConversationListener listener) {
-        listeners.add(listener);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.conversation.ConversationManager#endConversation(org.apache.tuscany.sca.core.conversation.ExtendedConversation)
-     */
-    public void endConversation(Object conversationID) {
-        ExtendedConversation conv = getConversation(conversationID);
-        if (conv != null) {
-            conv.setState(ConversationState.ENDED);
-            for (ConversationListener listener : listeners) {
-                listener.conversationEnded(conv);
-            }
-            conv.setConversationID(null);
-            conversations.remove(conversationID);
-        } else {
-            throw new IllegalStateException("Conversation " + conversationID + " doesn't exist.");
-        }
-    }
-
-    public void expireConversation(Object conversationID) {
-        ExtendedConversation conv = getConversation(conversationID);
-        if (conv != null) {
-            for (ConversationListener listener : listeners) {
-                listener.conversationExpired(conv);
-            }
-            conversations.remove(conversationID);
-        } else {
-            throw new IllegalStateException("Conversation " + conversationID + " doesn't exist.");
-        }
-
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.conversation.ConversationManager#getConversation(java.lang.Object)
-     */
-    public ExtendedConversation getConversation(Object conversationID) {
-        return conversations.get(conversationID);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.conversation.ConversationManager#removeListener(org.apache.tuscany.sca.core.conversation.ConversationListener)
-     */
-    public void removeListener(ConversationListener listener) {
-        listeners.remove(listener);
-    }
-
-    /**
-     * starts the reaper thread
-     */
-    public void scheduleConversation(ExtendedConversationImpl aConversation, long time)
-    {
-    	this.scheduler.schedule(aConversation, time, TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * stops the reaper thread
-     */
-    public synchronized void stopReaper() {
-
-        // Prevent the scheduler from submitting any additional reapers, 
-    	// initiate an orderly shutdown if a reaper task is in progress. 
-    	this.scheduler.shutdown();
-    }
-    
-
-    /**
-     * @see org.apache.tuscany.sca.core.conversation.ConversationManager#startConversation(java.lang.Object)
-     */
-    public ExtendedConversation startConversation(Object conversationID) {
-    	
-        if (conversationID == null) {
-            conversationID = UUID.randomUUID().toString();
-        }
-        ExtendedConversation conversation = getConversation(conversationID);
-        if (conversation != null && conversation.getState() != ConversationState.ENDED) {
-            throw new IllegalStateException(conversation + " already exists.");
-        }
-                
-        conversation = new ExtendedConversationImpl(
-        		this, conversationID, ConversationState.STARTED);
-        conversations.put(conversationID, conversation);
-        for (ConversationListener listener : listeners) {
-            listener.conversationStarted(conversation);
-        }
-        return conversation;
-    }
-
-    /**
-     * return the default max idle time
-     * @param impProvider the implementation Provider to extract any ConversationAttribute details
-     */
-    public long getMaxIdleTime() {
-        return maxIdleTime;
-    }
-
-    /**
-     * returns the default max age
-     * @param impProvider the implementation Provider to extract any ConversationAttribute details
-     */
-    public long getMaxAge(){
-        return maxAge;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
deleted file mode 100644
index 692d6861ba..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.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.core.conversation;
-
-/**
- * The states of a conversation
- * 
- * @version $Rev$ $Date$
- */
-public enum ConversationState {
-    STARTED, ENDED, EXPIRED
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
deleted file mode 100644
index 03c18c26b8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.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.core.conversation;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.Conversation;
-
-/**
- * An extended interface over org.osoa.Conversation
- * 
- * @version $Rev$ $Date$
- */
-public interface ExtendedConversation extends Conversation {
-    /**
-     * Get the state of a conversation
-     * @return The state
-     */
-    ConversationState getState();
-
-    /**
-     * @param state the state to set
-     */
-    void setState(ConversationState state);
-
-    /**
-     * @param conversationID the conversationID to set
-     */
-    void setConversationID(Object conversationID);
-    
-    
-    /**
-     * will check whether this conversation has expired and update state if it has 
-     * @return true if it has expired
-     */
-    boolean isExpired();
-    
-    /**
-     * updates the last time this conversation was referenced
-     */
-    void updateLastReferencedTime();
-    
-    void initializeConversationAttributes(RuntimeComponent targetComponent);
-
-    
-    /**
-     * @return true if the conversational attributes have been initialized
-     */
-    boolean conversationalAttributesInitialized();
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
deleted file mode 100644
index 0bf66b2817..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.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.core.conversation;
-
-import org.apache.tuscany.sca.core.scope.ScopedImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-public class ExtendedConversationImpl implements ExtendedConversation, Runnable {
-	
-    private final ConversationManagerImpl manager;
-    private volatile Object conversationID;
-    private ConversationState state;
-
-    /**
-     * syncs access to the state
-     */
-    private final Object stateSync = new Object();
-    
-    /**
-     * the maximum time a conversation can exist
-     */
-    private long expirationTime = 0;
-    
-    /**
-     * the maximum time this conversation can be idle
-     */
-    private long maxIdleTime = 0;
-    
-    /**
-     * the maximum age of this conversation
-     */
-    private long maxAge = 0;
-    
-    /**
-     * the time that this object was created 
-     */
-    private long creationTime;    
-
-    /**
-     * the time that this object was last referenced 
-     */
-    private long lastReferencedTime;
-    
-    /**
-     * boolean to ensure expiry only occurs once
-     */
-    private boolean expired = false;
-    
-    /**
-     * boolean to indicate if the conversation attributes have 
-     * been set. In the case where a remote binding is used 
-     * within a composite the JDKInvocationHandler can create the 
-     * conversation but the conversationAttributes are not available
-     * until the conversation is retrieved by the RuntimeWireInvoker
-     */
-    private boolean conversationAttributesInitialized = false;    
-    
-    /**
-     * Constructor
-     * @param manager the conversation manager
-     * @param conversationID the conversation id associated with this conversation
-     * @param state the initial state of this conversation
-     * @param aMaxAge the maximum age of the conversation
-     * @param aMaxIdleTime the maximum idle time
-     */
-    public ExtendedConversationImpl(ConversationManagerImpl manager, 
-    			Object conversationID, ConversationState state) {
-        super();
-        
-        this.creationTime = System.currentTimeMillis();
-        this.lastReferencedTime = creationTime;
-        this.manager = manager;
-        this.conversationID = conversationID;
-        this.state = state;
-    }
-
-    /**
-     * will check whether this conversation has expired and update state if it has 
-     * @return true if it has expired
-     */
-    public boolean isExpired() {
-        long currentTime;
-        synchronized (stateSync) {
-
-            // if the attributes haven't been initialized then
-            // this conversation object can't expire
-            if (conversationAttributesInitialized == false) {
-                return false;
-            }
-
-            // check state first
-            if (state == ConversationState.EXPIRED) {
-                return true;
-            }
-
-            // check whether the time is finished
-            currentTime = System.currentTimeMillis();
-            if (((this.lastReferencedTime + this.maxIdleTime) <= currentTime)
-                    || (this.expirationTime <= currentTime)) {
-                setState(ConversationState.EXPIRED);
-                return true;
-            }
-        }
-        scheduleNextExpiryTime(currentTime);
-        return false;
-    }
-
-    /**
-     * schedule next expiry time
-     */
-    public void scheduleNextExpiryTime(long currentTime) {
-    	if ((lastReferencedTime + maxIdleTime) < expirationTime){ 
-    		manager.scheduleConversation(this, (lastReferencedTime + maxIdleTime) - currentTime);
-        } else {
-    		manager.scheduleConversation(this, expirationTime - currentTime);
-    	}
-    }
-    /**
-     * updates the last time this conversation was referenced
-     */
-    public void updateLastReferencedTime() {
-        this.lastReferencedTime = System.currentTimeMillis();
-        if (conversationAttributesInitialized == true){
-            scheduleNextExpiryTime(lastReferencedTime);
-        }
-    }
-    
-    public ConversationState getState() {
-    	synchronized (stateSync){
-    		return state;
-    	}
-    }
-
-    public void end() {
-        manager.endConversation(conversationID);
-    }
-
-    public Object getConversationID() {
-        return conversationID;
-    }
-
-    /**
-     * @param state the state to set
-     */
-    public void setState(ConversationState state) {
-    	synchronized (stateSync){
-    		this.state = state;
-    	}
-    }
-
-    /**
-     * @param conversationID the conversationID to set
-     */
-    public void setConversationID(Object conversationID) {
-    	synchronized (stateSync){
-    		if (state != ConversationState.ENDED) {
-    			throw new IllegalStateException("The state of conversation " + conversationID + " " + state);
-    		}
-    	}
-        this.conversationID = conversationID;
-    }
-    
-    /**
-     * @param maxAge the maximum age of this conversation
-     */
-    public void initializeConversationAttributes(RuntimeComponent targetComponent){
-        if (targetComponent != null){ 
-            this.maxAge = getMaxIdleTime(targetComponent.getImplementationProvider());
-            this.maxIdleTime = getMaxAge(targetComponent.getImplementationProvider());
-            this.expirationTime = creationTime + maxAge;
-            this.conversationAttributesInitialized = true;
-        }        
-    }
-    
-    /**
-     * @return true if the conversational attributes have been initialized
-     */
-    public boolean conversationalAttributesInitialized(){
-        return this.conversationAttributesInitialized;
-    }
-    
-    /**
-     * return the max idle time
-     * @param impProvider the implementation Provider to extract any ConversationAttribute details
-     */
-    private long getMaxIdleTime(ImplementationProvider impProvider) {
-        // Check to see if the maxIdleTime has been specified using @ConversationAttributes.  
-        // Implementation annotated attributes are honoured first.
-        if ((impProvider != null) &&
-            (impProvider instanceof ScopedImplementationProvider)) {
-            ScopedImplementationProvider aScopedImpl =
-                (ScopedImplementationProvider) impProvider;
-            
-            long maxIdleTime = aScopedImpl.getMaxIdleTime();
-            if (maxIdleTime > 0) {
-                return maxIdleTime;
-            }
-        }
-        return manager.getMaxIdleTime();
-    }
-    
-    /**
-     * returns the max age
-     * @param impProvider the implementation Provider to extract any ConversationAttribute details
-     */
-    private long getMaxAge(ImplementationProvider impProvider){
-
-        // Check to see if the maxAge has been specified using @ConversationAttributes.  
-        // Implementation annotated attributes are honoured first.
-        if ((impProvider != null) &&
-            (impProvider instanceof ScopedImplementationProvider)) {
-            ScopedImplementationProvider aScopedImpl =
-                (ScopedImplementationProvider) impProvider;
-
-            long maxAge = aScopedImpl.getMaxAge();
-            if (maxAge > 0) {
-                return maxAge;
-            }
-        }
-        return manager.getMaxAge();
-    }     
-
-    /**
-     * called when expiring
-     */
-    public void run() {
-        synchronized (stateSync){
-        	if (!expired){
-        		if (isExpired()) {
-        		    expired = true;
-        			try {
-        				manager.expireConversation(getConversationID());
-        			} catch (IllegalStateException ise) {
-        				// ignore this.. this can occur if another thread has subsequently ended
-        				// the conversation
-        			}
-        		}
-        	}
-        }
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
deleted file mode 100644
index 517e5579a4..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.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.core.event;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.event.EventFilter;
-import org.apache.tuscany.sca.event.EventPublisher;
-import org.apache.tuscany.sca.event.RuntimeEventListener;
-import org.apache.tuscany.sca.event.TrueFilter;
-
-/**
- * Base implementation of an <code>EventPublisher</code>
- *
- * @version $Rev$ $Date$
- */
-public abstract class BaseEventPublisher implements EventPublisher {
-    protected static final EventFilter TRUE_FILTER = new TrueFilter();
-    protected Map<EventFilter, List<RuntimeEventListener>> listeners;
-
-    public void addListener(RuntimeEventListener listener) {
-        addListener(TRUE_FILTER, listener);
-    }
-
-    public void removeListener(RuntimeEventListener listener) {
-        assert listener != null : "Listener cannot be null";
-        synchronized (getListeners()) {
-            for (List<RuntimeEventListener> currentList : getListeners().values()) {
-                for (RuntimeEventListener current : currentList) {
-                    if (current == listener) {
-                        currentList.remove(current);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    public void addListener(EventFilter filter, RuntimeEventListener listener) {
-        assert listener != null : "Listener cannot be null";
-        synchronized (getListeners()) {
-            List<RuntimeEventListener> list = getListeners().get(filter);
-            if (list == null) {
-                list = new CopyOnWriteArrayList<RuntimeEventListener>();
-                listeners.put(filter, list);
-            }
-            list.add(listener);
-        }
-    }
-
-    public void publish(Event event) {
-        assert event != null : "Event object was null";
-        for (Map.Entry<EventFilter, List<RuntimeEventListener>> entry : getListeners().entrySet()) {
-            if (entry.getKey().match(event)) {
-                for (RuntimeEventListener listener : entry.getValue()) {
-                    listener.onEvent(event);
-                }
-            }
-        }
-    }
-
-    protected Map<EventFilter, List<RuntimeEventListener>> getListeners() {
-        if (listeners == null) {
-            listeners = new ConcurrentHashMap<EventFilter, List<RuntimeEventListener>>();
-        }
-        return listeners;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
deleted file mode 100644
index 45eab7da1b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.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.core.event;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.event.Event;
-
-/**
- * Propagated when a component starts
- *
- * @version $Rev$ $Date$
- */
-public class ComponentStart implements Event {
-
-    private Object source;
-    private URI uri;
-
-    /**
-     * Creates a component start event
-     *
-     * @param source       the source of the event
-     * @param componentURI the URI of the component being started
-     */
-    public ComponentStart(Object source, URI componentURI) {
-        this.source = source;
-        this.uri = componentURI;
-    }
-
-    public URI getComponentURI() {
-        return uri;
-    }
-    
-    public Object getSource() {
-        return source;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
deleted file mode 100644
index 4dc79c3844..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.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.core.event;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.event.Event;
-
-/**
- * Propagated when a component stops
- *
- * @version $Rev$ $Date$
- */
-public class ComponentStop implements Event {
-
-    private Object source; 
-    private URI uri;
-
-    /**
-     * Creates a component stop event
-     *
-     * @param source    the source of the event
-     * @param componentUri the composite component associated the component being stopped
-     */
-    public ComponentStop(Object source, URI componentUri) {
-        this.source = source;
-        this.uri = componentUri;
-    }
-
-    public URI getComponentURI() {
-        return uri;
-    }
-    
-    public Object getSource() {
-        return source;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
deleted file mode 100644
index d3106c7052..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-
-
-/**
- * Propagated when a conversation is expired
- *
- * @version $Rev$ $Date$
- */
-public class ConversationEnd implements Event {
-    
-    private Object source;
-    private Object id;
-
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     * @param id     the id of the conversation being ended
-     */
-    public ConversationEnd(Object source, Object id) {
-        this.source = source;
-        this.id = id;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-    
-    public Object getConversationID() {
-        return id;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
deleted file mode 100644
index 123400fbdd..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-
-/**
- * Propagated when a conversation has started
- *
- * @version $Rev$ $Date$
- */
-public class ConversationStart implements Event {
-    
-    private Object source;
-    private Object id;
-
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     * @param id     the id of the conversation being started
-     */
-    public ConversationStart(Object source, Object id) {
-        this.source = source;
-        this.id = id;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-    
-    public Object getConversationID() {
-        return id;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
deleted file mode 100644
index 68cb5c2966..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-
-
-/**
- * Propagated when an HTTP-based session is expired
- *
- * @version $Rev$ $Date$
- */
-public class HttpSessionEnd implements Event {
-    
-    private Object source;
-    private Object id;
-
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     * @param id     the id of the HTTP session being ended
-     */
-    public HttpSessionEnd(Object source, Object id) {
-        this.source = source;
-        this.id = id;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-    
-    public Object getSessionID() {
-        return id;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
deleted file mode 100644
index 38a4fb10d6..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-
-/**
- * Propagated when an HTTP-based session has started
- *
- * @version $Rev$ $Date$
- */
-public class HttpSessionStart implements Event {
-    
-    private Object source;
-    private Object id;
-
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     * @param id     the id of the HTTP session being started
-     */
-    public HttpSessionStart(Object source, Object id) {
-        this.source = source;
-        this.id = id;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-    
-    public Object getSessionID() {
-        return id;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
deleted file mode 100644
index d7e797bbb9..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-/**
- * Propagated when a request completes or is ended
- *
- * @version $Rev$ $Date$
- */
-public class RequestEnd implements Event {
-
-    private Object source;
-    
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     */
-    public RequestEnd(Object source) {
-        this.source = source;
-    }
-    
-    public Object getSource() {
-        return source;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
deleted file mode 100644
index 7530156b11..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.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.core.event;
-
-import org.apache.tuscany.sca.event.Event;
-
-/**
- * Propagated when a request is started in the runtime
- *
- * @version $Rev$ $Date$
- */
-public class RequestStart implements Event {
-    
-    private Object source;
-
-    /**
-     * Creates a new event
-     *
-     * @param source the source of the event
-     */
-    public RequestStart(Object source) {
-        this.source = source;
-    }
-
-    public Object getSource() {
-        return source;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
deleted file mode 100644
index d35b27fd24..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.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.core.factory;
-
-
-/**
- * Denotes an error creating a new object instance
- *
- * @version $Rev$ $Date$
- */
-public class ObjectCreationException extends RuntimeException {
-    private static final long serialVersionUID = -6423113430265944499L;
-
-    public ObjectCreationException() {
-        super();
-    }
-
-    public ObjectCreationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ObjectCreationException(String message) {
-        super(message);
-    }
-
-    public ObjectCreationException(Throwable cause) {
-        super(cause);
-    }
-
-}
-
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
deleted file mode 100644
index 3f64d2405b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.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.core.factory;
-
-/**
- * Implementations create new instances of a particular type
- *
- * @version $Rev$ $Date$
- */
-public interface ObjectFactory<T> {
-
-    /**
-     * Return a instance of the type that this factory creates.
-     *
-     * @return a instance from this factory
-     */
-    T getInstance() throws ObjectCreationException;
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
deleted file mode 100644
index 588c43b8b1..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.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.core.invocation;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.CallableReference;
-
-/**
- * Uses a wire to return a CallableReference
- * 
- * @version $Rev$ $Date$
- */
-public class CallableReferenceObjectFactory implements ObjectFactory<CallableReference<?>> {
-    private Class<?> businessInterface;
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private Binding binding;
-
-    /**
-     * Constructor.
-     * 
-     * To support the @Reference protected CallableReference<MyService> ref;
-     * 
-     * @param businessInterface the interface to inject
-     * @param component the component defining the reference to be injected
-     * @param reference the reference to be injected
-     * @param binding the binding for the reference
-     */
-    public CallableReferenceObjectFactory(Class<?> businessInterface,
-                                          RuntimeComponent component,
-                                          RuntimeComponentReference reference,
-                                          Binding binding) {
-        this.businessInterface = businessInterface;
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-    }
-
-    public CallableReference<?> getInstance() throws ObjectCreationException {
-        return component.getComponentContext().getServiceReference(businessInterface, reference, binding);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
deleted file mode 100644
index d19aa237cd..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.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.core.invocation;
-
-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.osoa.sca.NoRegisteredCallbackException;
-
-/**
- * An interceptor applied to the forward direction of a wire that ensures the callback target implements the required
- * service contract. This is required as callback targets may be set dynamically by service implementations.
- *
- * @version $Rev$ $Date$
- */
-public class CallbackInterfaceInterceptor implements Interceptor {
-    private Invoker next;
-
-    public CallbackInterfaceInterceptor() {
-    }
-
-    public Message invoke(Message msg) {
-        ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
-        if (parameters.getCallbackObjectID() != null || parameters.getCallbackReference() != msg.getFrom()
-            .getCallbackEndpoint()) {
-            return next.invoke(msg);
-        } else {
-            throw new NoRegisteredCallbackException("Callback target does not implement the callback interface");
-        }
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
deleted file mode 100644
index dcc1312a3f..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.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 org.apache.tuscany.sca.core.invocation;

-

-import java.io.IOException;

-import java.io.ObjectInput;

-import java.io.ObjectOutput;

-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.Contract;

-import org.apache.tuscany.sca.assembly.OptimizableBinding;

-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;

-import org.apache.tuscany.sca.core.assembly.RuntimeComponentReferenceImpl;

-import org.apache.tuscany.sca.core.assembly.RuntimeWireImpl;

-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;

-import org.apache.tuscany.sca.core.context.ComponentContextHelper;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;

-import org.apache.tuscany.sca.invocation.Message;

-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;

-

-/**

- * Returns proxy instance for a wire callback

- *

- * @version $Rev: 576055 $ $Date: 2007-09-16 08:11:45 +0100 (Sun, 16 Sep 2007) $

- */

-public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {

-    private RuntimeWire wire;

-    private List<RuntimeWire> wires;

-    private EndpointReference resolvedEndpoint;

-	private Object convID;

-

-    public static CallbackReferenceImpl newInstance(Class interfaze,

-                                                    ProxyFactory proxyFactory,

-                                                    List<RuntimeWire> wires) {

-        if (getCallbackEndpoint(ThreadMessageContext.getMessageContext()) != null) {

-            return new CallbackReferenceImpl(interfaze, proxyFactory, wires);

-        } else {

-            return null;

-        }

-    }

-

-    /**

-     * Public constructor for Externalizable serialization/deserialization.

-     */

-    public CallbackReferenceImpl() {

-        super();

-    }

-

-    private CallbackReferenceImpl(Class<B> interfaze, ProxyFactory proxyFactory, List<RuntimeWire> wires) {

-        super(interfaze, null, proxyFactory);

-        this.wires = wires;

-		init();

-    }

-

-    public void init() {

-        Message msgContext = ThreadMessageContext.getMessageContext();

-        wire = selectCallbackWire(msgContext);

-        if (wire == null) {

-            //FIXME: need better exception

-            throw new RuntimeException("No callback binding found for " + msgContext.getTo().getURI());

-        }

-        resolvedEndpoint = getCallbackEndpoint(msgContext);

-        convID = msgContext.getFrom().getReferenceParameters().getConversationID();

-        callbackID = msgContext.getFrom().getReferenceParameters().getCallbackID();

-    }

-

-    @Override

-    protected Object createProxy() throws Exception {

-        return proxyFactory.createCallbackProxy(this);

-	}

-

-    protected RuntimeWire getCallbackWire() {

-        if (resolvedEndpoint == null) {

-            return null;

-        } else {

-            return cloneAndBind(wire);

-		}

-    }

-

-    protected Object getConvID() {

-	    return convID;

-	}

-

-    protected EndpointReference getResolvedEndpoint() {

-	    return resolvedEndpoint;

-	}

-

-    private RuntimeWire selectCallbackWire(Message msgContext) {

-        // look for callback binding with same name as service binding

-        EndpointReference to = msgContext.getTo();

-        if (to == null) {

-            //FIXME: need better exception

-            throw new RuntimeException("Destination for forward call is not available");

-        }

-        for (RuntimeWire wire : wires) {

-            if (wire.getSource().getBinding().getName().equals(to.getBinding().getName())) {

-			    return wire;

-            }

-        }

-

-        // if no match, look for callback binding with same type as service binding

-        for (RuntimeWire wire : wires) {

-            if (wire.getSource().getBinding().getClass() == to.getBinding().getClass()) {

-			    return wire;

-            }

-        }

-

-        // no suitable callback wire was found

-        return null;

-    }

-

-    /**

-     * @param msgContext

-     */

-    private static EndpointReference getCallbackEndpoint(Message msgContext) {

-        EndpointReference from = msgContext.getFrom();

-        if (from == null) {

-            return null;

-        }

-        return from.getReferenceParameters().getCallbackReference();

-    }

-

-    private RuntimeWire cloneAndBind(RuntimeWire wire) {

-        RuntimeWire boundWire = null;

-        if (resolvedEndpoint != null) {

-            boundWire = ((RuntimeWireImpl)wire).lookupCache(resolvedEndpoint);

-            if (boundWire != null) {

-                return boundWire;

-            }

-            try {

-                Contract contract = resolvedEndpoint.getContract();

-                RuntimeComponentReference ref = null;

-                if (contract == null) {

-                    boundWire = (RuntimeWire)wire.clone();

-

-                } else if (contract instanceof RuntimeComponentReference) {

-                    ref = (RuntimeComponentReference)contract;

-                    boundWire = ref.getRuntimeWire(resolvedEndpoint.getBinding());

-

-                } else {  // contract instanceof RuntimeComponentService

-                    ref = bind((RuntimeComponentReference)wire.getSource().getContract(),

-                               resolvedEndpoint.getComponent(),

-                               (RuntimeComponentService)contract);

-                    boundWire = ref.getRuntimeWires().get(0);

-                }

-                configureWire(boundWire);

-                ((RuntimeWireImpl)wire).addToCache(resolvedEndpoint, boundWire);

-            } catch (CloneNotSupportedException e) {

-                // will not happen

-            }

-        }

-        return boundWire;

-    }

-

-    private static RuntimeComponentReference bind(RuntimeComponentReference reference,

-                                                  RuntimeComponent component,

-                                                  RuntimeComponentService service) throws CloneNotSupportedException {

-        RuntimeComponentReference ref = (RuntimeComponentReference)reference.clone();

-        ref.getTargets().add(service);

-        ref.getBindings().clear();

-        for (Binding binding : service.getBindings()) {

-            if (binding instanceof OptimizableBinding) {

-                OptimizableBinding optimizableBinding = (OptimizableBinding)((OptimizableBinding)binding).clone();

-                optimizableBinding.setTargetBinding(binding);

-                optimizableBinding.setTargetComponent(component);

-                optimizableBinding.setTargetComponentService(service);

-                ref.getBindings().add(optimizableBinding);

-            } else {

-                ref.getBindings().add(binding);

-            }

-        }

-        return ref;

-    }

-

-    private void configureWire(RuntimeWire wire) {

-        // need to set the endpoint on the binding also so that when the chains are created next

-        // the sca binding can decide whether to provide local or remote invokers. 

-        // TODO - there is a problem here though in that I'm setting a target on a 

-        //        binding that may possibly be trying to point at two things in the multi threaded 

-        //        case. Need to confirm the general model here and how the clone and bind part

-        //        is intended to work

-        Binding binding = wire.getSource().getBinding();

-        binding.setURI(resolvedEndpoint.getURI());

-

-        // also need to set the target contract as it varies for the sca binding depending on 

-        // whether it is local or remote

-        RuntimeComponentReference ref = (RuntimeComponentReference)wire.getSource().getContract();

-        wire.getTarget().setInterfaceContract(ref.getBindingProvider(binding).getBindingInterfaceContract());

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    @Override

-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {

-        super.readExternal(in);

-        this.callbackID = in.readObject();

-        this.convID = in.readObject();

-

-        this.compositeActivator = ComponentContextHelper.getCurrentCompositeActivator();

-

-        // Get the target Component and Service from the URI

-        final String uri = in.readUTF();

-        final String[] splitURI = super.splitComponentURI(uri);

-        final String componentURI = splitURI[0];

-        final String serviceName = splitURI[1];

-        final Component targetComponent = super.resolveComponentURI(componentURI);

-        final ComponentService targetService = super.resolveService(serviceName, targetComponent);

-        final InterfaceContract targetServiceIfaceContract = targetService.getInterfaceContract();

-

-        // Re-create the resolved Endpoint

-        this.resolvedEndpoint = new EndpointReferenceImpl(

-                (RuntimeComponent) targetComponent, targetService, null, 

-                targetServiceIfaceContract);

-

-        // Copy the Java Interface from the Service

-        final JavaInterface ji = (JavaInterface) targetServiceIfaceContract.getInterface();

-        this.businessInterface = (Class<B>) ji.getJavaClass();

-        

-        // We need to re-create the callback wire. We need to do this on a clone of the Service

-        // wire since we need to change some details on it.

-        // FIXME: Is this the best way to do this?

-        final RuntimeWire cbWire = ((RuntimeComponentService) targetService).getRuntimeWires().get(0);

-        try {

-            this.wire = (RuntimeWireImpl) cbWire.clone();

-        } catch (CloneNotSupportedException e) {

-            throw new IOException(e.toString());

-        }

-

-        // Setup the reference on the cloned wire

-        final RuntimeComponentReference ref = new RuntimeComponentReferenceImpl();

-        ref.setComponent((RuntimeComponent) targetComponent);

-        ref.setInterfaceContract(targetServiceIfaceContract);

-        ((EndpointReferenceImpl) this.wire.getSource()).setContract(ref);

-    }

-

-    /**

-     * {@inheritDoc}

-     */

-    @Override

-    public void writeExternal(ObjectOutput out) throws IOException {

-        super.writeExternal(out);

-        out.writeObject(this.callbackID);

-        out.writeObject(this.convID);

-        out.writeUTF(this.resolvedEndpoint.getURI());

-    }

-}

diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
deleted file mode 100644
index b5b40811ad..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.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.core.invocation;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.core.factory.ObjectCreationException;

-import org.apache.tuscany.sca.core.factory.ObjectFactory;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-import org.osoa.sca.CallableReference;

-

-/**

- * Uses a wire to return a CallableReference

- * 

- * @version $Rev: 574648 $ $Date: 2007-09-11 18:45:36 +0100 (Tue, 11 Sep 2007) $

- */

-public class CallbackReferenceObjectFactory implements ObjectFactory<CallableReference<?>> {

-    private Class<?> businessInterface;

-    private ProxyFactory proxyFactory;

-    private List<RuntimeWire> wires;

-

-    public CallbackReferenceObjectFactory(Class<?> interfaze, ProxyFactory proxyFactory, List<RuntimeWire> wires) {

-        this.businessInterface = interfaze;

-        this.proxyFactory = proxyFactory;

-        this.wires = wires;

-    }

-

-    public CallableReference<?> getInstance() throws ObjectCreationException {

-        return CallbackReferenceImpl.newInstance(businessInterface, proxyFactory, wires);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
deleted file mode 100644
index 2b37c30451..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.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.core.invocation;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Returns proxy instance for a wire callback
- *
- * @version $Rev$ $Date$
- */
-public class CallbackWireObjectFactory<B> implements ObjectFactory<B> {
-    private Class<B> businessInterface;
-    private ProxyFactory proxyFactory;
-    private List<RuntimeWire> wires;
-
-    public CallbackWireObjectFactory(Class<B> interfaze, ProxyFactory proxyFactory, List<RuntimeWire> wires) {
-        this.businessInterface = interfaze;
-        this.proxyFactory = proxyFactory;
-        this.wires = wires;
-    }
-
-    public B getInstance() throws ObjectCreationException {
-        return proxyFactory.createCallbackProxy(businessInterface, wires);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
deleted file mode 100644
index 0fa1d27d2a..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.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.core.invocation;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- * The implementation of a wire service that uses cglib dynamic proxies
- * 
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("unused")
-public class CglibProxyFactory implements ProxyFactory {
-    private MessageFactory messageFactory;
-
-    public CglibProxyFactory(MessageFactory messageFactory, InterfaceContractMapper mapper) {
-        this.messageFactory = messageFactory;
-
-    }
-
-    public <T> T createProxy(Class<T> interfaze, RuntimeWire wire) throws ProxyCreationException {
-        ServiceReference<T> serviceReference = new ServiceReferenceImpl(interfaze, wire, this);
-        return createProxy(serviceReference);
-    }
-
-    /**
-     * create the proxy with cglib. use the same JDKInvocationHandler as
-     * JDKProxyService.
-     */
-    public <T> T createProxy(CallableReference<T> callableReference) throws ProxyCreationException {
-        Enhancer enhancer = new Enhancer();
-        Class<T> interfaze = callableReference.getBusinessInterface();
-        enhancer.setSuperclass(interfaze);
-        enhancer.setCallback(new CglibMethodInterceptor<T>(callableReference));
-        Object proxy = enhancer.create();
-		((CallableReferenceImpl)callableReference).setProxy(proxy);
-        return interfaze.cast(proxy);
-    }
-
-    /**
-     * create the callback proxy with cglib. use the same
-     * JDKCallbackInvocationHandler as JDKProxyService.
-     */
-    public <T> T createCallbackProxy(Class<T> interfaze, final List<RuntimeWire> wires) throws ProxyCreationException {
-        CallbackReferenceImpl<T> callbackReference = CallbackReferenceImpl.newInstance(interfaze, this, wires);
-        return callbackReference != null ? createCallbackProxy(callbackReference) : null;
-    }
-
-    /**
-     * create the callback proxy with cglib. use the same
-     * JDKCallbackInvocationHandler as JDKProxyService.
-     */
-    public <T> T createCallbackProxy(CallbackReferenceImpl<T> callbackReference) throws ProxyCreationException {
-        Enhancer enhancer = new Enhancer();
-        Class<T> interfaze = callbackReference.getBusinessInterface();
-        enhancer.setSuperclass(interfaze);
-        enhancer.setCallback(new CglibMethodInterceptor<T>(callbackReference));
-        Object proxy = enhancer.create();
-		callbackReference.setProxy(proxy);
-        return interfaze.cast(proxy);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        if (isProxyClass(target.getClass())) {
-            Factory factory = (Factory)target;
-            Callback[] callbacks = factory.getCallbacks();
-            if (callbacks.length != 1 || !(callbacks[0] instanceof CglibMethodInterceptor)) {
-                throw new IllegalArgumentException("The object is not a known proxy.");
-            }
-            CglibMethodInterceptor interceptor = (CglibMethodInterceptor)callbacks[0];
-            return (R)interceptor.invocationHandler.getCallableReference();
-        } else {
-            throw new IllegalArgumentException("The object is not a known proxy.");
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#isProxyClass(java.lang.Class)
-     */
-    public boolean isProxyClass(Class<?> clazz) {
-        return Factory.class.isAssignableFrom(clazz);
-    }
-
-    private class CglibMethodInterceptor<T> implements MethodInterceptor {
-        private JDKInvocationHandler invocationHandler;
-
-        public CglibMethodInterceptor(CallableReference<T> callableReference) {
-            invocationHandler = new JDKInvocationHandler(messageFactory, callableReference);
-        }
-
-        public CglibMethodInterceptor(CallbackReferenceImpl<T> callbackReference) {
-            invocationHandler = new JDKCallbackInvocationHandler(messageFactory, callbackReference);
-        }
-
-        /*
-        public CglibMethodInterceptor(Class<T> interfaze, RuntimeWire wire) {
-            ServiceReference<T> serviceRef = new ServiceReferenceImpl<T>(interfaze, wire, CglibProxyFactory.this);
-            invocationHandler = new JDKInvocationHandler(messageFactory, serviceRef);
-        }
-
-        public CglibMethodInterceptor(Class<T> interfaze, List<RuntimeWire> wires) {
-            CallbackReferenceImpl ref = new CallbackReferenceImpl(interfaze, CglibProxyFactory.this, wires);
-            invocationHandler = new JDKCallbackInvocationHandler(messageFactory, ref);
-        }
-		*/
-
-        /**
-         * @see net.sf.cglib.proxy.MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], net.sf.cglib.proxy.MethodProxy)
-         */
-        public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
-            Object result = invocationHandler.invoke(proxy, method, args);
-            return result;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
deleted file mode 100644
index 9acb4be6f8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.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.core.invocation;
-
-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.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-/**
- * Default implementation of a ProxyFactoryExtensionPoint.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultProxyFactoryExtensionPoint implements ProxyFactoryExtensionPoint {
-    private InterfaceContractMapper interfaceContractMapper;
-    private MessageFactory messageFactory;
-
-    private ProxyFactory interfaceFactory;
-    private ProxyFactory classFactory;
-
-    public DefaultProxyFactoryExtensionPoint(ExtensionPointRegistry extensionPoints) {
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
-        
-        interfaceFactory = new JDKProxyFactory(messageFactory, interfaceContractMapper);
-    }
-
-    public DefaultProxyFactoryExtensionPoint(MessageFactory messageFactory, InterfaceContractMapper mapper) {
-        this.interfaceContractMapper = mapper;
-        this.messageFactory = messageFactory;
-        interfaceFactory = new JDKProxyFactory(messageFactory, mapper);
-    }
-
-    public ProxyFactory getClassProxyFactory() {
-        return classFactory;
-    }
-
-    public ProxyFactory getInterfaceProxyFactory() {
-        return interfaceFactory;
-    }
-
-    public void setClassProxyFactory(ProxyFactory factory) {
-        this.classFactory = factory;
-
-    }
-
-    public void setInterfaceProxyFactory(ProxyFactory factory) {
-        this.interfaceFactory = factory;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
deleted file mode 100644
index fcb48259b9..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.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.core.invocation;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-
-/**
- * An extensible proxy factory.
- *
- * @version $Rev: $ $Date: $
- */
-public class ExtensibleProxyFactory implements ProxyFactory {
-    
-    private ProxyFactoryExtensionPoint proxyFactories;
-
-    public ExtensibleProxyFactory(ProxyFactoryExtensionPoint proxyFactories) {
-        this.proxyFactories = proxyFactories;
-    }
-    
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#cast(java.lang.Object)
-     */
-    @SuppressWarnings("unchecked")
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        if (interfaceFactory.isProxyClass(target.getClass())) {
-            return (R)interfaceFactory.cast(target);
-        } else if (classFactory != null && classFactory.isProxyClass(target.getClass())) {
-            return (R)classFactory.cast(target);
-        } else {
-            throw new IllegalArgumentException("The target is not a callable proxy");
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#createCallbackProxy(java.lang.Class,
-     *      java.util.List)
-     */
-    public <T> T createCallbackProxy(Class<T> interfaze, List<RuntimeWire> wires) throws ProxyCreationException {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        if (interfaze.isInterface()) {
-            return interfaceFactory.createCallbackProxy(interfaze, wires);
-        } else {
-            return classFactory.createCallbackProxy(interfaze, wires);
-        }
-    }
-
-    public <T> T createProxy(CallableReference<T> callableReference) throws ProxyCreationException {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        if (callableReference.getBusinessInterface().isInterface()) {
-            return interfaceFactory.createProxy(callableReference);
-        } else {
-            return classFactory.createProxy(callableReference);
-        }
-    }
-
-    public <T> T createCallbackProxy(CallbackReferenceImpl<T> callbackReference) throws ProxyCreationException {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        if (callbackReference.getBusinessInterface().isInterface()) {
-            return interfaceFactory.createCallbackProxy(callbackReference);
-        } else {
-            return classFactory.createCallbackProxy(callbackReference);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#createProxy(java.lang.Class,
-     *      org.apache.tuscany.sca.runtime.RuntimeWire)
-     */
-    public <T> T createProxy(Class<T> interfaze, RuntimeWire wire) throws ProxyCreationException {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        if (interfaze.isInterface()) {
-            return interfaceFactory.createProxy(interfaze, wire);
-        } else {
-            return classFactory.createProxy(interfaze, wire);
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#isProxyClass(java.lang.Class)
-     */
-    public boolean isProxyClass(Class<?> clazz) {
-        ProxyFactory interfaceFactory = proxyFactories.getInterfaceProxyFactory();
-        ProxyFactory classFactory = proxyFactories.getClassProxyFactory();
-        return interfaceFactory.isProxyClass(clazz) || (classFactory != null && classFactory.isProxyClass(clazz));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
deleted file mode 100644
index 934f2f7aa0..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.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.core.invocation;
-
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
-
-/**
- * The default implementation of an extensible <code>WireProcessor</code>
- *
- * @version $Rev$ $Date$
- */
-public class ExtensibleWireProcessor implements RuntimeWireProcessor {
-    
-    private RuntimeWireProcessorExtensionPoint processors;
-
-    public ExtensibleWireProcessor(RuntimeWireProcessorExtensionPoint processors) {
-        this.processors = processors;
-    }
-    
-    public void process(RuntimeWire wire) {
-        for (RuntimeWireProcessor processor : processors.getWireProcessors()) {
-            processor.process(wire);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
deleted file mode 100644
index 1a33e91a98..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.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.core.invocation;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Phase;
-
-/**
- * Default implementation of an invocation chain
- * 
- * @version $Rev$ $Date$
- */
-public class InvocationChainImpl implements InvocationChain {
-    private Operation sourceOperation;
-    private Operation targetOperation;
-    private List<Node> nodes = new ArrayList<Node>();
-
-    // FIXME: Not a good practice to use static reference
-    private static final PhaseManager phaseManager = new PhaseManager();
-    private boolean forReference;
-    private boolean allowsPassByReference;
-
-    public InvocationChainImpl(Operation sourceOperation, Operation targetOperation, boolean forReference) {
-        assert sourceOperation != null;
-        assert targetOperation != null;
-        this.targetOperation = targetOperation;
-        this.sourceOperation = sourceOperation;
-        this.forReference = forReference;
-    }
-
-    public Operation getTargetOperation() {
-        return targetOperation;
-    }
-
-    public void setTargetOperation(Operation operation) {
-        this.targetOperation = operation;
-    }
-
-    public void addInterceptor(Interceptor interceptor) {
-        String phase = forReference ? Phase.REFERENCE : Phase.SERVICE;
-        addInterceptor(phase, interceptor);
-    }
-
-    public void addInvoker(Invoker invoker) {
-        String phase = forReference ? Phase.REFERENCE_BINDING : Phase.IMPLEMENTATION;
-        addInvoker(phase, invoker);
-    }
-
-    public Invoker getHeadInvoker() {
-        return nodes.isEmpty() ? null : nodes.get(0).getInvoker();
-    }
-
-    public Invoker getTailInvoker() {
-        return nodes.isEmpty() ? null : nodes.get(nodes.size() - 1).getInvoker();
-    }
-
-    /**
-     * @return the sourceOperation
-     */
-    public Operation getSourceOperation() {
-        return sourceOperation;
-    }
-
-    /**
-     * @param sourceOperation the sourceOperation to set
-     */
-    public void setSourceOperation(Operation sourceOperation) {
-        this.sourceOperation = sourceOperation;
-    }
-
-    public void addInterceptor(int index, Interceptor interceptor) {
-        addInterceptor(interceptor);
-    }
-
-    public void addInterceptor(String phase, Interceptor interceptor) {
-        addInvoker(phase, interceptor);
-    }
-
-    private void addInvoker(String phase, Invoker invoker) {
-        int index = phaseManager.getAllPhases().indexOf(phase);
-        if (index == -1) {
-            throw new IllegalArgumentException("Invalid phase name: " + phase);
-        }
-        Node node = new Node(index, invoker);
-        ListIterator<Node> li = nodes.listIterator();
-        Node before = null, after = null;
-        boolean found = false;
-        while (li.hasNext()) {
-            before = after;
-            after = li.next();
-            if (after.getPhaseIndex() > index) {
-                // Move back
-                li.previous();
-                li.add(node);
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            // Add to the end
-            nodes.add(node);
-            before = after;
-            after = null;
-        }
-
-        // Relink the interceptors
-        if (before != null) {
-            if (before.getInvoker() instanceof Interceptor) {
-                ((Interceptor)before.getInvoker()).setNext(invoker);
-            }
-        }
-        if (after != null) {
-            if (invoker instanceof Interceptor) {
-                ((Interceptor)invoker).setNext(after.getInvoker());
-            }
-        }
-
-    }
-
-    public boolean allowsPassByReference() {
-        if (allowsPassByReference) {
-            // No need to check the invokers
-            return true;
-        }
-        // Check if any of the invokers allows pass-by-reference
-        boolean allowsPBR = false;
-        for (Node i : nodes) {
-            if (i.getInvoker() instanceof DataExchangeSemantics) {
-                if (((DataExchangeSemantics)i.getInvoker()).allowsPassByReference()) {
-                    allowsPBR = true;
-                    break;
-                }
-            }
-        }
-        return allowsPBR;
-    }
-
-    public void setAllowsPassByReference(boolean allowsPBR) {
-        this.allowsPassByReference = allowsPBR;
-    }
-
-    private static class Node {
-        private int phaseIndex;
-        private Invoker invoker;
-
-        public Node(int phaseIndex, Invoker invoker) {
-            super();
-            this.phaseIndex = phaseIndex;
-            this.invoker = invoker;
-        }
-
-        public int getPhaseIndex() {
-            return phaseIndex;
-        }
-
-        public Invoker getInvoker() {
-            return invoker;
-        }
-
-        public String toString() {
-            return "(" + phaseIndex + ")" + invoker;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
deleted file mode 100644
index cade0499d3..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.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.core.invocation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.core.assembly.RuntimeWireImpl;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.core.conversation.ConversationState;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Responsible for dispatching to a callback through a wire. <p/> TODO cache
- * target invoker
- * 
- * @version $Rev$ $Date$
- */
-public class JDKCallbackInvocationHandler extends JDKInvocationHandler {
-    private static final long serialVersionUID = -3350283555825935609L;
-
-    public JDKCallbackInvocationHandler(MessageFactory messageFactory, CallbackReferenceImpl ref) {
-        super(messageFactory, ref);
-        this.fixedWire = false;
-    }
-
-    @Override
-    @SuppressWarnings( {"unchecked"})
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if (Object.class == method.getDeclaringClass()) {
-            return invokeObjectMethod(method, args);
-        }
-
-        // obtain a dedicated wire to be used for this callback invocation
-        RuntimeWire wire = ((CallbackReferenceImpl)callableReference).getCallbackWire();
-        if (wire == null) {
-            //FIXME: need better exception
-            throw new ServiceRuntimeException("No callback wire found");
-        }
-
-        // set the conversational state based on the interface that
-        // is specified for the reference that this wire belongs to
-        initConversational(wire);
-
-        // set the conversation id into the conversation object. This is
-        // a special case for callbacks as, unless otherwise set manually,
-        // the callback should use the same conversation id as was received
-        // on the incoming call to this component
-        if (conversational) {
-
-            if (conversation == null || conversation.getState() == ConversationState.ENDED) {
-                conversation = null;
-            }
-            Object convID = conversation == null ? null : conversation.getConversationID();
-
-            // create a conversation id if one doesn't exist 
-            // already, i.e. the conversation is just starting
-            if (convID == null) {
-                convID = ((CallbackReferenceImpl)callableReference).getConvID();
-                if (convID != null) {
-                    conversation = ((RuntimeWireImpl)wire).getConversationManager().getConversation(convID);
-                    if (callableReference != null) {
-                        ((CallableReferenceImpl)callableReference).attachConversation(conversation);
-                    }
-                }
-            }
-        }
-
-        setEndpoint(((CallbackReferenceImpl)callableReference).getResolvedEndpoint());
-
-        InvocationChain chain = getInvocationChain(method, wire);
-        if (chain == null) {
-            throw new IllegalArgumentException("No matching operation is found: " + method);
-        }
-
-        try {
-            return invoke(chain, args, wire, wire.getSource());
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof NoRegisteredCallbackException) {
-                throw t;
-            }
-            throw e;
-        } finally {
-            // allow the cloned wire to be reused by subsequent callbacks
-            ((RuntimeWireImpl)wire).releaseWire();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
deleted file mode 100644
index a23b9af9ad..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.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.core.invocation;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.tuscany.sca.core.assembly.RuntimeWireImpl;
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.conversation.ConversationState;
-import org.apache.tuscany.sca.core.conversation.ExtendedConversation;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetResolutionException;
-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.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-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.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JDKInvocationHandler implements InvocationHandler, Serializable {
-    private static final long serialVersionUID = -3366410500152201371L;
-
-    protected boolean conversational;
-    protected ExtendedConversation conversation;
-    protected MessageFactory messageFactory;
-    protected EndpointReference source;
-    protected EndpointReference target;
-    protected RuntimeWire wire;
-    protected CallableReference<?> callableReference;
-    protected Class<?> businessInterface;
-
-    protected boolean fixedWire = true;
-
-    protected transient Map<Method, InvocationChain> chains = new HashMap<Method, InvocationChain>();
-
-    public JDKInvocationHandler(MessageFactory messageFactory, Class<?> businessInterface, RuntimeWire wire) {
-        this.messageFactory = messageFactory;
-        this.wire = wire;
-        this.businessInterface = businessInterface;
-        init(this.wire);
-    }
-
-    public JDKInvocationHandler(MessageFactory messageFactory, CallableReference<?> callableReference) {
-        this.messageFactory = messageFactory;
-        this.callableReference = callableReference;
-        if (callableReference != null) {
-            this.businessInterface = callableReference.getBusinessInterface();
-            this.conversation = (ExtendedConversation)callableReference.getConversation();
-            this.wire = ((CallableReferenceImpl<?>)callableReference).getRuntimeWire();
-            if (wire != null) {
-                init(wire);
-            }
-        }
-    }
-
-    protected void init(RuntimeWire wire) {
-        if (wire != null) {
-            try {
-                // Clone the endpoint reference so that reference parameters can be changed
-                source = (EndpointReference)wire.getSource().clone();
-            } catch (CloneNotSupportedException e) {
-                throw new ServiceRuntimeException(e);
-            }
-            initConversational(wire);
-        }
-    }
-
-    protected void initConversational(RuntimeWire wire) {
-        InterfaceContract contract = wire.getSource().getInterfaceContract();
-        this.conversational = contract.getInterface().isConversational();
-    }
-
-    protected Object getCallbackID() {
-        if (callableReference != null) {
-            return callableReference.getCallbackID();
-        } else {
-            return null;
-        }
-    }
-
-    protected Object getConversationID() {
-        if (callableReference != null && callableReference instanceof ServiceReference) {
-            return ((ServiceReference)callableReference).getConversationID();
-        } else {
-            return null;
-        }
-    }
-
-    protected Object getCallbackObject() {
-        if (callableReference != null && callableReference instanceof ServiceReference) {
-            return ((ServiceReference)callableReference).getCallback();
-        } else {
-            return null;
-        }
-    }
-
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        if (Object.class == method.getDeclaringClass()) {
-            return invokeObjectMethod(method, args);
-        }
-        if (wire == null) {
-            throw new ServiceRuntimeException("No runtime wire is available");
-        }
-        InvocationChain chain = getInvocationChain(method, wire);
-        if (chain == null) {
-            throw new IllegalArgumentException("No matching operation is found: " + method);
-        }
-
-        // send the invocation down the wire
-        Object result = invoke(chain, args, wire, source);
-
-        return result;
-    }
-
-    /**
-     * Handle the methods on the Object.class
-     * @param method
-     * @param args
-     */
-    protected Object invokeObjectMethod(Method method, Object[] args) throws Throwable {
-        String name = method.getName();
-        if ("toString".equals(name)) {
-            return "[Proxy - " + toString() + "]";
-        } else if ("equals".equals(name)) {
-            Object obj = args[0];
-            if (obj == null) {
-                return false;
-            }
-            if (!Proxy.isProxyClass(obj.getClass())) {
-                return false;
-            }
-            return equals(Proxy.getInvocationHandler(obj));
-        } else if ("hashCode".equals(name)) {
-            return hashCode();
-        } else {
-            return method.invoke(this);
-        }
-    }
-
-    /**
-     * Determines if the given operation matches the given method
-     * 
-     * @return true if the operation matches, false if does not
-     */
-    // FIXME: Should it be in the InterfaceContractMapper?
-    @SuppressWarnings("unchecked")
-    private static boolean match(Operation operation, Method method) {
-        if (operation instanceof JavaOperation) {
-            JavaOperation javaOp = (JavaOperation)operation;
-            Method m = javaOp.getJavaMethod();
-            if (!method.getName().equals(m.getName())) {
-                return false;
-            }
-            if (method.equals(m)) {
-                return true;
-            }
-        } else {
-            if (!method.getName().equals(operation.getName())) {
-                return false;
-            }
-        }
-
-        // For remotable interface, operation is not overloaded. 
-        if (operation.getInterface().isRemotable()) {
-            return true;
-        }
-
-        Class<?>[] params = method.getParameterTypes();
-
-        DataType<List<DataType>> inputType = null;
-        if (operation.isWrapperStyle()) {
-            inputType = operation.getWrapper().getUnwrappedInputType();
-        } else {
-            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];
-                Class<?> type = types.get(i).getPhysical();
-                // Object.class.isAssignableFrom(int.class) returns false
-                if (type != Object.class && (!type.isAssignableFrom(clazz))) {
-                    matched = false;
-                }
-            }
-        } else {
-            matched = false;
-        }
-        return matched;
-
-    }
-
-    protected synchronized InvocationChain getInvocationChain(Method method, RuntimeWire wire) {
-        if (fixedWire && chains.containsKey(method)) {
-            return chains.get(method);
-        }
-        InvocationChain found = null;
-        for (InvocationChain chain : wire.getInvocationChains()) {
-            Operation operation = chain.getSourceOperation();
-            if (operation.isDynamic()) {
-                operation.setName(method.getName());
-                found = chain;
-                break;
-            } else if (match(operation, method)) {
-                found = chain;
-                break;
-            }
-        }
-        if (fixedWire) {
-            chains.put(method, found);
-        }
-        return found;
-    }
-
-    protected void setEndpoint(EndpointReference endpoint) {
-        this.target = endpoint;
-    }
-
-    protected Object invoke(InvocationChain chain, Object[] args, RuntimeWire wire, EndpointReference source)
-                         throws Throwable {
-        Message msg = messageFactory.createMessage();
-        msg.setFrom(source);
-        if (target != null) {
-            msg.setTo(target);
-        } else {
-            msg.setTo(wire.getTarget());
-        }
-        Invoker headInvoker = chain.getHeadInvoker();
-        Operation operation = chain.getTargetOperation();
-        msg.setOperation(operation);
-        msg.setBody(args);
-
-        Message msgContext = ThreadMessageContext.getMessageContext();
-        Object currentConversationID = msgContext.getFrom().getReferenceParameters().getConversationID();
-
-        conversationPreinvoke(msg, wire);
-        handleCallback(msg, wire, currentConversationID);
-        ThreadMessageContext.setMessageContext(msg);
-        boolean abnormalEndConversation = false;
-        try {
-            // dispatch the wire down the chain and get the response
-            Message resp = headInvoker.invoke(msg);
-            Object body = resp.getBody();
-            if (resp.isFault()) {
-                // mark the conversation as ended if the exception is not a business exception
-                if (currentConversationID != null ){
-                    try {
-                        boolean businessException = false;
-                        
-                        for (DataType dataType : operation.getFaultTypes()){
-                            if (dataType.getPhysical() == ((Throwable)body).getClass()){
-                                businessException = true;
-                                break;
-                            }
-                        }
-                        
-                        if (businessException == false){
-                            abnormalEndConversation = true;
-                        }
-                    } catch (Exception ex){
-                        // TODO - sure what the best course of action is here. We have
-                        //        a system exception in the middle of a business exception 
-                    }
-                }
-                throw (Throwable)body;
-            }
-            return body;
-        } finally {
-            conversationPostInvoke(msg, wire, abnormalEndConversation);
-            ThreadMessageContext.setMessageContext(msgContext);
-        }
-    }
-
-    /**
-     * @param msg
-     * @param wire
-     * @param interfaze
-     * @throws TargetResolutionException
-     */
-    private void handleCallback(Message msg, RuntimeWire wire, Object currentConversationID)
-        throws TargetResolutionException {
-        ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
-        parameters.setCallbackID(getCallbackID());
-        if (msg.getFrom() == null || msg.getFrom().getCallbackEndpoint() == null) {
-            return;
-        }
-
-        parameters.setCallbackReference(msg.getFrom().getCallbackEndpoint());
-
-        // If we are passing out a callback target
-        // register the calling component instance against this 
-        // new conversation id so that stateful callbacks will be
-        // able to find it
-        Object callbackObject = getCallbackObject();
-        if (conversational && callbackObject == null) {
-            // the component instance is already registered
-            // so add another registration
-            ScopeContainer<Object> scopeContainer = getConversationalScopeContainer(wire);
-
-            if (scopeContainer != null && currentConversationID != null) {
-                scopeContainer.addWrapperReference(currentConversationID, conversation.getConversationID());
-            }
-        }
-
-        Interface interfaze = msg.getFrom().getCallbackEndpoint().getInterfaceContract().getInterface();
-        if (callbackObject != null) {
-            if (callbackObject instanceof ServiceReference) {
-                EndpointReference callbackRef = ((CallableReferenceImpl)callbackObject).getEndpointReference();
-                parameters.setCallbackReference(callbackRef);
-            } else {
-                if (interfaze != null) {
-                    if (!interfaze.isConversational()) {
-                        throw new IllegalArgumentException(
-                                                           "Callback object for stateless callback is not a ServiceReference");
-                    } else {
-                        if (!(callbackObject instanceof Serializable)) {
-                            throw new IllegalArgumentException(
-                                          "Callback object for stateful callback is not Serializable");
-                        }
-                        ScopeContainer scopeContainer = getConversationalScopeContainer(wire);
-                        if (scopeContainer != null) {
-                            InstanceWrapper wrapper = new CallbackObjectWrapper(callbackObject);
-                            scopeContainer.registerWrapper(wrapper, conversation.getConversationID());
-                        }
-                        parameters.setCallbackObjectID(callbackObject);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Pre-invoke for the conversation handling
-     * @param msg
-     * @throws TargetResolutionException
-     */
-    private void conversationPreinvoke(Message msg, RuntimeWire wire) {
-        if (!conversational) {
-            // Not conversational or the conversation has been started
-            return;
-        }
-
-        ConversationManager conversationManager = ((RuntimeWireImpl)wire).getConversationManager();
-
-        if (conversation == null || conversation.getState() == ConversationState.ENDED) {
-
-            conversation = conversationManager.startConversation(getConversationID());
-            
-            // if this is a local wire then set up the conversation timeouts here based on the 
-            // parameters from the component
-            if (wire.getTarget().getComponent() != null){
-                conversation.initializeConversationAttributes(wire.getTarget().getComponent());
-            }
-            
-            // connect the conversation to the CallableReference so it can be retrieve in the future
-            if (callableReference != null) {
-                ((CallableReferenceImpl)callableReference).attachConversation(conversation);
-            }
-        } else if (conversation.isExpired()) {
-            throw new ConversationEndedException("Conversation " +  conversation.getConversationID() + " has expired.");
-        }
-
-        // if this is a local wire then schedule conversation timeouts based on the timeout
-        // parameters from the service implementation. If this isn't a local wire then
-        // the RuntimeWireInvoker will take care of this
-        if (wire.getTarget().getComponent() != null){
-            conversation.updateLastReferencedTime();
-        }
-
-        msg.getFrom().getReferenceParameters().setConversationID(conversation.getConversationID());
-
-    }
-
-    /**
-     * Post-invoke for the conversation handling
-     * @param wire
-     * @param operation
-     * @throws TargetDestructionException
-     */
-    @SuppressWarnings("unchecked")
-    private void conversationPostInvoke(Message msg, RuntimeWire wire, boolean abnormalEndConversation)
-                     throws TargetDestructionException {
-        Operation operation = msg.getOperation();
-        ConversationSequence sequence = operation.getConversationSequence();
-        // We check that conversation has not already ended as there is only one
-        // conversation manager in the runtime and so, in the case of remote bindings, 
-        // the conversation will already have been stopped when we get back to the client
-        if ((sequence == ConversationSequence.CONVERSATION_END || abnormalEndConversation) &&
-            (conversation.getState() != ConversationState.ENDED)) {
-
-            // remove conversation id from scope container
-            ScopeContainer scopeContainer = getConversationalScopeContainer(wire);
-
-            if (scopeContainer != null) {
-                scopeContainer.remove(conversation.getConversationID());
-            }
-
-            conversation.end();
-        }
-    }
-
-    private ScopeContainer<Object> getConversationalScopeContainer(RuntimeWire wire) {
-        ScopeContainer<Object> scopeContainer = null;
-
-        RuntimeComponent runtimeComponent = wire.getSource().getComponent();
-
-        if (runtimeComponent instanceof ScopedRuntimeComponent) {
-            ScopedRuntimeComponent scopedRuntimeComponent = (ScopedRuntimeComponent)runtimeComponent;
-            ScopeContainer<Object> tmpScopeContainer = scopedRuntimeComponent.getScopeContainer();
-
-            if ((tmpScopeContainer != null) && (tmpScopeContainer.getScope() == Scope.CONVERSATION)) {
-                scopeContainer = tmpScopeContainer;
-            }
-        }
-
-        return scopeContainer;
-    }
-
-    /**
-     * Creates a new conversation id
-     * 
-     * @return the conversation id
-     */
-    private Object createConversationID() {
-        if (getConversationID() != null) {
-            return getConversationID();
-        } else {
-            return UUID.randomUUID().toString();
-        }
-    }
-
-    /**
-     * @return the callableReference
-     */
-    public CallableReference<?> getCallableReference() {
-        return callableReference;
-    }
-
-    /**
-     * @param callableReference the callableReference to set
-     */
-    public void setCallableReference(CallableReference<?> callableReference) {
-        this.callableReference = callableReference;
-    }
-
-    /**
-     * Minimal wrapper for a callback object contained in a ServiceReference
-     */
-    private static class CallbackObjectWrapper<T> implements InstanceWrapper<T> {
-
-        private T instance;
-
-        private CallbackObjectWrapper(T instance) {
-            this.instance = instance;
-        }
-
-        public T getInstance() {
-            return instance;
-        }
-
-        public void start() {
-            // do nothing
-        }
-
-        public void stop() {
-            // do nothing
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
deleted file mode 100644
index 0992638318..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.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.core.invocation;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-
-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- * the default implementation of a wire service that uses JDK dynamic proxies
- * 
- * @version $Rev$ $Date$
- */
-public class JDKProxyFactory implements ProxyFactory {
-    protected InterfaceContractMapper contractMapper;
-    private MessageFactory messageFactory;
-
-    public JDKProxyFactory(MessageFactory messageFactory, InterfaceContractMapper mapper) {
-        this.contractMapper = mapper;
-        this.messageFactory = messageFactory;
-    }
-
-    /** 
-     * The original createProxy method assumes that the proxy doesn't want to 
-     * share conversation state so sets the conversation object to null
-     */
-    public <T> T createProxy(Class<T> interfaze, RuntimeWire wire) throws ProxyCreationException {
-        ServiceReference<T> serviceReference = new ServiceReferenceImpl(interfaze, wire, this);
-        return createProxy(serviceReference);
-    }
-
-    public <T> T createProxy(CallableReference<T> callableReference) throws ProxyCreationException {
-        assert callableReference != null;
-        final Class<T> interfaze = callableReference.getBusinessInterface();
-        InvocationHandler handler = new JDKInvocationHandler(messageFactory, callableReference);
-        // Allow privileged access to class loader. Requires RuntimePermission in security policy.
-        ClassLoader cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-            public ClassLoader run() {
-                return interfaze.getClassLoader();
-            }
-        });
-        Object proxy = Proxy.newProxyInstance(cl, new Class[] {interfaze}, handler);
-        ((CallableReferenceImpl)callableReference).setProxy(proxy);
-        return interfaze.cast(proxy);
-    }
-
-    public <T> T createCallbackProxy(Class<T> interfaze, List<RuntimeWire> wires) throws ProxyCreationException {
-        CallbackReferenceImpl<T> callbackReference = CallbackReferenceImpl.newInstance(interfaze, this, wires);
-        return callbackReference != null ? createCallbackProxy(callbackReference) : null;
-    }
-
-    public <T> T createCallbackProxy(CallbackReferenceImpl<T> callbackReference) throws ProxyCreationException {
-        assert callbackReference != null;
-        Class<T> interfaze = callbackReference.getBusinessInterface();
-        InvocationHandler handler = new JDKCallbackInvocationHandler(messageFactory, callbackReference);
-        ClassLoader cl = interfaze.getClassLoader();
-		Object proxy = Proxy.newProxyInstance(cl, new Class[] {interfaze}, handler);
-		callbackReference.setProxy(proxy);
-        return interfaze.cast(proxy);
-    }
-
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        InvocationHandler handler = Proxy.getInvocationHandler(target);
-        if (handler instanceof JDKInvocationHandler) {
-            return (R)((JDKInvocationHandler)handler).getCallableReference();
-        } else {
-            throw new IllegalArgumentException("The object is not a known proxy.");
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.invocation.ProxyFactory#isProxyClass(java.lang.Class)
-     */
-    public boolean isProxyClass(Class<?> clazz) {
-        return Proxy.isProxyClass(clazz);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
deleted file mode 100644
index 6e182a6a14..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.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.core.invocation;
-
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-/**
- * Implementation of MessageFactory.
- *
- * @version $Rev$ $Date$
- */
-public class MessageFactoryImpl implements MessageFactory {
-
-    public Message createMessage() {
-        return new MessageImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
deleted file mode 100644
index b5b41b9d00..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.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.core.invocation;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-
-/**
- * The default implementation of a message flowed through a wire during an invocation
- *
- * @version $Rev $Date$
- */
-public class MessageImpl implements Message { 
-    private Object body;
-    private Object messageID;
-    private boolean isFault;
-    private Operation operation;
-    private Map<String, Object> qosContext = new Hashtable<String, Object>();
-
-    private EndpointReference from;
-    private EndpointReference to;
-
-    public MessageImpl() {
-        this.from = new EndpointReferenceImpl("/");
-        this.to = new EndpointReferenceImpl("/");
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T getBody() {
-        return (T)body;
-    }
-
-    public <T> void setBody(T body) {
-        this.isFault = false;
-        this.body = body;
-    }
-
-    public Object getMessageID() {
-        return messageID;
-    }
-
-    public void setMessageID(Object messageId) {
-        this.messageID = messageId;
-    }
-
-    public boolean isFault() {
-        return isFault;
-    }
-
-    public void setFaultBody(Object fault) {
-        this.isFault = true;
-        this.body = fault;
-    }
-
-    public EndpointReference getFrom() {
-        return from;
-    }
-
-    public void setFrom(EndpointReference from) {
-        this.from = from;
-    }
-
-    public EndpointReference getTo() {
-        return to;
-    }
-
-    public void setTo(EndpointReference to) {
-        this.to = to;
-    }
-
-    public Operation getOperation() {
-        return operation;
-    }
-
-    public void setOperation(Operation op) {
-        this.operation = op;
-    }
-
-    public Map<String, Object> getQoSContext() {
-        return qosContext;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
deleted file mode 100644
index 733544d387..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.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.core.invocation;
-
-
-/**
- * Thrown when an {@link org.apache.tuscany.sca.core.factory.model.Operation} cannot be mapped to a method on an interface 
- * @version $Rev$ $Date$
- */
-public class NoMethodForOperationException extends ProxyCreationException {
-    private static final long serialVersionUID = 5116536602309483679L;
-
-    public NoMethodForOperationException() {
-    }
-
-    public NoMethodForOperationException(String message) {
-        super(message);
-    }
-
-    public NoMethodForOperationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public NoMethodForOperationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
deleted file mode 100644
index e83f9e64f9..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.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.core.invocation;
-
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.apache.tuscany.sca.work.WorkScheduler;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Adds non-blocking behavior to an invocation chain
- *
- * @version $Rev$ $Date$
- */
-public class NonBlockingInterceptor implements Interceptor {
-
-    private static final Message RESPONSE = new ImmutableMessage();
-
-    /**
-     * The JDK logger that will be used to log messages.
-     */
-    private static final Logger LOGGER = Logger.getLogger(NonBlockingInterceptor.class.getName());
-
-    private WorkScheduler workScheduler;
-    private Invoker next;
-
-    public NonBlockingInterceptor(WorkScheduler workScheduler) {
-        this.workScheduler = workScheduler;
-    }
-
-    public NonBlockingInterceptor(WorkScheduler workScheduler, Interceptor next) {
-        this.workScheduler = workScheduler;
-        this.next = next;
-    }
-
-    /**
-     * Sets desired workScheduler to NonBlockingInterceptor. This is a useful function for the extension framework
-     * to set desired workmanager on the InvocationChain, other than default workmanager which is set per Tuscany runtime.
-     * Using this function, extension framework can set desired workmanager on InvocationChain during post wire processing.
-     * @param workScheduler workScheduler which contains workmanager
-     */
-    public void setWorkScheduler(WorkScheduler workScheduler){
-        this.workScheduler = workScheduler;
-    }
-
-    public Message invoke(final Message msg) {
-        // Schedule the invocation of the next interceptor in a new Work instance
-        try {
-            workScheduler.scheduleWork(new Runnable() {
-                public void run() {
-                    Message context = ThreadMessageContext.setMessageContext(msg);
-                    try {
-                        Message response = null;
-
-                        Throwable ex = null;
-                        try {
-                            response = next.invoke(msg);
-                        } catch (Throwable t) {
-                            ex = t;
-                        }
-
-                        // Tuscany-2225 - Did the @OneWay method complete successfully?
-                        // (i.e. no exceptions)
-                        if (response != null && response.isFault()) {
-                            // The @OneWay method threw an Exception. Lets log it and
-                            // then pass it on to the WorkScheduler so it can notify any
-                            // listeners
-                            ex = (Throwable)response.getBody();
-                        }
-                        if (ex != null) {
-                            LOGGER.log(Level.SEVERE, "Exception from @OneWay invocation", ex);
-                            throw new ServiceRuntimeException("Exception from @OneWay invocation", ex);
-                        }
-                    } finally {
-                        ThreadMessageContext.setMessageContext(context);
-                    }
-                }
-            });
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return RESPONSE;
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    /**
-     * A dummy message passed back on an invocation
-     */
-    private static class ImmutableMessage implements Message {
-
-        @SuppressWarnings("unchecked")
-        public Object getBody() {
-            return null;
-        }
-
-        public void setBody(Object body) {
-            if (body != null) {
-                throw new UnsupportedOperationException();
-            }
-        }
-
-        public void setCallbackWires(LinkedList<RuntimeWire> wires) {
-
-        }
-
-        public Object getMessageID() {
-            return null;
-        }
-
-        public void setMessageID(Object messageId) {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isFault() {
-            return false;
-        }
-
-        public void setFaultBody(Object fault) {
-            throw new UnsupportedOperationException();
-        }
-
-        public EndpointReference getFrom() {
-            return null;
-        }
-
-        public EndpointReference getTo() {
-            return null;
-        }
-
-        public void setFrom(EndpointReference from) {
-            throw new UnsupportedOperationException();
-        }
-
-        public void setTo(EndpointReference to) {
-            throw new UnsupportedOperationException();
-        }
-
-        public Operation getOperation() {
-            return null;
-        }
-
-        public void setOperation(Operation op) {
-            throw new UnsupportedOperationException();
-        }
-
-        /**
-         * @see org.apache.tuscany.sca.invocation.Message#getReplyTo()
-         */
-        public EndpointReference getReplyTo() {
-            return null;
-        }
-
-        public Map<String, Object> getQoSContext() {
-            return null;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
deleted file mode 100644
index 4c98066fa2..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.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.core.invocation;
-
-import java.io.IOException;
-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.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PhaseManager {
-    private static final Logger log = Logger.getLogger(PhaseManager.class.getName());
-
-    public static final String STAGE_REFERENCE = "reference";
-    public static final String STAGE_SERVICE = "service";
-    public static final String STAGE_IMPLEMENTATION = "implementation";
-    private static final String[] SYSTEM_REFERENCE_PHASES =
-        {Phase.REFERENCE, Phase.REFERENCE_INTERFACE, Phase.REFERENCE_POLICY, Phase.REFERENCE_BINDING};
-
-    private static final String[] SYSTEM_SERVICE_PHASES =
-        {Phase.SERVICE_BINDING, Phase.SERVICE_POLICY, Phase.SERVICE_INTERFACE, Phase.SERVICE};
-
-    private static final String[] SYSTEM_IMPLEMENTATION_PHASES = {Phase.IMPLEMENTATION_POLICY, Phase.IMPLEMENTATION};
-
-    private String pattern = Phase.class.getName();
-    private Map<String, Stage> stages;
-    private List<String> phases;
-
-    public class Stage {
-        private String name;
-        private PhaseSorter<String> sorter = new PhaseSorter<String>();
-        private Set<String> firstSet = new HashSet<String>();
-        private Set<String> lastSet = new HashSet<String>();
-        private List<String> phases = new ArrayList<String>();
-
-        public Stage(String name) {
-            super();
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public PhaseSorter<String> getSorter() {
-            return sorter;
-        }
-
-        public Set<String> getFirstSet() {
-            return firstSet;
-        }
-
-        public Set<String> getLastSet() {
-            return lastSet;
-        }
-
-        public List<String> getPhases() {
-            return phases;
-        }
-
-        public String toString() {
-            return name + phases;
-        }
-    }
-
-    // For unit test purpose
-    PhaseManager(String pattern) {
-        super();
-        this.pattern = pattern;
-    }
-
-    public PhaseManager() {
-    }
-
-    private List<String> getPhases(String stage) {
-        Stage s = getStages().get(stage);
-        return s == null ? null : s.getPhases();
-    }
-
-    public List<String> getReferencePhases() {
-        return getPhases(STAGE_REFERENCE);
-    }
-
-    public List<String> getServicePhases() {
-        return getPhases(STAGE_SERVICE);
-    }
-
-    public List<String> getImplementationPhases() {
-        return getPhases(STAGE_IMPLEMENTATION);
-    }
-
-    public synchronized List<String> getAllPhases() {
-        if (phases == null) {
-            phases = new ArrayList<String>();
-            phases.addAll(getReferencePhases());
-            phases.addAll(getServicePhases());
-            phases.addAll(getImplementationPhases());
-        }
-        return phases;
-    }
-
-    public synchronized Map<String, Stage> getStages() {
-        if (stages != null) {
-            return stages;
-        }
-        init();
-
-        Set<ServiceDeclaration> services;
-        try {
-            services = ServiceDiscovery.getInstance().getServiceDeclarations(pattern);
-        } catch (IOException e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-        for (ServiceDeclaration d : services) {
-            if (log.isLoggable(Level.FINE)) {
-                log.fine(d.getResource() + ": " + d.getAttributes());
-            }
-            String name = d.getAttributes().get("name");
-            if (name == null) {
-                throw new ServiceRuntimeException("Required attribute 'name' is missing.");
-            }
-            String stageName = d.getAttributes().get("stage");
-            if (stageName == null) {
-                throw new ServiceRuntimeException("Required attribute 'stage' is missing.");
-            }
-            Stage stage = stages.get(stageName);
-            if (stage == null) {
-                throw new ServiceRuntimeException("Invalid stage: " + stage);
-            }
-            PhaseSorter<String> graph = stage.getSorter();
-            Set<String> firstSet = stage.getFirstSet(), lastSet = stage.getLastSet();
-
-            String before = d.getAttributes().get("before");
-            String after = d.getAttributes().get("after");
-            if (before != null) {
-                StringTokenizer tokenizer = new StringTokenizer(before);
-                while (tokenizer.hasMoreTokens()) {
-                    String p = tokenizer.nextToken();
-                    if (!"*".equals(p)) {
-                        graph.addEdge(name, p);
-                    } else {
-                        firstSet.add(name);
-                    }
-                }
-            }
-            if (after != null) {
-                StringTokenizer tokenizer = new StringTokenizer(after);
-                while (tokenizer.hasMoreTokens()) {
-                    String p = tokenizer.nextToken();
-                    if (!"*".equals(p)) {
-                        graph.addEdge(p, name);
-                    } else {
-                        lastSet.add(name);
-                    }
-                }
-            }
-            graph.addVertext(name);
-            if(firstSet.size()>1) {
-                log.warning("More than one phases are declared to be first: "+firstSet);
-            }
-            for (String s : firstSet) {
-                for (String v : new HashSet<String>(graph.getVertices().keySet())) {
-                    if (!firstSet.contains(v)) {
-                        graph.addEdge(s, v);
-                    }
-                }
-            }
-            if(lastSet.size()>1) {
-                log.warning("More than one phases are declared to be the last: "+lastSet);
-            }
-            for (String s : lastSet) {
-                for (String v : new HashSet<String>(graph.getVertices().keySet())) {
-                    if (!lastSet.contains(v)) {
-                        graph.addEdge(v, s);
-                    }
-                }
-            }
-
-        }
-
-        for (Stage s : stages.values()) {
-            List<String> phases = s.getSorter().topologicalSort(false);
-            s.getPhases().clear();
-            s.getPhases().addAll(phases);
-        }
-        if (log.isLoggable(Level.FINE)) {
-            log.fine("Stages: " + stages);
-        }
-        return stages;
-    }
-
-    private void init() {
-        stages = new HashMap<String, Stage>();
-
-        Stage referenceStage = new Stage(STAGE_REFERENCE);
-        for (int i = 1; i < SYSTEM_REFERENCE_PHASES.length; i++) {
-            referenceStage.getSorter().addEdge(SYSTEM_REFERENCE_PHASES[i - 1], SYSTEM_REFERENCE_PHASES[i]);
-        }
-        referenceStage.getLastSet().add(Phase.REFERENCE_BINDING);
-        stages.put(referenceStage.getName(), referenceStage);
-
-        Stage serviceStage = new Stage(STAGE_SERVICE);
-        for (int i = 1; i < SYSTEM_SERVICE_PHASES.length; i++) {
-            serviceStage.getSorter().addEdge(SYSTEM_SERVICE_PHASES[i - 1], SYSTEM_SERVICE_PHASES[i]);
-        }
-        stages.put(serviceStage.getName(), serviceStage);
-
-        Stage implementationStage = new Stage(STAGE_IMPLEMENTATION);
-        for (int i = 1; i < SYSTEM_IMPLEMENTATION_PHASES.length; i++) {
-            implementationStage.getSorter().addEdge(SYSTEM_IMPLEMENTATION_PHASES[i - 1],
-                                                    SYSTEM_IMPLEMENTATION_PHASES[i]);
-        }
-        implementationStage.getLastSet().add(Phase.IMPLEMENTATION);
-        stages.put(implementationStage.getName(), implementationStage);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
deleted file mode 100644
index fc4bea3d9f..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.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.core.invocation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Directed, weighted graph
- * 
- * @param <V> The type of vertex object
- * @param <E> The type of edge object
- *
- * @version $Rev$ $Date$
- */
-public class PhaseSorter<V> implements Cloneable {
-    private final Map<V, Vertex> vertices = new HashMap<V, Vertex>();
-
-    /**
-     * Vertex of a graph
-     */
-    public final class Vertex {
-        private V value;
-
-        // TODO: Do we want to support multiple edges for a vertex pair? If so,
-        // we should use a List instead of Map
-        private Map<Vertex, Edge> outEdges = new HashMap<Vertex, Edge>();
-        private Map<Vertex, Edge> inEdges = new HashMap<Vertex, Edge>();
-
-        private Vertex(V value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return "(" + value + ")";
-        }
-
-        public V getValue() {
-            return value;
-        }
-
-        public Map<Vertex, Edge> getOutEdges() {
-            return outEdges;
-        }
-
-        public Map<Vertex, Edge> getInEdges() {
-            return inEdges;
-        }
-
-    }
-
-    /**
-     * An Edge connects two vertices in one direction
-     */
-    public final class Edge {
-        private Vertex sourceVertex;
-
-        private Vertex targetVertex;
-
-        public Edge(Vertex source, Vertex target) {
-            this.sourceVertex = source;
-            this.targetVertex = target;
-        }
-
-        @Override
-        public String toString() {
-            return sourceVertex + "->" + targetVertex;
-        }
-
-        public Vertex getTargetVertex() {
-            return targetVertex;
-        }
-
-        public void setTargetVertex(Vertex vertex) {
-            this.targetVertex = vertex;
-        }
-
-        public Vertex getSourceVertex() {
-            return sourceVertex;
-        }
-
-        public void setSourceVertex(Vertex sourceVertex) {
-            this.sourceVertex = sourceVertex;
-        }
-    }
-
-    public void addEdge(V source, V target) {
-        Vertex s = getVertex(source);
-        if (s == null) {
-            s = new Vertex(source);
-            vertices.put(source, s);
-        }
-        Vertex t = getVertex(target);
-        if (t == null) {
-            t = new Vertex(target);
-            vertices.put(target, t);
-        }
-        Edge edge = new Edge(s, t);
-        s.outEdges.put(t, edge);
-        t.inEdges.put(s, edge);
-    }
-
-    public void addVertext(V source) {
-        Vertex s = getVertex(source);
-        if (s == null) {
-            s = new Vertex(source);
-            vertices.put(source, s);
-        }
-    }
-
-    public Vertex getVertex(V source) {
-        Vertex s = vertices.get(source);
-        return s;
-    }
-
-    public boolean removeEdge(V source, V target) {
-        Vertex s = getVertex(source);
-        if (s == null) {
-            return false;
-        }
-
-        Vertex t = getVertex(target);
-        if (t == null) {
-            return false;
-        }
-
-        return s.outEdges.remove(t) != null && t.inEdges.remove(s) != null;
-
-    }
-
-    public void removeEdge(Edge edge) {
-        edge.sourceVertex.outEdges.remove(edge.targetVertex);
-        edge.targetVertex.inEdges.remove(edge.sourceVertex);
-    }
-
-    public void removeVertex(Vertex vertex) {
-        vertices.remove(vertex.getValue());
-        for (Edge e : new ArrayList<Edge>(vertex.outEdges.values())) {
-            removeEdge(e);
-        }
-        for (Edge e : new ArrayList<Edge>(vertex.inEdges.values())) {
-            removeEdge(e);
-        }
-    }
-
-    public Edge getEdge(Vertex source, Vertex target) {
-        return source.outEdges.get(target);
-    }
-
-    public Edge getEdge(V source, V target) {
-        Vertex sv = getVertex(source);
-        if (sv == null) {
-            return null;
-        }
-        Vertex tv = getVertex(target);
-        if (tv == null) {
-            return null;
-        }
-        return getEdge(getVertex(source), getVertex(target));
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        for (Vertex v : vertices.values()) {
-            sb.append(v.outEdges.values()).append("\n");
-        }
-        return sb.toString();
-    }
-
-    public Map<V, Vertex> getVertices() {
-        return vertices;
-    }
-
-    public void addGraph(PhaseSorter<V> otherGraph) {
-        for (Vertex v : otherGraph.vertices.values()) {
-            for (Edge e : v.outEdges.values()) {
-                addEdge(e.sourceVertex.value, e.targetVertex.value);
-            }
-        }
-    }
-
-    private Vertex getFirst() {
-        for (Vertex v : vertices.values()) {
-            if (v.inEdges.isEmpty()) {
-                return v;
-            }
-        }
-        if (!vertices.isEmpty()) {
-            throw new IllegalArgumentException("Circular ordering has been detected: " + toString());
-        } else {
-            return null;
-        }
-    }
-
-    public List<V> topologicalSort(boolean readOnly) {
-        PhaseSorter<V> graph = (!readOnly) ? this : (PhaseSorter<V>)clone();
-        List<V> list = new ArrayList<V>();
-        while (true) {
-            Vertex v = graph.getFirst();
-            if (v == null) {
-                break;
-            }
-            list.add(v.getValue());
-            graph.removeVertex(v);
-        }
-
-        return list;
-    }
-
-    @Override
-    public Object clone() {
-        PhaseSorter<V> copy = new PhaseSorter<V>();
-        copy.addGraph(this);
-        return copy;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
deleted file mode 100644
index 0b36b178f3..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.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.core.invocation;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-
-
-/**
- * Denotes an error creating a proxy
- *
- * @version $Rev$ $Date$
- */
-public class ProxyCreationException extends ObjectCreationException {
-    private static final long serialVersionUID = 8002454344828513781L;
-
-    public ProxyCreationException() {
-        super();
-    }
-
-    public ProxyCreationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ProxyCreationException(String message) {
-        super(message);
-    }
-
-    public ProxyCreationException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
deleted file mode 100644
index cb836e42c1..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.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.core.invocation;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-
-/**
- * Creates proxies that implement Java interfaces and invocation handlers for fronting wires
- *
- * @version $Rev$ $Date$
- */
-
-public interface ProxyFactory {
-
-    /**
-     * Creates a Java proxy for the given wire
-     *
-     * @param interfaze the interface the proxy implements
-     * @param wire      the wire to proxy
-     * @return the proxy
-     * @throws ProxyCreationException
-     */
-    <T> T createProxy(Class<T> interfaze, RuntimeWire wire) throws ProxyCreationException;
-
-    /**
-     * Creates a Java proxy for the given CallableReference
-     *
-     * @param callableReference The CallableReference
-     * @return the proxy
-     * @throws ProxyCreationException
-     */
-    <T> T createProxy(CallableReference<T> callableReference) throws ProxyCreationException;
-
-    /**
-     * Creates a Java proxy for the service contract callback
-     *
-     * @param interfaze the interface the proxy should implement
-     * @return the proxy
-     * @throws ProxyCreationException
-     */
-    <T> T createCallbackProxy(Class<T> interfaze, List<RuntimeWire> wires) throws ProxyCreationException;
-
-    /**
-     * Creates a Java proxy for the given callback reference
-     *
-     * @param callableReference The CallableReference
-     * @return the proxy
-     * @throws ProxyCreationException
-     */
-    <T> T createCallbackProxy(CallbackReferenceImpl<T> callbackReference) throws ProxyCreationException;
-
-    /**
-     * Cast a proxy to a CallableReference.
-     *
-     * @param target a proxy generated by this implementation
-     * @return a CallableReference (or subclass) equivalent to this proxy
-     * @throws IllegalArgumentException if the object supplied is not a proxy
-     */
-    <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException;
-    
-    /**
-     * Test if a given class is a generated proxy class by this factory
-     * @param clazz A java class or interface
-     * @return true if the class is a generated proxy class by this factory 
-     */
-    boolean isProxyClass(Class<?> clazz);
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
deleted file mode 100644
index 875a252798..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.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.core.invocation;
-
-
-/**
- * The extension point to plug in proxy factories
- * @version $Rev$ $Date$
- */
-public interface ProxyFactoryExtensionPoint {
-    
-    /**
-     * Get the proxy factory for java interfaces
-     * @return
-     */
-    ProxyFactory getInterfaceProxyFactory();
-
-    /**
-     * Get the proxy factory for java classes
-     * @return
-     */
-    ProxyFactory getClassProxyFactory();
-
-    /**
-     * Set the proxy factory for java interfaces
-     * @param factory
-     */
-    void setInterfaceProxyFactory(ProxyFactory factory);
-
-    /**
-     * Set the proxy factory for java classes
-     * @param factory
-     */
-    void setClassProxyFactory(ProxyFactory factory);
-    
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
deleted file mode 100644
index c007669bdf..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.core.invocation;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.conversation.ConversationState;
-import org.apache.tuscany.sca.core.conversation.ExtendedConversation;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetResolutionException;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-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.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.ReferenceParameters;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RuntimeWireInvoker {
-    protected ConversationManager conversationManager;
-    protected boolean conversational;
-    protected ExtendedConversation conversation;
-    protected MessageFactory messageFactory;
-    protected Object conversationID;
-    protected Object callbackID;
-    protected Object callbackObject;
-    protected RuntimeWire wire;
-
-    public RuntimeWireInvoker(MessageFactory messageFactory, ConversationManager conversationManager, RuntimeWire wire) {
-        this.messageFactory = messageFactory;
-        this.wire = wire;
-        this.conversationManager = conversationManager;
-        init(wire);
-    }
-
-    protected void init(RuntimeWire wire) {
-        if (wire != null) {
-            ReferenceParameters parameters = wire.getSource().getReferenceParameters();
-            this.callbackID = parameters.getCallbackID();
-            this.callbackObject = parameters.getCallbackReference();
-            this.conversationID = parameters.getConversationID();
-            InterfaceContract contract = wire.getSource().getInterfaceContract();
-            this.conversational = contract.getInterface().isConversational();
-        }
-    }
-
-    public Object invoke(Operation operation, Message msg) throws InvocationTargetException {
-        return invoke(wire, operation, msg);
-    }
-
-    public Object invoke(RuntimeWire wire, Operation operation, Message msg) throws InvocationTargetException {
-        RuntimeWire runtimeWire = wire == null ? this.wire : wire;
-        InvocationChain chain = runtimeWire.getInvocationChain(operation);
-        return invoke(chain, msg, runtimeWire);
-    }
-
-    protected Object invoke(InvocationChain chain, Message msg, RuntimeWire wire) throws InvocationTargetException {
-        EndpointReference from = msg.getFrom();
-        EndpointReference epFrom = wire.getSource();
-        if (from != null) {
-            from.mergeEndpoint(epFrom);
-        } else {
-            msg.setFrom(epFrom);
-        }
-        msg.setTo(wire.getTarget());
-
-        Invoker headInvoker = chain.getHeadInvoker();
-        Operation operation = chain.getTargetOperation();
-        msg.setOperation(operation);
-
-        Message msgContext = ThreadMessageContext.getMessageContext();
-        Object currentConversationID = msgContext.getFrom().getReferenceParameters().getConversationID();
-
-        ThreadMessageContext.setMessageContext(msg);
-        try {
-            conversationPreinvoke(msg);
-            // handleCallback(msg, currentConversationID);
-            // dispatch the wire down the chain and get the response
-            Message resp = headInvoker.invoke(msg);
-            Object body = resp.getBody();
-            if (resp.isFault()) {
-                throw new InvocationTargetException((Throwable)body);
-            }
-            return body;
-        } catch (InvocationTargetException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        } finally {
-            try {
-                conversationPostInvoke(msg);
-            } catch (TargetDestructionException e) {
-                throw new ServiceRuntimeException(e);
-            } finally {
-                ThreadMessageContext.setMessageContext(msgContext);
-            }
-        }
-    }
-
-    /**
-     * @param msgContext
-     */
-    protected EndpointReference getCallbackEndpoint(Message msgContext) {
-        EndpointReference from = msgContext.getFrom();
-        return from == null ? null : from.getReferenceParameters().getCallbackReference();
-    }
-
-    /**
-     * Pre-invoke for the conversation handling
-     * @param msg
-     * @throws TargetResolutionException
-     */
-    private void conversationPreinvoke(Message msg) {
-        if (conversational) {
-            ReferenceParameters parameters = msg.getFrom().getReferenceParameters();
-            // in some cases the ConversationID that should be used comes in with the 
-            // message, e.g. when ws binding is in use.
-            Object convID = parameters.getConversationID();
-            if (convID != null) {
-                conversationID = convID;
-            }
-            conversation = conversationManager.getConversation(conversationID);
-            
-            if (conversation == null || conversation.getState() == ConversationState.ENDED) {
-                conversation = conversationManager.startConversation(conversationID);
-                conversation.initializeConversationAttributes(wire.getTarget().getComponent());
-            } else if (conversation.conversationalAttributesInitialized() == false) {
-                conversation.initializeConversationAttributes(wire.getTarget().getComponent());
-            } else if (conversation.isExpired()){
-            	throw new ConversationEndedException("Conversation has expired.");
-            }
-            
-            conversation.updateLastReferencedTime();
-    
-            parameters.setConversationID(conversation.getConversationID());
-        }
-    }
-
-    /**
-     * Post-invoke for the conversation handling
-     * @param wire
-     * @param operation
-     * @throws TargetDestructionException
-     */
-    @SuppressWarnings("unchecked")
-    private void conversationPostInvoke(Message msg) throws TargetDestructionException {
-        if (conversational) {       
-            Operation operation = msg.getOperation();
-            ConversationSequence sequence = operation.getConversationSequence();
-            if (sequence == ConversationSequence.CONVERSATION_END) {
-                // in some cases the ConversationID that should be used comes in with the 
-                // message, e.g. when ws binding is in use. 
-                Object convID = msg.getFrom().getReferenceParameters().getConversationID();
-                if (convID != null) {
-                    conversationID = convID;
-                }
-                conversation = conversationManager.getConversation(conversationID);            
-    
-                // remove conversation id from scope container
-                ScopeContainer scopeContainer = getConversationalScopeContainer(msg);
-    
-                if (scopeContainer != null) {
-                    scopeContainer.remove(conversation.getConversationID());
-                }
-                
-                conversation.end();
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private ScopeContainer getConversationalScopeContainer(Message msg) {
-        ScopeContainer scopeContainer = null;
-
-        RuntimeComponent component = msg.getTo().getComponent();
-
-        if (component instanceof ScopedRuntimeComponent) {
-            ScopedRuntimeComponent scopedRuntimeComponent = (ScopedRuntimeComponent)component;
-            ScopeContainer container = scopedRuntimeComponent.getScopeContainer();
-
-            if ((container != null) && (container.getScope() == Scope.CONVERSATION)) {
-                scopeContainer = container;
-            }
-        }
-
-        return scopeContainer;
-    }
-
-
-    /**
-     * Minimal wrapper for a callback object contained in a ServiceReference
-     */
-    private static class CallbackObjectWrapper<T> implements InstanceWrapper<T> {
-
-        private T instance;
-
-        private CallbackObjectWrapper(T instance) {
-            this.instance = instance;
-        }
-
-        public T getInstance() {
-            return instance;
-        }
-
-        public void start() {
-            // do nothing
-        }
-
-        public void stop() {
-            // do nothing
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
deleted file mode 100644
index 2c4d657882..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.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.core.invocation;
-
-/**
- * Raised when an error is encountered during a target invocation
- *
- * @version $Rev$ $Date$
- */
-public class TargetInvocationException extends Exception {
-
-    private static final long serialVersionUID = -6553427708442761743L;
-
-    public TargetInvocationException() {
-        super();
-    }
-
-    public TargetInvocationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TargetInvocationException(String message) {
-        super(message);
-    }
-
-    public TargetInvocationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
deleted file mode 100644
index 504bd9b036..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.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.core.invocation;
-
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Class for tunnelling a WorkContext through the invocation of a user class.
- *
- * @version $Rev$ $Date$
- */
-public final class ThreadMessageContext {
-
-    private static final ThreadLocal<Message> CONTEXT = new ThreadLocal<Message>() {
-        @Override
-        protected synchronized Message initialValue() {
-            Message msg =  new MessageImpl();
-            msg.setFrom(new EndpointReferenceImpl("/"));
-            return msg;
-        }
-    };
-
-    private ThreadMessageContext() {
-    }
-
-    /**
-     * Set the WorkContext for the current thread.
-     * The current work context is returned and must be restored after the invocation is complete.
-     * Typical usage would be:
-     * <pre>
-     *   WorkContext old = PojoWorkContextTunnel.setThreadWorkContext(newContext);
-     *   try {
-     *      ... invoke user code ...
-     *   } finally {
-     *     PojoWorkContextTunnel.setThreadWorkContext(old);
-     *   }
-     * </pre>
-     * @param context
-     * @return the current work context for the thread; this must be restored after the invocation is made
-     */
-    public static Message setMessageContext(Message context) {
-        Message old = CONTEXT.get();
-        CONTEXT.set(context);
-        return old;
-    }
-
-    /**
-     * Returns the WorkContext for the current thread.
-     *
-     * @return the WorkContext for the current thread
-     */
-    public static Message getMessageContext() {
-        return CONTEXT.get();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
deleted file mode 100644
index 246f9c45d6..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.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.core.invocation;
-
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-/**
- * Uses a wire to return an object instance
- * 
- * @version $Rev$ $Date$
- */
-public class WireObjectFactory<T> implements ObjectFactory<T> {
-    private Class<T> interfaze;
-    private RuntimeWire wire;
-    private ProxyFactory proxyService;
-    
-    /**
-     * Constructor.
-     * 
-     * @param interfaze the interface to inject on the client
-     * @param wire the backing wire
-     * @param proxyService the wire service to create the proxy
-     * @throws NoMethodForOperationException
-     */
-    public WireObjectFactory(Class<T> interfaze, RuntimeWire wire, ProxyFactory proxyService) {
-        this.interfaze = interfaze;
-        this.wire = wire;
-        this.proxyService = proxyService;
-    }
-
-    public T getInstance() throws ObjectCreationException {
-        return new ServiceReferenceImpl<T>(interfaze, wire, proxyService).getProxy();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
deleted file mode 100644
index 1168d1d0dd..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.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.    
- */
-package org.apache.tuscany.sca.core.scope;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Implements functionality common to scope contexts.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class AbstractScopeContainer<KEY> implements ScopeContainer<KEY> {
-    protected Map<KEY, InstanceWrapper<?>> wrappers = new ConcurrentHashMap<KEY, InstanceWrapper<?>>();
-    protected final Scope scope;
-
-    protected RuntimeComponent component;
-    protected volatile int lifecycleState = UNINITIALIZED;
-
-
-    public AbstractScopeContainer(Scope scope, RuntimeComponent component) {
-        this.scope = scope;
-        this.component = component;
-    }
-
-    protected void checkInit() {
-        if (getLifecycleState() != RUNNING) {
-            throw new IllegalStateException("Scope container not running [" + getLifecycleState() + "]");
-        }
-    }
-
-    /**
-     * Creates a new physical instance of a component, wrapped in an
-     * InstanceWrapper.
-     * 
-     * @param component the component whose instance should be created
-     * @return a wrapped instance that has been injected but not yet started
-     * @throws TargetResolutionException if there was a problem creating the
-     *             instance
-     */
-    protected InstanceWrapper createInstanceWrapper() throws TargetResolutionException {
-        ImplementationProvider implementationProvider = component.getImplementationProvider();
-        if (implementationProvider instanceof ScopedImplementationProvider) {
-            return ((ScopedImplementationProvider)implementationProvider).createInstanceWrapper();
-        }
-        return null;
-    }
-
-    public InstanceWrapper getAssociatedWrapper(KEY contextId) throws TargetResolutionException {
-        return getWrapper(contextId); // TODO: what is this method supposed to do diff than getWrapper? 
-    }
-
-    public Scope getScope() {
-        return scope;
-    }
-
-    public InstanceWrapper getWrapper(KEY contextId) throws TargetResolutionException {
-        return wrappers.get(contextId);
-    }
-    
-    public void addWrapperReference(KEY existingContextId, KEY newContextId) 
-      throws TargetResolutionException {
-        // do nothing here. the conversational scope container implements this
-    }
-
-    public void registerWrapper(InstanceWrapper wrapper, KEY contextId) throws TargetResolutionException { 
-        // do nothing here. the conversational scope container implements this
-    }
-
-    public void onEvent(Event event) {
-    }
-
-    protected boolean isEagerInit() {
-        ImplementationProvider implementationProvider = ((RuntimeComponent)component).getImplementationProvider();
-        if (implementationProvider instanceof ScopedImplementationProvider) {
-            return ((ScopedImplementationProvider)implementationProvider).isEagerInit();
-        }
-        return false;
-    }
-
-    public void returnWrapper(InstanceWrapper wrapper, KEY contextId) throws TargetDestructionException {
-    }
-    
-    /**
-     * Default implementation of remove which does nothing 
-     * 
-     * @param contextId the identifier of the context to remove. 
-     */
-    public void remove(KEY contextId) 
-        throws TargetDestructionException {
-    }    
-
-    public synchronized void start() {
-        int lifecycleState = getLifecycleState();
-        if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
-            throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
-        }
-        setLifecycleState(RUNNING);
-    }
-
-    public void startContext(KEY contextId) {
-        if(isEagerInit()) {
-            try {
-                getWrapper(contextId);
-            } catch (TargetResolutionException e) {
-                // 
-            }
-        }
-    }
-
-    public synchronized void stop() {
-        int lifecycleState = getLifecycleState();
-        if (lifecycleState != RUNNING) {
-            throw new IllegalStateException("Scope in wrong state [" + lifecycleState + "]");
-        }
-        setLifecycleState(STOPPED);
-    }
-
-    public void stopContext(KEY contextId) {
-        wrappers.remove(contextId);
-    }
-
-    @Override
-    public String toString() {
-        String s;
-        switch (lifecycleState) {
-            case ScopeContainer.CONFIG_ERROR:
-                s = "CONFIG_ERROR";
-                break;
-            case ScopeContainer.ERROR:
-                s = "ERROR";
-                break;
-            case ScopeContainer.INITIALIZING:
-                s = "INITIALIZING";
-                break;
-            case ScopeContainer.INITIALIZED:
-                s = "INITIALIZED";
-                break;
-            case ScopeContainer.RUNNING:
-                s = "RUNNING";
-                break;
-            case ScopeContainer.STOPPING:
-                s = "STOPPING";
-                break;
-            case ScopeContainer.STOPPED:
-                s = "STOPPED";
-                break;
-            case ScopeContainer.UNINITIALIZED:
-                s = "UNINITIALIZED";
-                break;
-            default:
-                s = "UNKNOWN";
-                break;
-        }
-        return "In state [" + s + ']';
-    }
-
-    public RuntimeComponent getComponent() {
-        return component;
-    }
-
-    public void setComponent(RuntimeComponent component) {
-        this.component = component;
-    }
-
-    public int getLifecycleState() {
-        return lifecycleState;
-    }
-
-    /**
-     * Set the current state of the Lifecycle.
-     *
-     * @param lifecycleState the new state
-     */
-    protected void setLifecycleState(int lifecycleState) {
-        this.lifecycleState = lifecycleState;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
deleted file mode 100644
index 7e7ab7a9e4..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.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.core.scope;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A scope context which manages atomic component instances keyed by composite
- * 
- * @version $Rev$ $Date$
- */
-public class CompositeScopeContainer<KEY> extends AbstractScopeContainer<KEY> {
-    private InstanceWrapper<?> wrapper;
-
-    public CompositeScopeContainer(RuntimeComponent component) {
-        super(Scope.COMPOSITE, component);
-    }
-
-    @Override
-    public synchronized void stop() {
-        super.stop();
-        if (wrapper != null) {
-            try {
-                wrapper.stop();
-            } catch (TargetDestructionException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-        wrapper = null;
-    }
-
-    @Override
-    public synchronized InstanceWrapper getWrapper(KEY contextId) throws TargetResolutionException {
-        if (wrapper == null) {
-            wrapper = createInstanceWrapper();
-            wrapper.start();
-        }
-        return wrapper;
-    }
-
-    @Override
-    public InstanceWrapper getAssociatedWrapper(KEY contextId) throws TargetResolutionException {
-        if (wrapper == null) {
-            throw new TargetNotFoundException(component.getURI());
-        }
-        return wrapper;
-    }
-
-    @Override
-    public synchronized void start() {
-        super.start();
-        if (isEagerInit()) {
-            try {
-                getWrapper(null);
-            } catch (TargetResolutionException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
deleted file mode 100644
index 786988613b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CompositeScopeContainerFactory implements ScopeContainerFactory {
-
-    public ScopeContainer createScopeContainer(RuntimeComponent component) {
-        return new CompositeScopeContainer(component);
-    }
-
-    public Scope getScope() {
-        return Scope.COMPOSITE;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
deleted file mode 100644
index deea96e641..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.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 org.apache.tuscany.sca.core.scope;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-import java.util.UUID;

-import java.util.concurrent.ConcurrentHashMap;

-

-import org.apache.tuscany.sca.core.context.InstanceWrapper;

-import org.apache.tuscany.sca.core.conversation.ConversationListener;

-import org.apache.tuscany.sca.core.conversation.ConversationManager;

-import org.apache.tuscany.sca.core.conversation.ExtendedConversation;

-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.store.Store;

-

-/**

- * A scope context which manages atomic component instances keyed on ConversationID

- *

- * @version $Rev$ $Date$

- */

-public class ConversationalScopeContainer extends AbstractScopeContainer<Object> implements ConversationListener {

-    private ConversationManager conversationManager;

-    private Map<Object, InstanceLifeCycleWrapper> instanceLifecycleCollection =

-        new ConcurrentHashMap<Object, InstanceLifeCycleWrapper>();

-

-    public ConversationalScopeContainer(Store aStore, RuntimeComponent component) {

-        super(Scope.CONVERSATION, component);

-

-        // Note: aStore is here to preserve the original factory interface. It is not currently used in this 

-        // implementation since we do not support instance persistence.

-

-        // Check System properties to see if timeout values have been specified. All timeout values 

-        // will be specified in seconds.

-        //

-

-    }

-

-

-    protected InstanceWrapper getInstanceWrapper(boolean create, Object contextId) throws TargetResolutionException {

-

-        // we might get a null context if the target service has

-        // conversational scope but only its callback interface 

-        // is conversational. In this case we need to invent a 

-        // conversation Id here to store the service against

-        // and populate the thread context

-        if (contextId == null) {

-            contextId = UUID.randomUUID().toString();

-            Message msgContext = ThreadMessageContext.getMessageContext();

-

-            if (msgContext != null) {

-                msgContext.getFrom().getReferenceParameters().setConversationID(contextId);

-            }

-        }    

-        

-        InstanceLifeCycleWrapper anInstanceWrapper = this.instanceLifecycleCollection.get(contextId);

-

-        if (anInstanceWrapper == null && !create)

-            return null;

-

-        if (anInstanceWrapper == null) {

-            anInstanceWrapper = new InstanceLifeCycleWrapper(contextId);

-            this.instanceLifecycleCollection.put(contextId, anInstanceWrapper);

-        }

-

-        return anInstanceWrapper.getInstanceWrapper(contextId);

-

-    }

-

-    @Override

-    public InstanceWrapper getWrapper(Object contextId) throws TargetResolutionException {

-        return getInstanceWrapper(true, contextId);

-    }

-

-    /**

-     * This method allows a new context id to be registered alongside an existing one. This happens in

-     * one case, when a conversation includes a stateful callback. The client component instance

- 	 * must be registered against all outgoing conversation ids so that the component instance 

-	 * can be found when the callback arrives

-	 * 

-     * @param existingContextId the context id against which the component is already registered

-     * @param context this should be a conversation object so that the conversation can b stored 

-     *                and reset when the component instance is removed

-     */

-    public void addWrapperReference(Object existingContextId, Object contextId) throws TargetResolutionException {

-       

-        

-        // get the instance wrapper via the existing id

-        InstanceLifeCycleWrapper existingInstanceWrapper = this.instanceLifecycleCollection.get(existingContextId);

-        InstanceLifeCycleWrapper newInstanceWrapper = this.instanceLifecycleCollection.get(contextId);

-

-        // only add the extra reference once

-        if (newInstanceWrapper == null) {

-            // add the id to the list of ids that the wrapper holds. Used for reference

-            // counting and conversation resetting on destruction. 

-            existingInstanceWrapper.addCallbackConversation(contextId);

-

-            // add the reference to the collection

-            this.instanceLifecycleCollection.put(contextId, existingInstanceWrapper);

-        }

-    }

-

-    public void registerWrapper(InstanceWrapper wrapper, Object contextId) throws TargetResolutionException {

-        // if a wrapper for a different instance is already registered for this contextId, remove it

-        InstanceLifeCycleWrapper anInstanceWrapper = this.instanceLifecycleCollection.get(contextId);

-        if (anInstanceWrapper != null) {

-            if (anInstanceWrapper.getInstanceWrapper(contextId).getInstance() != wrapper.getInstance()) {

-                remove(contextId);

-            } else {

-                return;

-            }

-        }

-

-        anInstanceWrapper = new InstanceLifeCycleWrapper(wrapper, contextId);

-        this.instanceLifecycleCollection.put(contextId, anInstanceWrapper);

-    }

-

-    // The remove is invoked when a conversation is explicitly ended. This can occur by using the @EndsConversation or API.  

-    // In this case the instance is immediately removed. A new conversation will be started on the next operation

-    // associated with this conversationId's service reference. 

-    //

-    @Override

-    public void remove(Object contextId) throws TargetDestructionException {

-        if (contextId != null) {

-            if (this.instanceLifecycleCollection.containsKey(contextId)) {

-                InstanceLifeCycleWrapper anInstanceLifeCycleWrapper = this.instanceLifecycleCollection.get(contextId);

-                this.instanceLifecycleCollection.remove(contextId);

-                anInstanceLifeCycleWrapper.removeInstanceWrapper(contextId);

-            }

-        }

-    }

-

-    /*

-     *  This is an inner class that keeps track of the lifecycle of a conversation scoped 

-	 *  implementation instance. 

-	 * 

-	 */

-

-    private class InstanceLifeCycleWrapper {

-        private Object clientConversationId;

-        private List<Object> callbackConversations = new ArrayList<Object>();

-

-        private InstanceLifeCycleWrapper(Object contextId) throws TargetResolutionException {

-            this.clientConversationId = contextId;

-            this.createInstance(contextId);

-        }

-

-        private InstanceLifeCycleWrapper(InstanceWrapper wrapper, Object contextId) throws TargetResolutionException {

-            this.clientConversationId = contextId;

-            wrappers.put(contextId, wrapper);

-        }

-

-

-        // Associates a callback conversation with this instance. Each time the scope container

-        // is asked to remove an object given a ontextId an associated conversation object will 

-        // have its conversationId reset to null. When the list of ids is empty the component instance

-        // will be removed from the scope container

-        private void addCallbackConversation(Object conversationID) {

-            InstanceWrapper ctx = getInstanceWrapper(clientConversationId);

-            callbackConversations.add(conversationID);

-            wrappers.put(conversationID, ctx);

-        }

-

-        //

-        // Return the backing implementation instance  

-        //

-        private InstanceWrapper getInstanceWrapper(Object contextId) {

-            InstanceWrapper ctx = wrappers.get(contextId);

-            return ctx;

-        }

-

-        private void removeInstanceWrapper(Object contextId) throws TargetDestructionException {

-            InstanceWrapper ctx = getInstanceWrapper(contextId);

-            wrappers.remove(contextId);

-

-            // find out if we are dealing with the original client conversation id

-            // and reset accordingly

-            if ( ( clientConversationId != null ) && ( clientConversationId.equals(contextId)) ) {

-                clientConversationId = null;

-            } else {

-                // reset the conversationId in the conversation object if present 

-                // so that and ending callback causes the conversation in the originating

-                // service reference in the client to be reset

-                callbackConversations.remove(contextId);

-            }

-

-            // stop the component if this removes the last reference

-            if (clientConversationId == null && callbackConversations.isEmpty()) {

-                ctx.stop();

-            }

-        }

-

-        private void createInstance(Object contextId) throws TargetResolutionException {

-            InstanceWrapper instanceWrapper = createInstanceWrapper();

-            instanceWrapper.start();

-            wrappers.put(contextId, instanceWrapper);

-        }

-

-    }

-

-    /**

-	  * @see org.apache.tuscany.sca.core.conversation.ConversationListener#conversationEnded(org.apache.tuscany.sca.core.conversation.ExtendedConversation)

-	  */

-    public void conversationEnded(ExtendedConversation conversation) {

-        try {

-            remove(conversation.getConversationID());

-        } catch (Exception ex) {

-            

-        }

-    }

-

-    /**

-	  * @see org.apache.tuscany.sca.core.conversation.ConversationListener#conversationExpired(org.apache.tuscany.sca.core.conversation.ExtendedConversation)

-	  */

-    public void conversationExpired(ExtendedConversation conversation) {

-    	

-    	Object conversationId = conversation.getConversationID();

-    	InstanceLifeCycleWrapper ilcw = instanceLifecycleCollection.get(conversationId);

-    	if (ilcw != null) {

-    		// cycle through all the references to this instance and

-    		// remove them from the underlying wrappers collection and

-    		// from the lifecycle wrappers collection

-    		

-    		for (Object conversationID : ilcw.callbackConversations) {

-    			try{

-        			ilcw.removeInstanceWrapper(conversationID);

-    				remove(conversationID);

-                } catch(TargetDestructionException tde) {

-    				System.out.println("Could not remove conversation id " + conversationID);

-    			}

-    		}

-    			

-    		

-    		if (ilcw.clientConversationId != null) {

-    			try{

-        			ilcw.removeInstanceWrapper(ilcw.clientConversationId);

-    				remove(ilcw.clientConversationId);

-                } catch(TargetDestructionException tde) {

-    				System.out.println("Could not remove conversation id " + ilcw.clientConversationId);

-    			}

-    		}

-    		

-        }

-    	

-    }

-

-    /**

-	  * @see org.apache.tuscany.sca.core.conversation.ConversationListener#conversationStarted(org.apache.tuscany.sca.core.conversation.ExtendedConversation)

-	  */

-    public void conversationStarted(ExtendedConversation conversation) {

-        startContext(conversation.getConversationID());

-    }

-

-    /**

-	  * @return the conversationManager

-	  */

-    public ConversationManager getConversationManager() {

-        return conversationManager;

-    }

-

-    /**

-	  * @param conversationManager the conversationManager to set

-	  */

-    public void setConversationManager(ConversationManager conversationManager) {

-        this.conversationManager = conversationManager;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
deleted file mode 100644
index a6663aba09..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.store.Store;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationalScopeContainerFactory implements ScopeContainerFactory {
-    private Store store;
-
-    public ConversationalScopeContainerFactory(Store store) {
-        super();
-        this.store = store;
-    }
-
-    public ScopeContainer createScopeContainer(RuntimeComponent component) {
-        return new ConversationalScopeContainer(store, component);
-    }
-
-    public Scope getScope() {
-        return Scope.CONVERSATION;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
deleted file mode 100644
index 5ae8b94647..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.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.core.scope;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.event.HttpSessionEnd;
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A scope context which manages atomic component instances keyed on HTTP
- * session
- * 
- * @version $Rev$ $Date$
- */
-public class HttpSessionScopeContainer extends AbstractScopeContainer<Object> {
-
-    public HttpSessionScopeContainer(RuntimeComponent component) {
-        super(Scope.SESSION, component);
-    }
-
-    @Override
-    public void onEvent(Event event) {
-        checkInit();
-        if (event instanceof HttpSessionEnd) {
-            //FIXME key is not used
-            //Object key = ((HttpSessionEnd)event).getSessionID();
-            // FIXME: Remove the session id
-        }
-    }
-
-    @Override
-    public synchronized void start() {
-        if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
-            throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
-        }
-        lifecycleState = RUNNING;
-    }
-
-    @Override
-    public synchronized void stop() {
-        lifecycleState = STOPPED;
-    }
-
-    protected InstanceWrapper getInstanceWrapper(boolean create) throws TargetResolutionException {
-//        Object key = workContext.getIdentifier(Scope.SESSION);
-        // FIXME: Need to fix this
-        Object key ="http-session-id";
-        assert key != null : "HTTP session key not bound in work context";
-        InstanceWrapper ctx = wrappers.get(key);
-        if (ctx == null && !create) {
-            return null;
-        }
-        if (ctx == null) {
-            ctx = super.createInstanceWrapper();
-            ctx.start();
-            wrappers.put(key, ctx);
-        }
-        return ctx;
-    }
-    
-    @Override
-    public InstanceWrapper getWrapper(Object contextId) throws TargetResolutionException {
-        return getInstanceWrapper(true);
-    }    
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
deleted file mode 100644
index 49f89661b1..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HttpSessionScopeContainerFactory implements ScopeContainerFactory {
-
-    public HttpSessionScopeContainerFactory() {
-        super();
-    }
-
-    public ScopeContainer createScopeContainer(RuntimeComponent component) {
-        return new HttpSessionScopeContainer(component);
-    }
-
-    public Scope getScope() {
-        return Scope.SESSION;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
deleted file mode 100644
index f11a61e662..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.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.core.scope;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.event.RequestEnd;
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A scope context which manages atomic component instances keyed on the current
- * request context
- * 
- * @version $Rev$ $Date$
- */
-public class RequestScopeContainer extends AbstractScopeContainer<Thread> {
-    private final Map<Thread, InstanceWrapper> contexts;
-
-    public RequestScopeContainer(RuntimeComponent component) {
-        super(Scope.REQUEST, component);
-        contexts = new ConcurrentHashMap<Thread, InstanceWrapper>();
-    }
-
-    @Override
-    public void onEvent(Event event) {
-        checkInit();
-        if (event instanceof RequestEnd) {
-            // shutdownInstances(Thread.currentThread());
-        }
-    }
-
-    @Override
-    public synchronized void start() {
-        if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
-            throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
-        }
-        lifecycleState = RUNNING;
-    }
-
-    @Override
-    public synchronized void stop() {
-        contexts.clear();
-        // synchronized (destroyQueues) {
-        // destroyQueues.clear();
-        // }
-        lifecycleState = STOPPED;
-    }
-
-    protected InstanceWrapper getInstanceWrapper(boolean create) throws TargetResolutionException {
-        InstanceWrapper ctx = wrappers.get(Thread.currentThread());
-        if (ctx == null && !create) {
-            return null;
-        }
-        if (ctx == null) {
-            ctx = super.createInstanceWrapper();
-            ctx.start();
-            wrappers.put(Thread.currentThread(), ctx);
-        }
-        return ctx;
-    }
-
-    @Override
-    public InstanceWrapper getWrapper(Thread contextId) throws TargetResolutionException {
-        return getInstanceWrapper(true);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
deleted file mode 100644
index 1cfb6b06a4..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RequestScopeContainerFactory implements ScopeContainerFactory {
-
-    public ScopeContainer createScopeContainer(RuntimeComponent component) {
-        return new RequestScopeContainer(component);
-    }
-
-    public Scope getScope() {
-        return Scope.REQUEST;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
deleted file mode 100644
index 0a20d793f7..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.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.core.scope;
-
-/**
- * The default implementation scopes supported by assemblies.
- *
- * @version $Rev$ $Date$
- */
-public class Scope {
-    public static final Scope STATELESS = new Scope("STATELESS");
-    public static final Scope REQUEST = new Scope("REQUEST");
-    public static final Scope SESSION = new Scope("SESSION");
-    public static final Scope CONVERSATION = new Scope("CONVERSATION");
-    public static final Scope COMPOSITE = new Scope("COMPOSITE");
-    public static final Scope SYSTEM = new Scope("SYSTEM");
-    public static final Scope UNDEFINED = new Scope("UNDEFINED");
-
-    private String scope;
-
-    public Scope(String scope) {
-        this.scope = scope.toUpperCase().intern();
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final Scope scope1 = (Scope) o;
-        return !(scope != null ? scope != scope1.scope.intern() : scope1.scope != null);
-    }
-
-    @Override
-    public int hashCode() {
-        return scope != null ? scope.hashCode() : 0;
-    }
-
-    @Override
-    public String toString() {
-        return scope;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
deleted file mode 100644
index 6b2980b989..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.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.core.scope;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.event.RuntimeEventListener;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-
-/**
- * Manages the lifecycle and visibility of instances associated with a an {@link RuntimeComponent}.
- *
- * @version $Rev$ $Date$
- * @param <KEY> the type of IDs that this container uses to identify its contexts.
- * For example, for COMPOSITE scope this could be the URI of the composite component,
- * or for HTTP Session scope it might be the HTTP session ID.
- */
-public interface ScopeContainer<KEY> extends RuntimeEventListener {
-
-    /**
-     * Returns the Scope that this container supports.
-     *
-     * @return the Scope that this container supports
-     */
-    Scope getScope();
-
-    /**
-     * Start a new context with the supplied ID.
-     *
-     * @param contextId an ID that uniquely identifies the context.
-     */
-    void startContext(KEY contextId);
-
-    /**
-     * Stop the context with the supplied ID.
-     *
-     * @param contextId an ID that uniquely identifies the context.
-     */
-    void stopContext(KEY contextId);
-
-    /**
-     * Returns an instance wrapper associated with the current scope context, creating one if necessary
-     * @param contextId the id for the scope context
-     *
-     * @return the wrapper for the target instance
-     * @throws TargetResolutionException if there was a problem instantiating the target instance
-     */
-    InstanceWrapper getWrapper(KEY contextId) throws TargetResolutionException;
-     
-    /**
-     * Allows a component to be registered against more than one context id. This is required in the
-     * case of stateful callbacks where we want to identify the originating client component instance 
-     * as the callback target but we don't want to reuse the clients original conversation id
-     * 
-     * @param existingContextId  an id that identifies an existing component instance
-     * @param newContextId a new id against which this component will also be registered
-     * @throws TargetResolutionException
-     */
-    void addWrapperReference(KEY existingContextId, KEY newContextId) 
-        throws TargetResolutionException;   
-
-    /**
-     * Register an existing instance against a context id.  This is needed
-     * for a stateful callback where the service reference for the forward call
-     * contains a callback object that is not a service reference.
-     * 
-     * @param wrapper the instance wrapper for the instance to be registered
-     * @param contextId the id for the scope context
-     * @throws TargetResolutionException
-     */
-    void registerWrapper(InstanceWrapper wrapper, KEY contextId) 
-        throws TargetResolutionException;   
-
-    /**
-     * Returns an implementation instance associated with the current scope context.
-     * If no instance is found, a {@link TargetNotFoundException} is thrown.
-     * @param contextId the id for the scope context
-     *
-     * @return the wrapper for the target instance
-     * @throws TargetResolutionException if there was a problem instantiating the target instance
-     */
-    InstanceWrapper getAssociatedWrapper(KEY contextId)
-        throws TargetResolutionException;
-
-    /**
-     * Return a wrapper after use (for example, after invoking the instance).
-     * @param wrapper the wrapper for the target instance being returned
-     * @param contextId the id for the scope context
-     *
-     * @throws TargetDestructionException if there was a problem returning the target instance
-     */
-    void returnWrapper(InstanceWrapper wrapper, KEY contextId)
-        throws TargetDestructionException;
-
-    /**
-     * Removes an identified component implementation instance associated with the current 
-     * context from persistent storage
-     *
-     * @param contextId the identifier of the context to remove. 
-     */
-    void remove(KEY contextId) 
-        throws TargetDestructionException;     
-
-    /* A configuration error state */
-    int CONFIG_ERROR = -1;
-    /* Has not been initialized */
-    int UNINITIALIZED = 0;
-    /* In the process of being configured and initialized */
-    int INITIALIZING = 1;
-    /* Instantiated and configured */
-    int INITIALIZED = 2;
-    /* Configured and initialized */
-    int RUNNING = 4;
-    /* In the process of being shutdown */
-    int STOPPING = 5;
-    /* Has been shutdown and removed from the composite */
-    int STOPPED = 6;
-    /* In an error state */
-    int ERROR = 7;
-
-    /**
-     * Returns the lifecycle state
-     *
-     * @see #UNINITIALIZED
-     * @see #INITIALIZING
-     * @see #INITIALIZED
-     * @see #RUNNING
-     * @see #STOPPING
-     * @see #STOPPED
-     */
-    int getLifecycleState();
-
-    /**
-     * Starts the Lifecycle.
-     */
-    void start();
-
-    /**
-     * Stops the Lifecycle.
-     */
-    void stop();
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
deleted file mode 100644
index b19c14b3e0..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Factory to create ScopeContainer for components
- * 
- * @version $Rev$ $Date$
- */
-public interface ScopeContainerFactory {
-    ScopeContainer createScopeContainer(RuntimeComponent component);
-    Scope getScope();
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
deleted file mode 100644
index 842ed4c547..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-
-/**
- * Manages {@link ScopeContainer}s in the runtime
- *
- * @version $Rev$ $Date$
- */
-public interface ScopeRegistry {
-
-    /**
-     * Returns the scope container for the given scope or null if one not found
-     *
-     * @param scope the scope
-     * @return the scope container for the given scope or null if one not found
-     */
-    ScopeContainer getScopeContainer(RuntimeComponent component);
-
-    /**
-     * @param factory
-     */
-    void register(ScopeContainerFactory factory);
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
deleted file mode 100644
index 75261e11a8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.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.core.scope;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * The default implementation of a scope registry
- * 
- * @version $Rev$ $Date$
- */
-public class ScopeRegistryImpl implements ScopeRegistry {
-    private final Map<Scope, ScopeContainerFactory> scopeCache = new ConcurrentHashMap<Scope, ScopeContainerFactory>();
-
-    public void register(ScopeContainerFactory factory) {
-        scopeCache.put(factory.getScope(), factory);
-    }
-
-    public ScopeContainer getScopeContainer(RuntimeComponent runtimeComponent) {
-        if (!(runtimeComponent instanceof ScopedRuntimeComponent)) {
-            return null;
-        }
-        ScopedRuntimeComponent component = (ScopedRuntimeComponent)runtimeComponent;
-        if (component.getScopeContainer() != null) {
-            return component.getScopeContainer();
-        }
-        ImplementationProvider implementationProvider = component.getImplementationProvider();
-        if (implementationProvider instanceof ScopedImplementationProvider) {
-            ScopedImplementationProvider provider = (ScopedImplementationProvider)implementationProvider;
-            Scope scope = provider.getScope();
-            if (scope == null) {
-                scope = Scope.STATELESS;
-            }
-            ScopeContainerFactory factory = scopeCache.get(scope);
-            ScopeContainer container = factory.createScopeContainer(component);
-            component.setScopeContainer(container);
-            return container;
-        }
-        return null;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
deleted file mode 100644
index 85a6626cdd..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.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.core.scope;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-
-/**
- * A component implementation can implement this interface to provide scope
- * management for the components
- * 
- * @version $Rev$ $Date$
- */
-public interface ScopedImplementationProvider extends ImplementationProvider {
-    /**
-     * Get the scope for the component implementation
-     * 
-     * @return The scope for the component implementation, if null is returned,
-     *         STATELESS will be used
-     */
-    Scope getScope();
-
-    /**
-     * Indicate if the component needs to be eagerly initialized
-     * 
-     * @return true if the component is marked to be eagerly initialized, false
-     *         otherwise
-     */
-    boolean isEagerInit();
-    
-    /**
-     * @return the maxAge
-     */
-    long getMaxAge();
-
-    /**
-     * @return the maxIdleTime
-     */
-    long getMaxIdleTime();    
-
-    /**
-     * Create a wrapper for the component instance for the scope management
-     * 
-     * @return A wrapper for the component instance
-     */
-    InstanceWrapper createInstanceWrapper();
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
deleted file mode 100644
index c27b112f8a..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * Scoped runtime component
- * 
- * @version $Rev$ $Date$
- */
-public interface ScopedRuntimeComponent extends RuntimeComponent {
-    /**
-     * Set the associated scope container
-     * @param scopeContainer
-     */
-    void setScopeContainer(ScopeContainer scopeContainer);
-    /**
-     * Get the assoicated scope container
-     * @return
-     */
-    ScopeContainer getScopeContainer();
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
deleted file mode 100644
index a2c0edb9b4..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.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.core.scope;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A scope context which manages stateless atomic component instances in a non-pooled fashion.
- *
- * @version $Rev$ $Date$
- */
-public class StatelessScopeContainer<KEY> extends AbstractScopeContainer<KEY> {
-
-    public StatelessScopeContainer(RuntimeComponent component) {
-        super(Scope.STATELESS, component);
-    }
-
-    @Override
-    public  InstanceWrapper getWrapper(KEY contextId)
-        throws TargetResolutionException {
-        InstanceWrapper ctx = createInstanceWrapper();
-        ctx.start();
-        return ctx;
-    }
-
-    @Override
-    public  InstanceWrapper getAssociatedWrapper(KEY contextId)
-        throws TargetResolutionException {
-        return getWrapper(contextId);
-    }
-
-    @Override
-    public  void returnWrapper(InstanceWrapper wrapper, KEY contextId)
-        throws TargetDestructionException {
-        wrapper.stop();
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
deleted file mode 100644
index 0471b2c52e..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.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.core.scope;
-
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StatelessScopeContainerFactory implements ScopeContainerFactory {
-
-    public ScopeContainer createScopeContainer(RuntimeComponent component) {
-        return new StatelessScopeContainer(component);
-    }
-
-    public Scope getScope() {
-        return Scope.STATELESS;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
deleted file mode 100644
index 0f83dad97d..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.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.core.scope;
-
-/**
- * Denotes an error destroying a target
- *
- * @version $Rev$ $Date$
- */
-public class TargetDestructionException extends TargetResolutionException {
-    private static final long serialVersionUID = -6126684147851674709L;
-
-    public TargetDestructionException() {
-        super();
-    }
-
-    public TargetDestructionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TargetDestructionException(String message) {
-        super(message);
-    }
-
-    public TargetDestructionException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
deleted file mode 100644
index 15959c0608..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.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.core.scope;
-
-/**
- * Denotes an error initializing a target
- *
- * @version $Rev$ $Date$
- */
-public class TargetInitializationException extends TargetResolutionException {
-    private static final long serialVersionUID = -6228778208649752698L;
-
-    public TargetInitializationException() {
-        super();
-    }
-
-    public TargetInitializationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TargetInitializationException(String message) {
-        super(message);
-    }
-
-    public TargetInitializationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
deleted file mode 100644
index bb46a2499b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.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.core.scope;
-
-/**
- * Thrown when a target of an operation cannot be found
- *
- * @version $Rev$ $Date$
- */
-public class TargetNotFoundException extends TargetResolutionException {
-    private static final long serialVersionUID = 5541830480658471186L;
-
-    public TargetNotFoundException() {
-        super();
-    }
-
-    public TargetNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TargetNotFoundException(String message) {
-        super(message);
-    }
-
-    public TargetNotFoundException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
deleted file mode 100644
index ea8d0e876c..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.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.core.scope;
-
-/**
- * Denotes an error retrieving a target instance
- *
- * @version $Rev$ $Date$
- */
-public class TargetResolutionException extends Exception {
-    private static final long serialVersionUID = 2912513650522019405L;
-
-    public TargetResolutionException() {
-        super();
-    }
-
-    public TargetResolutionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TargetResolutionException(String message) {
-        super(message);
-    }
-
-    public TargetResolutionException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
deleted file mode 100644
index 5b838116c5..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.core.store;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.tuscany.sca.core.event.BaseEventPublisher;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.store.DuplicateRecordException;
-import org.apache.tuscany.sca.store.RecoveryListener;
-import org.apache.tuscany.sca.store.Store;
-import org.apache.tuscany.sca.store.StoreExpirationEvent;
-import org.apache.tuscany.sca.store.StoreMonitor;
-import org.apache.tuscany.sca.store.StoreWriteException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Implements a non-durable, non-transactional store using a simple in-memory map
- *
- * @version $Rev$ $Date$
- */
-@Service(Store.class)
-@EagerInit
-public class MemoryStore extends BaseEventPublisher implements Store {
-    private Map<RuntimeComponent, Map<String, Record>> store;
-    // TODO integrate with a core threading scheme
-    private ScheduledExecutorService scheduler;
-    private long reaperInterval = 300000;
-    private StoreMonitor monitor;
-    private long defaultExpirationOffset = 600000; // 10 minutes
-
-    public MemoryStore(StoreMonitor monitor) {
-        this.monitor = monitor;
-        this.store = new ConcurrentHashMap<RuntimeComponent, Map<String, Record>>();
-        this.scheduler = Executors.newSingleThreadScheduledExecutor();
-    }
-
-    /**
-     * Returns the maximum default expiration offset for records in the store
-     *
-     * @return the maximum default expiration offset for records in the store
-     */
-    public long getDefaultExpirationOffset() {
-        return defaultExpirationOffset;
-    }
-
-    /**
-     * Sets the maximum default expiration offset for records in the store
-     */
-    @Property
-    public void setDefaultExpirationOffset(long defaultExpirationOffset) {
-        this.defaultExpirationOffset = defaultExpirationOffset;
-    }
-
-    /**
-     * Sets the interval for expired entry scanning to be performed
-     */
-    @Property
-    public void setReaperInterval(long reaperInterval) {
-        this.reaperInterval = reaperInterval;
-    }
-
-    public long getReaperInterval() {
-        return reaperInterval;
-    }
-
-    @Init
-    public void init() {
-        scheduler.scheduleWithFixedDelay(new Reaper(), reaperInterval, reaperInterval, TimeUnit.MILLISECONDS);
-        monitor.start("In-memory store started");
-    }
-
-    @Destroy
-    public void destroy() {
-        scheduler.shutdown();
-        monitor.stop("In-memory store stopped");
-    }
-
-    public void insertRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException {
-        Map<String, Record> map = store.get(owner);
-        if (map == null) {
-            map = new ConcurrentHashMap<String, Record>();
-            store.put(owner, map);
-        }
-        if (map.containsKey(id)) {
-            throw new DuplicateRecordException("Duplicate record: " + owner.getURI() +" : " + id);
-        }
-        map.put(id, new Record(object, expiration));
-    }
-
-    public void updateRecord(RuntimeComponent owner, String id, Object object, long expiration) throws StoreWriteException {
-        Map<String, Record> map = store.get(owner);
-        if (map == null) {
-            throw new StoreWriteException("Record not found: " + owner.getURI() +" : " + id);
-        }
-        Record record = map.get(id);
-        if (record == null) {
-            throw new StoreWriteException("Record not found: " + owner.getURI() +" : " + id);
-        }
-        record.data = object;
-    }
-
-    public Object readRecord(RuntimeComponent owner, String id) {
-        Map<String, Record> map = store.get(owner);
-        if (map == null) {
-            return null;
-        }
-        Record record = map.get(id);
-        if (record != null) {
-            return record.data;
-        }
-        return null;
-    }
-
-    public void removeRecords() {
-        store.clear();
-    }
-
-    public void removeRecord(RuntimeComponent owner, String id) throws StoreWriteException {
-        Map<String, Record> map = store.get(owner);
-        if (map == null) {
-            throw new StoreWriteException("Owner not found: " + owner.getURI() +" : " + id);
-        }
-        if (map.remove(id) == null) {
-            throw new StoreWriteException("Owner not found: " + owner.getURI() +" : " + id);
-        }
-    }
-
-    public void recover(RecoveryListener listener) {
-        throw new UnsupportedOperationException();
-    }
-
-    private class Record {
-        private Object data;
-        private long expiration = NEVER;
-
-        public Record(Object data, long expiration) {
-            this.data = data;
-            this.expiration = expiration;
-        }
-
-        public Object getData() {
-            return data;
-        }
-
-        public long getExpiration() {
-            return expiration;
-        }
-    }
-
-    private class Reaper implements Runnable {
-
-        public void run() {
-            long now = System.currentTimeMillis();
-            for (Map.Entry<RuntimeComponent, Map<String, Record>> entries : store.entrySet()) {
-                for (Map.Entry<String, Record> entry : entries.getValue().entrySet()) {
-                    final long expiration = entry.getValue().expiration;
-                    if (expiration != NEVER && now >= expiration) {
-                        RuntimeComponent owner = entries.getKey();
-                        Object instance = entry.getValue().getData();
-                        // notify listeners of the expiration 
-                        StoreExpirationEvent event = new StoreExpirationEvent(this, owner, instance);
-                        publish(event);
-                        entries.getValue().remove(entry.getKey());
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
deleted file mode 100644
index adeb667277..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.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.core.work;
-
-/**
- * JCA work wrapper.
- *
- * @version $Rev$ $Date$
- */
-public class Jsr237Work<T extends Runnable> implements commonj.work.Work {
-
-    // Work that is being executed.
-    private T work;
-
-    /*
-     * Initializes the work instance.
-     */
-    public Jsr237Work(T work) {
-        this.work = work;
-    }
-
-    /*
-     * Returns the completed work.
-     */
-    public T getWork() {
-        return work;
-    }
-
-    /*
-     * Release the work.
-     */
-    public void release() {
-    }
-
-    /*
-     * Work attributes are not daemon.
-     */
-    public boolean isDaemon() {
-        return false;
-    }
-
-    /*
-     * Runs the work.
-     */
-    public void run() {
-        work.run();
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
deleted file mode 100644
index b331517c85..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.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.core.work;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.work.NotificationListener;
-import org.apache.tuscany.sca.work.WorkScheduler;
-import org.apache.tuscany.sca.work.WorkSchedulerException;
-
-import commonj.work.WorkEvent;
-import commonj.work.WorkListener;
-import commonj.work.WorkManager;
-
-/**
- * A work scheduler implementation based on a JSR 237 work manager.
- * <p/>
- * <p/>
- * This needs a JSR 237 work manager implementation available for scheduling work. Instances can be configured with a
- * work manager implementation that is injected in. It is the responsibility of the runtime environment to make a work
- * manager implementation available. For example, if the managed environment supports work manager the runtime can use
- * the appropriate lookup mechanism to inject the work manager implementation. </p>
- *
- * @version $Rev$ $Date$
- */
-public class Jsr237WorkScheduler implements WorkScheduler {
-
-    /**
-     * Underlying JSR-237 work manager
-     */
-    private WorkManager jsr237WorkManager;
-
-    /**
-     * Initializes the JSR 237 work manager.
-     *
-     * @param jsr237WorkManager JSR 237 work manager.
-     */
-    public Jsr237WorkScheduler() {
-        
-        try {
-            InitialContext ctx  = new InitialContext();
-            jsr237WorkManager = (WorkManager) ctx.lookup("java:comp/env/wm/TuscanyWorkManager");
-        } catch (NamingException e) {
-            // ignore
-        }
-        if (jsr237WorkManager == null) {
-            jsr237WorkManager = new ThreadPoolWorkManager(10);
-        }
-    }
-
-    /**
-     * Schedules a unit of work for future execution. The notification listener is used to register interest in
-     * callbacks regarding the status of the work.
-     *
-     * @param work The unit of work that needs to be asynchronously executed.
-     */
-    public <T extends Runnable> void scheduleWork(T work) {
-        scheduleWork(work, null);
-    }
-
-    /**
-     * Schedules a unit of work for future execution. The notification listener is used to register interest in
-     * callbacks regarding the status of the work.
-     *
-     * @param work     The unit of work that needs to be asynchronously executed.
-     * @param listener Notification listener for callbacks.
-     */
-    public <T extends Runnable> void scheduleWork(T work, NotificationListener<T> listener) {
-
-        if (work == null) {
-            throw new IllegalArgumentException("Work cannot be null");
-        }
-
-        Jsr237Work<T> jsr237Work = new Jsr237Work<T>(work);
-        try {
-            if (listener == null) {
-                jsr237WorkManager.schedule(jsr237Work);
-            } else {
-                Jsr237WorkListener<T> jsr237WorkListener = new Jsr237WorkListener<T>(listener, work);
-                jsr237WorkManager.schedule(jsr237Work, jsr237WorkListener);
-            }
-        } catch (IllegalArgumentException ex) {
-            if (listener != null) {
-                listener.workRejected(work);
-            } else {
-                throw new WorkSchedulerException(ex);
-            }
-        } catch (Exception ex) {
-            throw new WorkSchedulerException(ex);
-        }
-
-    }
-
-    public void destroy() {
-        if (jsr237WorkManager instanceof ThreadPoolWorkManager) {
-            // Allow privileged access to modify threads. Requires RuntimePermission in security
-            // policy.
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    ((ThreadPoolWorkManager)jsr237WorkManager).destroy();
-                    return null;
-                }
-            });
-        }
-    }
-
-    /*
-     * WorkListener for keeping track of work status callbacks.
-     *
-     */
-    private class Jsr237WorkListener<T extends Runnable> implements WorkListener {
-
-        // Notification listener
-        private NotificationListener<T> listener;
-
-        // Work
-        private T work;
-
-        /*
-        * Initializes the notification listener.
-        */
-        public Jsr237WorkListener(NotificationListener<T> listener, T work) {
-            this.listener = listener;
-            this.work = work;
-        }
-
-        /*
-         * Callback when the work is accepted.
-         */
-        public void workAccepted(WorkEvent workEvent) {
-            T work = getWork();
-            listener.workAccepted(work);
-        }
-
-        /*
-         * Callback when the work is rejected.
-         */
-        public void workRejected(WorkEvent workEvent) {
-            T work = getWork();
-            listener.workRejected(work);
-        }
-
-        /*
-         * Callback when the work is started.
-         */
-        public void workStarted(WorkEvent workEvent) {
-            T work = getWork();
-            listener.workStarted(work);
-        }
-
-        /*
-         * Callback when the work is completed.
-         */
-        public void workCompleted(WorkEvent workEvent) {
-            T work = getWork();
-            Exception exception = workEvent.getException();
-            if (exception != null) {
-                listener.workFailed(work, exception);
-            } else {
-                listener.workCompleted(work);
-            }
-        }
-
-        /*
-        * Gets the underlying work from the work event.
-        */
-        private T getWork() {
-            return work;
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
deleted file mode 100644
index fb47a65edf..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.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.core.work;
-
-import java.rmi.server.UID;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
-
-import org.osoa.sca.annotations.Destroy;
-
-import commonj.work.Work;
-import commonj.work.WorkEvent;
-import commonj.work.WorkException;
-import commonj.work.WorkItem;
-import commonj.work.WorkListener;
-import commonj.work.WorkManager;
-
-/**
- * A thread-pool based implementation for the JSR-237 work manager.
- * <p/>
- * <p/>
- * This implementation supports only local work.
- * <p/>
- * TODO Elaborate the implementation. </p>
- *
- * @version $Rev$ $Date$
- */
-public class ThreadPoolWorkManager implements WorkManager {
-
-    // Map of work items currently handled by the work manager
-    private Map<WorkItemImpl, WorkListener> workItems = new ConcurrentHashMap<WorkItemImpl, WorkListener>();
-
-    // Thread-pool
-    private ExecutorService executor;
-
-    /**
-     * Initializes the thread-pool.
-     *
-     * @param threadPoolSize Thread-pool size.
-     * @throws IllegalArgumentException if threadPoolSize < 1
-     */
-    public ThreadPoolWorkManager(int threadPoolSize) {
-        if (threadPoolSize < 1) {
-            throw new IllegalArgumentException("Invalid threadPoolSize of " 
-                    + threadPoolSize + ". It must be >= 1");
-        }
-
-        // Creates a new Executor, use a custom ThreadFactory that
-        // creates daemon threads.
-        executor = Executors.newFixedThreadPool(threadPoolSize, new ThreadFactory() {
-            public Thread newThread(Runnable r) {
-                Thread thread = new Thread(r);
-                thread.setDaemon(true);
-                return thread;
-            }
-        });
-    }
-
-    /**
-     * Schedules a unit of work asynchronously.
-     *
-     * @param work Work that needs to be scheduled.
-     * @return Work Work item representing the asynchronous work
-     */
-    public WorkItem schedule(Work work) throws IllegalArgumentException {
-        return schedule(work, null);
-    }
-
-    /**
-     * Schedules a unit of work asynchronously.
-     *
-     * @param work         Work that needs to be scheduled.
-     * @param workListener Work listener for callbacks.
-     * @return Work Work item representing the asynchronous work
-     */
-    public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException {
-
-        WorkItemImpl workItem = new WorkItemImpl(new UID().toString(), work);
-        if (workListener != null) {
-            workItems.put(workItem, workListener);
-        }
-        workAccepted(workItem, work);
-        if (scheduleWork(work, workItem)) {
-            return workItem;
-        } else {
-            workItem.setStatus(WorkEvent.WORK_REJECTED);
-            if (workListener != null) {
-                workListener.workRejected(new WorkEventImpl(workItem));
-            }
-            throw new IllegalArgumentException("Unable to schedule work");
-        }
-    }
-
-    /**
-     * Wait for all the specified units of work to finish.
-     *
-     * @param works   Units of the work that need to finish.
-     * @param timeout Timeout for waiting for the units of work to finish.
-     */
-    public boolean waitForAll(Collection works, long timeout) {
-        throw new UnsupportedOperationException("waitForAll not supported");
-    }
-
-    /**
-     * Wait for any of the specified units of work to finish.
-     *
-     * @param works   Units of the work that need to finish.
-     * @param timeout Timeout for waiting for the units of work to finish.
-     */
-    public Collection waitForAny(Collection works, long timeout) {
-        throw new UnsupportedOperationException("waitForAny not supported");
-    }
-
-    /**
-     * Method provided for subclasses to indicate a work acceptance.
-     *
-     * @param workItem Work item representing the work that was accepted.
-     * @param work     Work that was accepted.
-     */
-    private void workAccepted(final WorkItemImpl workItem, final Work work) {
-        WorkListener listener = workItems.get(workItem);
-        if (listener != null) {
-            workItem.setStatus(WorkEvent.WORK_ACCEPTED);
-            WorkEvent event = new WorkEventImpl(workItem);
-            listener.workAccepted(event);
-        }
-    }
-
-    /*
-     * Method to indicate a work start.
-     */
-    private void workStarted(final WorkItemImpl workItem, final Work work) {
-        WorkListener listener = workItems.get(workItem);
-        if (listener != null) {
-            workItem.setStatus(WorkEvent.WORK_STARTED);
-            WorkEvent event = new WorkEventImpl(workItem);
-            listener.workStarted(event);
-        }
-    }
-
-    /*
-     * Method to indicate a work completion.
-     */
-    private void workCompleted(final WorkItemImpl workItem, final Work work) {
-        workCompleted(workItem, work, null);
-    }
-
-    /*
-     * Method to indicate a work completion.
-     */
-    private void workCompleted(final WorkItemImpl workItem, final Work work, final WorkException exception) {
-        WorkListener listener = workItems.get(workItem);
-        if (listener != null) {
-            workItem.setStatus(WorkEvent.WORK_COMPLETED);
-            workItem.setResult(work);
-            workItem.setException(exception);
-            WorkEvent event = new WorkEventImpl(workItem);
-            listener.workCompleted(event);
-            workItems.remove(workItem);
-        }
-    }
-
-    /*
-     * Schedules the work using the ThreadPool.
-     */
-    private boolean scheduleWork(final Work work, final WorkItemImpl workItem) {
-        try {
-            executor.execute(new DecoratingWork(workItem, work));
-            return true;
-        } catch (RejectedExecutionException ex) {
-            return false;
-        }
-    }
-
-    /*
-     * Class that decorates the original worker so that it can get callbacks when work is done.
-     */
-    private final class DecoratingWork implements Runnable {
-
-        // Work item for this work.
-        private WorkItemImpl workItem;
-
-        // The original work.
-        private Work decoratedWork;
-
-        /*
-         * Initializes the work item and underlying work.
-         */
-        private DecoratingWork(final WorkItemImpl workItem, final Work decoratedWork) {
-            this.workItem = workItem;
-            this.decoratedWork = decoratedWork;
-        }
-
-        /*
-         * Overrides the run method.
-         */
-        public void run() {
-            workStarted(workItem, decoratedWork);
-            try {
-                decoratedWork.run();
-                workCompleted(workItem, decoratedWork);
-            } catch (Throwable th) {
-                workCompleted(workItem, decoratedWork, new WorkException(th.getMessage(), th));
-            }
-        }
-
-    }
-
-    @Destroy
-    public void destroy() {
-        executor.shutdown();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
deleted file mode 100644
index 67d2b66f84..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.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.core.work;
-
-
-import commonj.work.WorkEvent;
-import commonj.work.WorkException;
-import commonj.work.WorkItem;
-
-/**
- * Default immutable implementation of the <code>WorkEvent</code> class.
- *
- * @version $Rev$ $Date$
- */
-class WorkEventImpl implements WorkEvent {
-    
-    // Work item for this event
-    private WorkItem workItem;
-
-    // Exception if something has gone wrong
-    private WorkException exception;
-
-    /**
-     * Instantiates the event.
-     *
-     * @param workItem Work item for this event.
-     */
-    public WorkEventImpl(final WorkItemImpl workItem) {
-        this.workItem = workItem;
-        this.exception = workItem.getException();
-    }
-
-    /**
-     * Returns the work type based on whether the work was accepted, started,
-     * rejected or completed.
-     *
-     * @return Work type.
-     */
-    public int getType() {
-        return workItem.getStatus();
-    }
-
-    /**
-     * Returns the work item associated with this work type.
-     *
-     * @return Work item.
-     */
-    public WorkItem getWorkItem() {
-        return workItem;
-    }
-
-    /**
-     * Returns the exception if the work completed with an exception.
-     *
-     * @return Work exception.
-     */
-    public WorkException getException() {
-        return exception;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
deleted file mode 100644
index 170319b6e6..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.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.core.work;
-
-import commonj.work.Work;
-import commonj.work.WorkException;
-import commonj.work.WorkItem;
-
-/**
- * An identity based immutable implementation of the <code>WorkItem</code>
- * interface.
- *
- * @version $Rev$ $Date$
- */
-class WorkItemImpl implements WorkItem {
-    
-    // Id scoped for the VM
-    private String id;
-
-    // Status
-    private int status = -1;
-
-    // Result
-    private Work result;
-    
-    // Original work
-    private Work originalWork;
-
-    // Exception
-    private WorkException exception;
-
-    /**
-     * Instantiates an id for this item.
-     *
-     * @param id of this work event.
-     */
-    protected WorkItemImpl(final String id, final Work orginalWork) {
-        this.id = id;
-        this.originalWork = orginalWork;
-    }
-
-    /**
-     * Returns the id.
-     *
-     * @return Id of this item.
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Returns the original work.
-     *
-     * @return Original work.
-     */
-    public Work getOriginalWork() {
-        return originalWork;
-    }
-
-    /**
-     * Returns the work result if the work completed.
-     *
-     * @return Work.
-     * @throws WorkException If the work completed with an exception.
-     */
-    public Work getResult() {
-        return result;
-    }
-
-    /**
-     * Sets the result.
-     *
-     * @param result Result.
-     */
-    protected void setResult(final Work result) {
-        this.result = result;
-    }
-
-    /**
-     * Returns the exception if work completed with an exception.
-     *
-     * @return Work exception.
-     */
-    protected WorkException getException() {
-        return exception;
-    }
-
-    /**
-     * Sets the exception.
-     *
-     * @param exception Exception.
-     */
-    protected void setException(final WorkException exception) {
-        this.exception = exception;
-    }
-
-    /**
-     * Returns the work type based on whether the work was accepted, started,
-     * rejected or completed.
-     *
-     * @return Work status.
-     */
-    public int getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the status.
-     *
-     * @param status Status.
-     */
-    protected void setStatus(final int status) {
-        this.status = status;
-    }
-
-    /**
-     * @see Object#hashCode() 
-     */
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
-
-    /**
-     * Indicates whether some other object is "equal to" this one.
-     *
-     * @param obj Object to be compared.
-     * @return true if this object is the same as the obj argument; false
-     *         otherwise..
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        return (obj != null) && (obj.getClass() == WorkItemImpl.class) && ((WorkItemImpl) obj).id.equals(id);
-    }
-
-    /**
-     * Compares this object with the specified object for order. Returns a
-     * negative integer, zero, or a positive integer as this object is less
-     * than, equal to, or greater than the specified object.
-     *
-     * @param o Object to be compared.
-     * @return A negative integer, zero, or a positive integer as this object
-     *         is less than, equal to, or greater than the specified object.
-     * @throws ClassCastException needs better documentation.
-     */
-    public int compareTo(final Object o) {
-        if (o.getClass() != WorkItemImpl.class) {
-            throw new ClassCastException(o.getClass().getName());
-        } else {
-            return ((WorkItemImpl) o).getId().compareTo(getId());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 5f54178483..0000000000
--- a/tags/java/sca/1.3/modules/core/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.core.assembly.ReferenceParameterProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#referenceParameters,model=org.apache.tuscany.sca.runtime.ReferenceParameters
diff --git a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
deleted file mode 100644
index 898054509b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ /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.core.conversation.ConversationManagerImpl

diff --git a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
deleted file mode 100644
index af281d8f4d..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ /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.core.invocation.DefaultProxyFactoryExtensionPoint

diff --git a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
deleted file mode 100644
index bcbd5b0abf..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ /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.core.invocation.MessageFactoryImpl

diff --git a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
deleted file mode 100644
index 56e99be0f2..0000000000
--- a/tags/java/sca/1.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ /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.core.work.Jsr237WorkScheduler

diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
deleted file mode 100644
index 7b44736d4b..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.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.core;
-
-import junit.framework.TestCase;
-
-public class DefaultExtensionPointRegistryTestCase extends TestCase {
-    private ExtensionPointRegistry registry;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        registry = new DefaultExtensionPointRegistry();
-    }
-
-    public void testRegistry() {
-        MyRegistry service = new MyREgistryImpl();
-        registry.addExtensionPoint(service);
-        assertSame(service, registry.getExtensionPoint(MyRegistry.class));
-        registry.removeExtensionPoint(service);
-        assertNull(registry.getExtensionPoint(MyRegistry.class));
-    }
-
-    public static interface MyRegistry {
-        void doSomething();
-    }
-
-    private static class MyREgistryImpl implements MyRegistry {
-
-        public void doSomething() {
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
deleted file mode 100644
index 2bc78c3d35..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.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.core.event;
-
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.event.Event;
-import org.apache.tuscany.sca.event.EventFilter;
-import org.apache.tuscany.sca.event.EventPublisher;
-import org.apache.tuscany.sca.event.RuntimeEventListener;
-import org.apache.tuscany.sca.event.TrueFilter;
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BaseEventPublisherTestCase extends TestCase {
-    EventPublisher publisher;
-
-    public void testFireListener() {
-        Event event = new TestEvent();
-        RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
-        listener.onEvent(EasyMock.same(event));
-        EasyMock.expectLastCall();
-        EasyMock.replay(listener);
-        publisher.addListener(listener);
-        publisher.publish(event);
-        EasyMock.verify(listener);
-    }
-
-    public void testRemoveListener() {
-        Event event = new TestEvent();
-        RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
-        EasyMock.replay(listener);
-        publisher.addListener(listener);
-        publisher.removeListener(listener);
-        publisher.publish(event);
-        EasyMock.verify(listener);
-    }
-
-    public void testFalseFilterListener() {
-        Event event = new TestEvent();
-        RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
-        EasyMock.replay(listener);
-        publisher.addListener(new FalseFilter(), listener);
-        publisher.publish(event);
-        EasyMock.verify(listener);
-    }
-
-    public void testTrueFilterListener() {
-        Event event = new TestEvent();
-        RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
-        listener.onEvent(EasyMock.same(event));
-        EasyMock.expectLastCall();
-        EasyMock.replay(listener);
-        publisher.addListener(new TrueFilter(), listener);
-        publisher.publish(event);
-        EasyMock.verify(listener);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        publisher = new BaseEventPublisher() {
-        };
-    }
-
-    private class TestEvent implements Event {
-        public Object getSource() {
-            return null;
-        }
-    }
-
-    private class FalseFilter implements EventFilter {
-
-        public boolean match(Event event) {
-            return false;
-        }
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
deleted file mode 100644
index 48dcf8df07..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.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.core.event;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EventTestCase extends TestCase {
-    private URI uri = URI.create("foo");
-
-    public void testCompositeStart() {
-        ComponentStart event = new ComponentStart(this, uri);
-        assertEquals(uri, event.getComponentURI());
-    }
-
-    public void testCompositeStop() {
-        ComponentStop event = new ComponentStop(this, uri);
-        assertEquals(uri, event.getComponentURI());
-    }
-
-    public void testHttpSessionStart() {
-        Object id = new Object();
-        HttpSessionStart event = new HttpSessionStart(this, id);
-        assertEquals(this, event.getSource());
-        assertEquals(id, event.getSessionID());
-    }
-
-    public void testHttpSessionEnd() {
-        Object id = new Object();
-        HttpSessionEnd event = new HttpSessionEnd(this, id);
-        assertEquals(this, event.getSource());
-        assertEquals(id, event.getSessionID());
-    }
-
-    public void testRequestStart() {
-        RequestStart event = new RequestStart(this);
-        assertEquals(this, event.getSource());
-    }
-
-    public void testReequestEnd() {
-        RequestEnd event = new RequestEnd(this);
-        assertEquals(this, event.getSource());
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
deleted file mode 100644
index 99d5ec7bc9..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.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.core.invocation;
-
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PhaseManagerTestCase {
-
-    @Test
-    public void testDiscovery() {
-        PhaseManager pm = new PhaseManager("org.apache.tuscany.sca.invocation.PhaseTest");
-        List<String> phases = pm.getAllPhases();
-        System.out.println(phases.size());
-        System.out.println(phases);
-        // Assert.assertEquals(15, phases.size());
-        Assert.assertEquals("reference.first", phases.get(0));
-
-        int rt = phases.indexOf("reference.transaction");
-        Assert.assertTrue(rt > phases.indexOf("reference.interface"));
-
-        int st = phases.indexOf("service.transaction");
-        Assert.assertTrue(st > phases.indexOf("service.binding"));
-
-        int it = phases.indexOf("implementation.transaction");
-        Assert.assertTrue(it < phases.indexOf("implementation.policy"));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
deleted file mode 100644
index 61164fa2de..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.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.core.invocation;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public class PhaseSorterTestCase extends TestCase {
-    private PhaseSorter<String> graph;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        graph = new PhaseSorter<String>();
-    }
-
-    public void testSort() {
-        graph.addEdge("a", "b");
-        graph.addEdge("a", "c");
-        graph.addEdge("c", "d");
-        graph.addEdge("b", "c");
-        List<String> order = graph.topologicalSort(true);
-        assertEquals(Arrays.asList("a", "b", "c", "d"), order);
-        assertTrue(!graph.getVertices().isEmpty());
-
-        graph.addEdge("d", "a");
-        try {
-            order = graph.topologicalSort(true);
-            assertTrue("Should have failed", false);
-        } catch (IllegalArgumentException e) {
-            assertTrue(true);
-        }
-
-        graph.removeEdge("d", "a");
-        order = graph.topologicalSort(false);
-        assertEquals(Arrays.asList("a", "b", "c", "d"), order);
-        assertTrue(graph.getVertices().isEmpty());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
deleted file mode 100644
index 64114f7fb2..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.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.core.scope;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class AbstractScopeContainerTestCase<T, KEY> extends TestCase {
-    protected IMocksControl control;
-    protected ScopeContainer<KEY> scopeContainer;
-    protected URI groupId;
-    protected KEY contextId;
-    protected RuntimeComponent component;
-    protected ScopedImplementation implementation; 
-    protected InstanceWrapper<T> wrapper;
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        control = EasyMock.createStrictControl();
-        component = control.createMock(RuntimeComponent.class);
-        wrapper = control.createMock(InstanceWrapper.class);
-        implementation = control.createMock(ScopedImplementation.class);
-        EasyMock.expect(component.getImplementation()).andReturn(implementation).anyTimes();
-    }
-
-    protected void preRegisterComponent() throws Exception {
-        scopeContainer.start();
-        EasyMock.expect(implementation.isEagerInit()).andStubReturn(false);
-    }
-
-    protected void expectCreateWrapper() throws Exception {
-        EasyMock.expect(implementation.createInstanceWrapper()).andReturn(wrapper);
-        wrapper.start();
-    }
-    
-    protected static interface ScopedImplementation extends ScopedImplementationProvider, Implementation {
-        
-    }
-    
-    
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
deleted file mode 100644
index d46d77b4b8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.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.core.store;
-
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.event.RuntimeEventListener;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.store.DuplicateRecordException;
-import org.apache.tuscany.sca.store.Store;
-import org.apache.tuscany.sca.store.StoreExpirationEvent;
-import org.apache.tuscany.sca.store.StoreMonitor;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MemoryStoreTestCase extends TestCase {
-    private StoreMonitor monitor;
-
-    public void testEviction() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        store.insertRecord(component, id, value, 1);
-        Thread.sleep(200);
-        assertNull(store.readRecord(component, id));
-        store.destroy();
-    }
-
-    public void testNotifyOnEviction() throws Exception {
-        final CountDownLatch latch = new CountDownLatch(1);
-        RuntimeEventListener listener = EasyMock.createMock(RuntimeEventListener.class);
-        listener.onEvent(EasyMock.isA(StoreExpirationEvent.class));
-        EasyMock.expectLastCall().andStubAnswer(new IAnswer<Object>() {
-            public Object answer() throws Throwable {
-                latch.countDown();
-                return null;
-            }
-        });
-        EasyMock.replay(listener);
-        MemoryStore store = new MemoryStore(monitor);
-        store.addListener(listener);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        store.insertRecord(component, id, value, 1);
-        if (!latch.await(1000, TimeUnit.MILLISECONDS)) {
-            // failed to notify listener
-            fail();
-        }
-        EasyMock.verify(listener);
-    }
-
-    public void testNoEviction() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        store.insertRecord(component, id, value, Store.NEVER);
-        Thread.sleep(100);
-        assertNotNull(store.readRecord(component, id));
-        store.destroy();
-    }
-
-    public void testInsertRecord() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        store.insertRecord(component, id, value, Store.NEVER);
-        store.destroy();
-    }
-
-    public void testInsertAlreadyExists() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createMock(RuntimeComponent.class);
-        EasyMock.expect(component.getURI()).andReturn("component");
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        store.insertRecord(component, id, value, Store.NEVER);
-        try {
-            store.insertRecord(component, id, value, Store.NEVER);
-            fail();
-        } catch (DuplicateRecordException e) {
-            //expected
-        }
-        store.destroy();
-    }
-
-    public void testUpdateRecord() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-        Object newValue = new Object();
-
-        store.insertRecord(component, id, value, Store.NEVER);
-        store.updateRecord(component, id, newValue, 1L);
-        assertEquals(newValue, store.readRecord(component, id));
-        store.destroy();
-    }
-
-    public void testDeleteRecord() throws Exception {
-        MemoryStore store = new MemoryStore(monitor);
-        store.setReaperInterval(10);
-        store.init();
-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);
-        EasyMock.replay(component);
-        String id = UUID.randomUUID().toString();
-        Object value = new Object();
-
-        store.insertRecord(component, id, value, Store.NEVER);
-        store.removeRecord(component, id);
-        assertNull(store.readRecord(component, id));
-        store.destroy();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        monitor = EasyMock.createNiceMock(StoreMonitor.class);
-        EasyMock.replay(monitor);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
deleted file mode 100644
index 1aba9656d8..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.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.core.wire;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.core.invocation.CallbackInterfaceInterceptor;
-import org.apache.tuscany.sca.core.invocation.MessageFactoryImpl;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Message;
-import org.easymock.EasyMock;
-import org.osoa.sca.NoRegisteredCallbackException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CallbackInterfaceInterceptorTestCase extends TestCase {
-
-    public void testHasCallbackObject() {
-        CallbackInterfaceInterceptor interceptor = new CallbackInterfaceInterceptor();
-        Interceptor next = EasyMock.createMock(Interceptor.class);
-        EasyMock.expect(next.invoke(EasyMock.isA(Message.class))).andReturn(null);
-        EasyMock.replay(next);
-        interceptor.setNext(next);
-        Message msg = new MessageFactoryImpl().createMessage();
-        msg.setFrom(new EndpointReferenceImpl("uri"));
-        msg.getFrom().getReferenceParameters().setCallbackObjectID("ABC");
-        interceptor.invoke(msg);
-        EasyMock.verify(next);
-    }
-
-    public void testNoCallbackObject() {
-        CallbackInterfaceInterceptor interceptor = new CallbackInterfaceInterceptor();
-        Message msg = new MessageFactoryImpl().createMessage();
-        msg.setFrom(new EndpointReferenceImpl("uri"));
-        msg.getFrom().getReferenceParameters().setCallbackObjectID(null);
-        try {
-            interceptor.invoke(msg);
-            fail();
-        } catch (NoRegisteredCallbackException e) {
-            // expected
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
deleted file mode 100644
index 1ad0927d16..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.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.core.wire;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.invocation.InvocationChainImpl;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.invocation.Interceptor;
-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.Phase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InvocationChainImplTestCase extends TestCase {
-
-    public void testInsertAtEnd() throws Exception {
-        Operation op = newOperation("foo");
-        InvocationChain chain = new InvocationChainImpl(op, op, true);
-        Interceptor inter2 = new MockInterceptor();
-        Interceptor inter1 = new MockInterceptor();
-        chain.addInterceptor(inter1);
-        chain.addInterceptor(inter2);
-        Interceptor head = (Interceptor)chain.getHeadInvoker();
-        assertEquals(inter1, head);
-        assertEquals(inter2, head.getNext());
-        assertEquals(inter2, chain.getTailInvoker());
-
-    }
-
-    public void testAddByPhase() throws Exception {
-        Operation op = newOperation("foo");
-        InvocationChain chain = new InvocationChainImpl(op, op, false);
-        Interceptor inter1 = new MockInterceptor();
-        Interceptor inter2 = new MockInterceptor();
-        Interceptor inter3 = new MockInterceptor();
-        Interceptor inter4 = new MockInterceptor();
-        chain.addInterceptor(inter3); // SERVICE
-        chain.addInterceptor(Phase.IMPLEMENTATION_POLICY, inter4);
-        chain.addInterceptor(Phase.SERVICE_POLICY, inter2);
-        chain.addInterceptor(Phase.SERVICE_BINDING, inter1);
-        Interceptor head = (Interceptor)chain.getHeadInvoker();
-        assertEquals(inter1, head);
-        assertEquals(inter2, inter1.getNext());
-        assertEquals(inter3, inter2.getNext());
-        assertEquals(inter4, inter3.getNext());
-        assertEquals(inter4, chain.getTailInvoker());
-    }
-
-    private class MockInterceptor implements Interceptor {
-
-        private Invoker next;
-
-        public Message invoke(Message msg) {
-            return null;
-        }
-
-        public void setNext(Invoker next) {
-            this.next = next;
-        }
-
-        public Invoker getNext() {
-            return next;
-        }
-
-    }
-
-    private static Operation newOperation(String name) {
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-        return operation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
deleted file mode 100644
index b8150d4edc..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.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.core.wire;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.getCurrentArguments;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.work.WorkScheduler;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class NonBlockingInterceptorTestCase extends TestCase {
-
-    public void testInvoke() throws Exception {
-        WorkScheduler scheduler = createMock(WorkScheduler.class);
-        scheduler.scheduleWork(isA(Runnable.class));
-        expectLastCall().andStubAnswer(new IAnswer<Object>() {
-            public Object answer() throws Throwable {
-                Runnable runnable = (Runnable) getCurrentArguments()[0];
-                runnable.run();
-                return null;
-            }
-        });
-        replay(scheduler);
-        Message context = createMock(Message.class);
-        //String convID = "convID";
-        //TODO port to the new way of dealing with conversation IDs later
-        //EasyMock.expect(context.getConversationID()).andReturn(convID);
-        EasyMock.replay(context);
-        ThreadMessageContext.setMessageContext(context);
-        Message msg = createMock(Message.class);
-        //TODO port to the new way of dealing with conversation IDs later
-        //msg.setConversationID(convID);
-        Interceptor next = EasyMock.createMock(Interceptor.class);
-        EasyMock.expect(next.invoke(EasyMock.eq(msg))).andReturn(msg);
-        EasyMock.expect(msg.isFault()).andReturn(false);
-        EasyMock.replay(next);
-        EasyMock.replay(msg);
-        Interceptor interceptor = new NonBlockingInterceptor(scheduler, next);
-        interceptor.invoke(msg);
-        verify(context);
-        verify(next);
-        verify(msg);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
deleted file mode 100644
index 3184c3de92..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.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.core.work;
-
-import commonj.work.Work;
-
-/**
- * Simple Work item that will throw an exception
- * 
- * @version $Rev$ $Date$
- */
-public class FailingWork implements Work {
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isDaemon() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void release() {
-    }
-
-    /**
-     * Throws an IllegalArgumentException
-     */
-    public void run() {
-        System.out.println("Starting " + this + " and throwing an Exception");
-        throw new IllegalArgumentException("Sample exception from " + this);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
deleted file mode 100644
index cdf47cf970..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.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.core.work;
-
-/**
- * Simple Runnable that throws an IllegalArgumentException
- *
- * @version $Rev$ $Date$
- */
-public class JSR237MyFailingRunnable extends JSR237MyRunnable {
-
-    /**
-     * Constructor
-     */
-    public JSR237MyFailingRunnable() {
-        super(-1);
-    }
-
-    /**
-     * Sleeps for a period of time defined by sleepTime
-     */
-    public void run() {
-        System.out.println("Starting " + this + " and throwing an Exception");
-        throw new IllegalArgumentException("Sample exception from " + this);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
deleted file mode 100644
index a7617f7a70..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.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.core.work;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Simple Runnable that is used for testing Jsr237WorkScheduler
- *
- * @version $Rev$ $Date$
- */
-public class JSR237MyRunnable implements Runnable {
-
-    /**
-     * Count of workAccepted() method calls
-     */
-    private AtomicInteger runCompletedCount = new AtomicInteger();
-
-    /**
-     * The amount of time to sleep in the Run loop
-     */
-    private final long sleepTime;
-
-    /**
-     * Constructor
-     *
-     * @param sleepTime The amount of time to sleep (in milliseconds) in the run() method
-     */
-    public JSR237MyRunnable(long sleepTime) {
-        this.sleepTime = sleepTime;
-    }
-
-    /**
-     * Sleeps for a period of time defined by sleepTime
-     */
-    public void run() {
-        System.out.println("Starting " + this);
-        try {
-            Thread.sleep(sleepTime);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.out.println("Done " + this);
-        runCompletedCount.incrementAndGet();
-    }
-
-    /**
-     * Returns the number of completed calls to run()
-     *
-     * @return The number of completed calls to run()
-     */
-    public int getRunCompletedCount() {
-        return runCompletedCount.get();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
deleted file mode 100644
index 75840efef4..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.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.core.work;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.tuscany.sca.work.NotificationListener;
-
-/**
- * Simple NotificationListener that is used for testing Jsr237WorkScheduler
- *
- * @version $Rev$ $Date$
- */
-public class JSR237MyRunnerListener implements NotificationListener<JSR237MyRunnable> {
-
-    /**
-     * Count of workAccepted() method calls
-     */
-    private AtomicInteger workAcceptedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workStarted() method calls
-     */
-    private AtomicInteger workStartedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workCompleted() method calls
-     */
-    private AtomicInteger workCompletedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workFailed() method calls
-     */
-    private AtomicInteger workFailedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workRejected() method calls
-     */
-    private AtomicInteger workRejectedCallCount = new AtomicInteger();
-
-    /**
-     * List of all exceptions thrown by Work items
-     */
-    private List<Throwable> workExceptions = Collections.synchronizedList(new ArrayList<Throwable>());
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workAccepted(JSR237MyRunnable work) {
-        workAcceptedCallCount.incrementAndGet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workCompleted(JSR237MyRunnable work) {
-        workCompletedCallCount.incrementAndGet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workFailed(JSR237MyRunnable work, Throwable error) {
-        workExceptions.add(error);
-        workFailedCallCount.incrementAndGet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workRejected(JSR237MyRunnable work) {
-        workRejectedCallCount.incrementAndGet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workStarted(JSR237MyRunnable work) {
-        workStartedCallCount.incrementAndGet();
-    }
-
-    /**
-     * Returns the number of calls to workAccepted()
-     *
-     * @return The number of calls to workAccepted()
-     */
-    public int getWorkAcceptedCallCount() {
-        return workAcceptedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workStarted()
-     *
-     * @return The number of calls to workStarted()
-     */
-    public int getWorkStartedCallCount() {
-        return workStartedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workCompleted()
-     *
-     * @return The number of calls to workCompleted()
-     */
-    public int getWorkCompletedCallCount() {
-        return workCompletedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workFailed()
-     *
-     * @return The number of calls to workFailed()
-     */
-    public int getWorkFailedCallCount() {
-        return workFailedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workRejected()
-     *
-     * @return The number of calls to workRejected()
-     */
-    public int getWorkRejectedCallCount() {
-        return workRejectedCallCount.get();
-    }
-
-    /**
-     * Returns a List of all exceptions that are thrown by the Work items
-     *
-     * @return A List of all exceptions that are thrown by the Work items
-     */
-    public List<Throwable> getWorkExceptions() {
-        return Collections.unmodifiableList(workExceptions);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
deleted file mode 100644
index 225f23cb93..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.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.core.work;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test case for Jsr237WorkScheduler
- *
- * @version $Rev$ $Date$
- */
-public class Jsr237WorkSchedulerTestCase {
-
-    /**
-     * Wait up to 20 seconds for the Work units to complete
-     */
-    private static final long WAIT_TIMEOUT = 20000;
-
-    /**
-     * This is the shared instance of the ThreadPoolWorkManager used by the tests
-     */
-    private static Jsr237WorkScheduler workSchedular = null;
-
-    /**
-     * Setup the Jsr237WorkScheduler
-     */
-    @BeforeClass
-    public static void setup() {
-        workSchedular = new Jsr237WorkScheduler();
-    }
-
-    /**
-     * Make sure that the Jsr237WorkScheduler is stopped after running the tests
-     */
-    @AfterClass
-    public static void destroy() {
-        if (workSchedular != null) {
-            workSchedular.destroy();
-        }
-    }
-
-    /**
-     * Tests running a single fast job on the Jsr237WorkScheduler
-     */
-    @Test
-    public void testSingleFastJob() {
-        // Create the work and register it
-        JSR237MyRunnable fast = new JSR237MyRunnable(10);
-        JSR237MyRunnerListener listener = new JSR237MyRunnerListener();
-        workSchedular.scheduleWork(fast, listener);
-
-        // Wait for the 1 job to complete
-        waitForWorkToComplete(listener, 1);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(1, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(1, listener.getWorkStartedCallCount());
-        Assert.assertEquals(1, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(0, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a single job that fails on the Jsr237WorkScheduler
-     */
-    @Test
-    public void testSingleFailingJob() {
-        // Create the work and register it
-        JSR237MyFailingRunnable fail = new JSR237MyFailingRunnable();
-        JSR237MyRunnerListener listener = new JSR237MyRunnerListener();
-        workSchedular.scheduleWork(fail, listener);
-
-        // Wait for the 1 job to complete
-        waitForWorkToComplete(listener, 1);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(1, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(1, listener.getWorkStartedCallCount());
-        Assert.assertEquals(0, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(1, listener.getWorkFailedCallCount());
-        Assert.assertEquals(1, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a mixture of fast and slow jobs on the Jsr237WorkScheduler
-     */
-    @Test
-    public void testMultipleJobs() {
-        // Create the work and register it
-        JSR237MyRunnable fast1 = new JSR237MyRunnable(50);
-        JSR237MyRunnable fast2 = new JSR237MyRunnable(100);
-        JSR237MyRunnable fast3 = new JSR237MyRunnable(200);
-        JSR237MyRunnable slow1= new JSR237MyRunnable(2000);
-        JSR237MyRunnable slow2 = new JSR237MyRunnable(2000);
-        JSR237MyRunnerListener listener = new JSR237MyRunnerListener();
-        workSchedular.scheduleWork(fast1, listener);
-        workSchedular.scheduleWork(fast2, listener);
-        workSchedular.scheduleWork(fast3, listener);
-        workSchedular.scheduleWork(slow1, listener);
-        workSchedular.scheduleWork(slow2, listener);
-
-        // Wait for the 5 jobs to complete
-        waitForWorkToComplete(listener, 5);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(5, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(5, listener.getWorkStartedCallCount());
-        Assert.assertEquals(5, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(0, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a mixture of fast and slow jobs some of which fail on the
-     * Jsr237WorkScheduler
-     */
-    @Test
-    public void testMultipleJobsSomeFail() {
-        // Create the work and register it
-        JSR237MyRunnable fast1 = new JSR237MyRunnable(50);
-        JSR237MyRunnable fast2 = new JSR237MyRunnable(100);
-        JSR237MyRunnable fast3 = new JSR237MyRunnable(200);
-        JSR237MyRunnable slow1= new JSR237MyRunnable(2000);
-        JSR237MyRunnable slow2 = new JSR237MyRunnable(2000);
-        JSR237MyFailingRunnable fail1 = new JSR237MyFailingRunnable();
-        JSR237MyFailingRunnable fail2 = new JSR237MyFailingRunnable();
-        JSR237MyRunnerListener listener = new JSR237MyRunnerListener();
-        workSchedular.scheduleWork(fast1, listener);
-        workSchedular.scheduleWork(fast2, listener);
-        workSchedular.scheduleWork(fail1, listener);
-        workSchedular.scheduleWork(fast3, listener);
-        workSchedular.scheduleWork(slow1, listener);
-        workSchedular.scheduleWork(fail2, listener);
-        workSchedular.scheduleWork(slow2, listener);
-
-        // Wait for the 7 jobs to complete
-        waitForWorkToComplete(listener, 7);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(7, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(7, listener.getWorkStartedCallCount());
-        Assert.assertEquals(5, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(2, listener.getWorkFailedCallCount());
-        Assert.assertEquals(2, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a single job that has no listener
-     */
-    @Test
-    public void testSingleFastJobWithNoListener() {
-        // Create the work and register it
-        JSR237MyRunnable fast = new JSR237MyRunnable(10);
-        workSchedular.scheduleWork(fast);
-
-        // Wait for the job to complete
-        long startTime = System.currentTimeMillis();
-        while (true) {
-            int completedCount = fast.getRunCompletedCount();
-            if (completedCount == 1) {
-                break;
-            }
-
-            if (System.currentTimeMillis() - startTime > WAIT_TIMEOUT) {
-                Assert.fail("Only " + completedCount + " work items completed before timeout");
-                return;
-            }
-
-            // Lets wait for the job to complete
-            try {
-                Thread.sleep(25);
-            } catch (InterruptedException ex) {
-                Assert.fail("Unexpected exception: " + ex);
-            }
-        }
-    }
-
-    /**
-     * Tests scheduling a null as the work item
-     */
-    @Test
-    public void testNullWork() {
-        try {
-            workSchedular.scheduleWork(null);
-            Assert.fail("Should have thrown IllegalArgumentException ");
-        } catch (IllegalArgumentException ex) {
-            // As expected
-            Assert.assertTrue(ex.toString().indexOf("null") != -1);
-        }
-    }
-
-    /**
-     * Waits for the specified number of jobs to complete or the timeout to fire.
-     *
-     * @param listener The listener to use to track Work unit completion
-     * @param completedWorkItemsToWaitFor The number of Work items to complete
-     */
-    private void waitForWorkToComplete(JSR237MyRunnerListener listener, int completedWorkItemsToWaitFor) {
-        long startTime = System.currentTimeMillis();
-        while (true) {
-            int completedCount = listener.getWorkCompletedCallCount() + listener.getWorkFailedCallCount();
-            if (completedCount == completedWorkItemsToWaitFor) {
-                return;
-            }
-
-            if (System.currentTimeMillis() - startTime > WAIT_TIMEOUT) {
-                Assert.fail("Only " + completedCount + " work items completed before timeout");
-                return;
-            }
-
-            // Lets wait for more jobs to complete
-            try {
-                Thread.sleep(25);
-            } catch (InterruptedException ex) {
-                Assert.fail("Unexpected exception: " + ex);
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
deleted file mode 100644
index ba32a92c18..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.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.core.work;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.Assert;
-
-import commonj.work.WorkEvent;
-import commonj.work.WorkException;
-import commonj.work.WorkListener;
-
-/**
- * A simple WorkListener that tracks invocations to it.
- * 
- * @version $Rev$ $Date$
- */
-public class TestWorkListener implements WorkListener {
-
-    /**
-     * Count of workAccepted() method calls
-     */
-    private AtomicInteger workAcceptedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workStarted() method calls
-     */
-    private AtomicInteger workStartedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workCompleted() method calls
-     */
-    private AtomicInteger workCompletedCallCount = new AtomicInteger();
-
-    /**
-     * Count of workRejected() method calls
-     */
-    private AtomicInteger workRejectedCallCount = new AtomicInteger();
-
-    /**
-     * List of all exceptions thrown by Work items
-     */
-    private List<WorkException> workExceptions = Collections.synchronizedList(new ArrayList<WorkException>());
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workAccepted(WorkEvent work) {
-        workAcceptedCallCount.incrementAndGet();
-
-        // Validate the WorkEvent
-        Assert.assertNotNull(work.getWorkItem());
-        Assert.assertEquals(WorkEvent.WORK_ACCEPTED, work.getType());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workStarted(WorkEvent work) {
-        workStartedCallCount.incrementAndGet();
-
-        // Validate the WorkEvent
-        Assert.assertNotNull(work.getWorkItem());
-        Assert.assertEquals(WorkEvent.WORK_STARTED, work.getType());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workCompleted(WorkEvent work) {
-        if (work.getException() != null) {
-            workExceptions.add(work.getException());
-        }
-
-        // Validate the WorkEvent
-        Assert.assertNotNull(work.getWorkItem());
-        Assert.assertEquals(WorkEvent.WORK_COMPLETED, work.getType());
-
-        workCompletedCallCount.incrementAndGet();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void workRejected(WorkEvent work) {
-        workRejectedCallCount.incrementAndGet();
-
-        // Validate the WorkEvent
-        Assert.assertNotNull(work.getWorkItem());
-        Assert.assertEquals(WorkEvent.WORK_REJECTED, work.getType());
-    }
-
-    /**
-     * Returns the number of calls to workAccepted()
-     * 
-     * @return The number of calls to workAccepted()
-     */
-    public int getWorkAcceptedCallCount() {
-        return workAcceptedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workStarted()
-     * 
-     * @return The number of calls to workStarted()
-     */
-    public int getWorkStartedCallCount() {
-        return workStartedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workCompleted()
-     * 
-     * @return The number of calls to workCompleted()
-     */
-    public int getWorkCompletedCallCount() {
-        return workCompletedCallCount.get();
-    }
-
-    /**
-     * Returns the number of calls to workRejected()
-     * 
-     * @return The number of calls to workRejected()
-     */
-    public int getWorkRejectedCallCount() {
-        return workRejectedCallCount.get();
-    }
-
-    /**
-     * Returns a List of all exceptions that are thrown by the Work items
-     * 
-     * @return A List of all exceptions that are thrown by the Work items
-     */
-    public List<WorkException> getWorkExceptions() {
-        return Collections.unmodifiableList(workExceptions);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
deleted file mode 100644
index 715f5f95c0..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.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.core.work;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This test case will test the ThreadPoolWorkManager
- * 
- * @version $Rev$ $Date$
- */
-public class ThreadPoolWorkManagerTestCase {
-
-    /**
-     * Wait up to 20 seconds for the Work units to complete
-     */
-    private static final long WAIT_TIMEOUT = 20000;
-
-    /**
-     * This is the shared instance of the ThreadPoolWorkManager used by the tests
-     */
-    private static ThreadPoolWorkManager workManager = null;
-
-    /**
-     * Setup the ThreadPoolWorkManager
-     */
-    @BeforeClass
-    public static void setup() {
-        workManager = new ThreadPoolWorkManager(10);
-    }
-
-    /**
-     * Make sure that the ThreadPoolWorkManager is stopped after running the tests
-     */
-    @AfterClass
-    public static void destroy() {
-        if (workManager != null) {
-            workManager.destroy();
-        }
-    }
-
-    /**
-     * Tests running a single fast job on the ThreadPoolWorkManager
-     */
-    @Test
-    public void testSingleFastJob() {
-        // Create the work and register it
-        TimeDelayWork fast = new TimeDelayWork(10);
-        TestWorkListener listener = new TestWorkListener();
-        workManager.schedule(fast, listener);
-
-        // Wait for the 1 job to complete
-        waitForWorkToComplete(listener, 1);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(1, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(1, listener.getWorkStartedCallCount());
-        Assert.assertEquals(1, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(0, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a single job that fails on the ThreadPoolWorkManager
-     */
-    @Test
-    public void testSingleFailingJob() {
-        // Create the work and register it
-        FailingWork fail = new FailingWork();
-        TestWorkListener listener = new TestWorkListener();
-        workManager.schedule(fail, listener);
-
-        // Wait for the 1 job to complete
-        waitForWorkToComplete(listener, 1);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(1, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(1, listener.getWorkStartedCallCount());
-        Assert.assertEquals(1, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(1, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a mixture of fast and slow jobs on the ThreadPoolWorkManager
-     */
-    @Test
-    public void testMultipleJobs() {
-        // Create the work and register it
-        TimeDelayWork fast1 = new TimeDelayWork(50);
-        TimeDelayWork fast2 = new TimeDelayWork(100);
-        TimeDelayWork fast3 = new TimeDelayWork(200);
-        TimeDelayWork slow1= new TimeDelayWork(2000);
-        TimeDelayWork slow2 = new TimeDelayWork(2000);
-        TestWorkListener listener = new TestWorkListener();
-        workManager.schedule(fast1, listener);
-        workManager.schedule(fast2, listener);
-        workManager.schedule(fast3, listener);
-        workManager.schedule(slow1, listener);
-        workManager.schedule(slow2, listener);
-
-        // Wait for the 5 jobs to complete
-        waitForWorkToComplete(listener, 5);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(5, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(5, listener.getWorkStartedCallCount());
-        Assert.assertEquals(5, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(0, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests running a mixture of fast and slow jobs some of which fail on the 
-     * ThreadPoolWorkManager
-     */
-    @Test
-    public void testMultipleJobsSomeFail() {
-        // Create the work and register it
-        TimeDelayWork fast1 = new TimeDelayWork(50);
-        TimeDelayWork fast2 = new TimeDelayWork(100);
-        TimeDelayWork fast3 = new TimeDelayWork(200);
-        TimeDelayWork slow1= new TimeDelayWork(2000);
-        TimeDelayWork slow2 = new TimeDelayWork(2000);
-        FailingWork fail1 = new FailingWork();
-        FailingWork fail2 = new FailingWork();
-        TestWorkListener listener = new TestWorkListener();
-        workManager.schedule(fast1, listener);
-        workManager.schedule(fast2, listener);
-        workManager.schedule(fail1, listener);
-        workManager.schedule(fast3, listener);
-        workManager.schedule(slow1, listener);
-        workManager.schedule(fail2, listener);
-        workManager.schedule(slow2, listener);
-
-        // Wait for the 7 jobs to complete
-        waitForWorkToComplete(listener, 7);
-
-        // Test that the job completed successfully.
-        Assert.assertEquals(7, listener.getWorkAcceptedCallCount());
-        Assert.assertEquals(0, listener.getWorkRejectedCallCount());
-        Assert.assertEquals(7, listener.getWorkStartedCallCount());
-        Assert.assertEquals(7, listener.getWorkCompletedCallCount());
-        Assert.assertEquals(2, listener.getWorkExceptions().size());
-    }
-
-    /**
-     * Tests creating a ThreadPoolWorkManager with invalid pool sizes of -10 to 0
-     * inclusive
-     */
-    @Test
-    public void testThreadPoolWorkManagerLessThan1Size() {
-        for (int i = 0; i >= -10; i--) {
-            try {
-                new ThreadPoolWorkManager(i);
-                Assert.fail("Should have thrown IllegalArgumentException");
-            } catch (IllegalArgumentException ex) {
-                Assert.assertTrue(ex.toString().indexOf(Integer.toString(i)) != -1);
-            }
-        }
-    }
-
-    /**
-     * Tests running a single job that has no listener
-     */
-    @Test
-    public void testSingleFastJobWithNoListener() {
-        // Create the work and register it
-        TimeDelayWork fast = new TimeDelayWork(10);
-        workManager.schedule(fast);
-
-        // Wait for the job to complete
-        long startTime = System.currentTimeMillis();
-        while (true) {
-            int completedCount = fast.getRunCompletedCount();
-            if (completedCount == 1) {
-                break;
-            }
-
-            if (System.currentTimeMillis() - startTime > WAIT_TIMEOUT) {
-                Assert.fail("Only " + completedCount + " work items completed before timeout");
-                return;
-            }
-
-            // Lets wait for the job to complete
-            try {
-                Thread.sleep(25);
-            } catch (InterruptedException ex) {
-                Assert.fail("Unexpected exception: " + ex);
-            }
-        }
-
-        // Make sure we have got one completed run
-        Assert.assertEquals(1, fast.getRunCompletedCount());
-    }
-
-    /**
-     * Waits for the specified number of jobs to complete or the timeout to fire.
-     * 
-     * @param listener The listener to use to track Work unit completion
-     * @param completedWorkItemsToWaitFor The number of Work items to complete
-     */
-    private void waitForWorkToComplete(TestWorkListener listener, int completedWorkItemsToWaitFor) {
-        long startTime = System.currentTimeMillis();
-        while (true) {
-            int completedCount = listener.getWorkCompletedCallCount();
-            if (completedCount == completedWorkItemsToWaitFor) {
-                return;
-            }
-
-            if (System.currentTimeMillis() - startTime > WAIT_TIMEOUT) {
-                Assert.fail("Only " + completedCount + " work items completed before timeout");
-                return;
-            }
-
-            // Lets wait for more jobs to complete
-            try {
-                Thread.sleep(25);
-            } catch (InterruptedException ex) {
-                Assert.fail("Unexpected exception: " + ex);
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
deleted file mode 100644
index 3b30d86f14..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.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.core.work;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import commonj.work.Work;
-
-/**
- * Simple Work item that will sleep in the run() method for the specified 
- * period of time
- * 
- * @version $Rev$ $Date$
- */
-public class TimeDelayWork implements Work {
-
-    /**
-     * Count of completed run() method calls
-     */
-    private AtomicInteger runCompletedCount = new AtomicInteger();
-
-    /**
-     * The amount of time to sleep in the Run loop
-     */
-    private final long sleepTime;
-
-    /**
-     * Constructor
-     * 
-     * @param sleepTime The amount of time to sleep (in milliseconds) in the run() method
-     */
-    public TimeDelayWork(long sleepTime) {
-        this.sleepTime = sleepTime;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isDaemon() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void release() {
-    }
-
-    /**
-     * Sleeps for a period of time defined by sleepTime
-     */
-    public void run() {
-        System.out.println("Starting " + this);
-        try {
-            Thread.sleep(sleepTime);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.out.println("Done " + this);
-        runCompletedCount.incrementAndGet();
-    }
-
-    /**
-     * Returns the number of completed calls to run()
-     * 
-     * @return The number of completed calls to run()
-     */
-    public int getRunCompletedCount() {
-        return runCompletedCount.get();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
deleted file mode 100644
index 341d889b7d..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.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.scope;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.scope.Scope;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ScopeTestCase extends TestCase {
-
-    public void testEquals() throws Exception {
-        Scope scope = new Scope("COMPOSITE");
-        assertTrue(scope.equals(Scope.COMPOSITE));
-    }
-
-    public void testEqualsNew() throws Exception {
-        Scope foo = new Scope("foo");
-        Scope foo2 = new Scope("FOO");
-        assertTrue(foo.equals(foo2));
-    }
-
-    public void testNotEquals() throws Exception {
-        Scope foo = new Scope("BAR");
-        Scope foo2 = new Scope("FOO");
-        assertFalse(foo.equals(foo2));
-    }
-
-    public void testNotEqualsDifferent() throws Exception {
-        Scope foo = new Scope("FOO");
-        assertFalse(foo.equals(new Bar("FOO")));
-    }
-
-    public class Bar {
-        String scope;
-
-        public Bar(String scope) {
-            this.scope = scope;
-        }
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/tags/java/sca/1.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
deleted file mode 100644
index 9ed0928a33..0000000000
--- a/tags/java/sca/1.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ /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. 

-

-name=implementation.last, stage=implementation, after=*

-name=reference.first, stage=reference, before=*

-name=reference.transaction, stage=reference, after=reference.interface

-name=service.transaction, stage=service, after=service.binding, before=component.service

-name=implementation.transaction, stage=implementation, before=implementation.policy
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/data-api/LICENSE b/tags/java/sca/1.3/modules/data-api/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/data-api/NOTICE b/tags/java/sca/1.3/modules/data-api/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/data-api/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/tags/java/sca/1.3/modules/data-api/pom.xml b/tags/java/sca/1.3/modules/data-api/pom.xml
deleted file mode 100644
index c1c792d627..0000000000
--- a/tags/java/sca/1.3/modules/data-api/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>1.3</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>1.3</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.data.api</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.data*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
deleted file mode 100644
index f559d5d914..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
deleted file mode 100644
index 5903fd95a4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
deleted file mode 100644
index 37042c0895..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
deleted file mode 100644
index c30bbc771a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ItemCollection extends Collection<String, Item> {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
deleted file mode 100644
index 69512058b7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
deleted file mode 100644
index 7f13db5228..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
deleted file mode 100644
index c2332ae2c9..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.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.data.collection;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-@Deprecated
-public interface Collection <K, D> extends org.apache.tuscany.sca.data.collection.Collection<K, D> {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
deleted file mode 100644
index a0d232a201..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.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.data.collection;
-
-
-/**
- * Represents a key/data pair in a data collection.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class Entry <K, D> extends org.apache.tuscany.sca.data.collection.Entry<K, D> {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
deleted file mode 100644
index 77d8173521..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.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.data.collection;
-
-
-
-/**
- * Represents a data item.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class Item extends org.apache.tuscany.sca.data.collection.Item {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
deleted file mode 100644
index 757152725d..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.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.data.collection;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-@Deprecated
-public interface ItemCollection extends Collection<String, Item> {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
deleted file mode 100644
index 047ab8829e..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.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.data.collection;
-
-
-/**
- * Provides access to a collection of data items.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public interface LocalItemCollection extends Collection<String, Item> {
-}
diff --git a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java b/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
deleted file mode 100644
index ed71471d9e..0000000000
--- a/tags/java/sca/1.3/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.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.data.collection;
-
-/**
- * Indicates that an item could not be found in a collection.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class NotFoundException extends org.apache.tuscany.sca.data.collection.NotFoundException {
-    private static final long serialVersionUID = 2812975065056330240L;
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/LICENSE b/tags/java/sca/1.3/modules/databinding-axiom/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/databinding-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/tags/java/sca/1.3/modules/databinding-axiom/NOTICE b/tags/java/sca/1.3/modules/databinding-axiom/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/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/tags/java/sca/1.3/modules/databinding-axiom/pom.xml b/tags/java/sca/1.3/modules/databinding-axiom/pom.xml
deleted file mode 100644
index dfd5e05642..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-axiom</artifactId>
-    <name>Apache Tuscany SCA Data Binding for Axiom</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.5</version>			
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-           <version>1.1</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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.databinding.axiom</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.axiom*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
deleted file mode 100644
index e59038bfa1..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.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.axiom;

-

-import org.apache.axiom.om.OMElement;

-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;

-

-/**

- * DataBinding for AXIOM

- *

- * @version $Rev$ $Date$

- */

-public class AxiomDataBinding extends BaseDataBinding {

-    

-    public static final String NAME = OMElement.class.getName();

-    public static final String[] ALIASES = new String[] {"axiom"};

-

-    public AxiomDataBinding() {

-        super(NAME, ALIASES, OMElement.class);

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.databinding.impl.BaseDataBinding#getWrapperHandler()

-     */

-    @Override

-    public WrapperHandler getWrapperHandler() {

-        return new OMElementWrapperHandler();

-    }

-

-    @Override

-    public Object copy(Object source, DataType dataType, Operation operation) {

-        if ( OMElement.class.isAssignableFrom(source.getClass()) ) {

-            try {

-                OMElement sourceElement = (OMElement)source;

-                return sourceElement.cloneOMElement();

-            } catch ( Exception e ) {

-                throw new IllegalArgumentException(e);

-            }

-        }

-        return super.copy(source, dataType, operation);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
deleted file mode 100644
index cd820ab4b4..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/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.axiom;
-
-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;
-
-        // 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/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
deleted file mode 100644
index 429a6dbe5d..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.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.databinding.axiom;

-

-import javax.xml.namespace.QName;

-

-import org.apache.axiom.om.OMAbstractFactory;

-import org.apache.axiom.om.OMAttribute;

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMFactory;

-import org.apache.axiom.om.OMNamespace;

-import org.apache.tuscany.sca.databinding.TransformationContext;

-import org.apache.tuscany.sca.databinding.javabeans.Java2XMLMapperException;

-import org.apache.tuscany.sca.databinding.javabeans.JavaBean2XMLTransformer;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class Exception2OMElement extends JavaBean2XMLTransformer<OMElement> {

-

-    public static final String GETCAUSE = "getCause";

-    public static final String GETLOCALIZEDMESSAGE = "getLocalizedMessage";

-    public static final String GETSTACKTRACE = "getStackTrace";

-    public static final String GETCLASS = "getClass";

-

-    private OMFactory factory;

-

-    public Exception2OMElement() {

-        super();

-        factory = OMAbstractFactory.getOMFactory();

-    }

-

-    @Override

-    public OMElement transform(Object source, TransformationContext context) {

-        OMElement element = super.transform(source, context);

-        AxiomHelper.adjustElementName(context, element);

-        return element;

-    }

-

-    @Override

-    protected boolean isMappedGetter(String methodName) {

-        if (GETCAUSE.equals(methodName)

-            || GETLOCALIZEDMESSAGE.equals(methodName)

-            || GETSTACKTRACE.equals(methodName)

-            || GETCLASS.equals(methodName)) {

-            return false;

-        } else {

-            return true;

-        }

-    }

-

-    @Override

-    public void appendChild(OMElement parentElement, OMElement childElement) throws Java2XMLMapperException {

-        parentElement.addChild(childElement);

-    }

-

-    @Override

-    public OMElement createElement(QName qName) throws Java2XMLMapperException {

-        return factory.createOMElement(qName);

-    }

-

-    @Override

-    public void appendText(OMElement parentElement, String textData) throws Java2XMLMapperException {

-        if (textData == null) {

-            OMNamespace xsi = factory.createOMNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");

-            OMAttribute nil = factory.createOMAttribute("nil", xsi, "true");

-            parentElement.addAttribute(nil);

-        } else {

-            factory.createOMText(parentElement, textData);

-        }

-    }

-

-    @Override

-    public Class getTargetType() {

-        return OMElement.class;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
deleted file mode 100644
index e23d89327c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.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.axiom;

-

-import java.io.ByteArrayOutputStream;

-import java.io.Externalizable;

-import java.io.ObjectOutputStream;

-

-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.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.impl.BaseTransformer;

-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class Externalizable2OMElement extends BaseTransformer<Externalizable, OMElement> implements

-    PullTransformer<Externalizable, OMElement> {

-

-    @Override

-    protected Class<Externalizable> getSourceType() {

-        return  Externalizable.class;

-    }

-

-    @Override

-    protected Class<OMElement> getTargetType() {

-        return OMElement.class;

-    }

-

-    public OMElement transform(Externalizable source, TransformationContext context) {

-        OMElement element = null;

-

-        try {

-            ByteArrayOutputStream bos = new ByteArrayOutputStream();

-            ObjectOutputStream out = new ObjectOutputStream(bos);

-            out.writeObject(source);

-            out.close();

-            OMFactory factory = OMAbstractFactory.getOMFactory();

-            OMNamespace ns = AxiomHelper.createOMNamespace(factory, new QName("http://callable"));

-            element = factory.createOMElement("reference",ns);

-            element.setText(Base64Binary.encode(bos.toByteArray()));

-            return element;

-        } catch (Exception e) {

-            throw new TransformationException(e);

-        }

-    }

-	

-    @Override

-    public int getWeight() {

-        return 10;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
deleted file mode 100644
index 3dc73c89cb..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.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.databinding.axiom;

-

-import java.util.Iterator;

-

-import javax.xml.namespace.QName;

-

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMNode;

-import org.apache.axiom.om.OMText;

-import org.apache.tuscany.sca.databinding.javabeans.XML2JavaBeanTransformer;

-import org.apache.tuscany.sca.databinding.javabeans.XML2JavaMapperException;

-

-/**

- * Transformer to convert data from an OMElement to a Java Exception

- *

- * @version $Rev$ $Date$

- */

-public class OMElement2Exception extends XML2JavaBeanTransformer<OMElement> {

-

-    @Override

-    public OMElement getRootElement(OMElement element) throws XML2JavaMapperException {

-        return element;

-    }

-

-    @Override

-    public Iterator<OMElement> getChildElements(OMElement parent) throws XML2JavaMapperException {

-        return parent.getChildElements();

-    }

-

-    @Override

-    public String getElementName(OMElement element) throws XML2JavaMapperException {

-        return element.getLocalName();

-    }

-

-    @Override

-    public String getText(OMElement element) throws XML2JavaMapperException {

-        return element.getText();

-    }

-

-    @Override

-    public boolean isTextElement(OMElement element) throws XML2JavaMapperException {

-        return false;

-    }

-

-    @Override

-    public boolean isTextOnly(OMElement element) throws XML2JavaMapperException {

-        OMNode firstChild = element.getFirstOMChild();

-        return firstChild instanceof OMText && firstChild.getNextOMSibling() == null;

-    }

-

-    @Override

-    public OMElement getFirstChildWithName(OMElement element, QName name) throws XML2JavaMapperException {

-        return element.getFirstChildWithName(name);

-    }

-

-    @Override

-    public Class getSourceType() {

-        return OMElement.class;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
deleted file mode 100644
index ef7359fbcd..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.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.axiom;

-

-import java.io.ByteArrayInputStream;

-import java.io.Externalizable;

-import java.io.ObjectInputStream;

-

-import org.apache.axiom.om.OMElement;

-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.XSDDataTypeConverter.Base64Binary;

-

-/**

- * Transformer to convert data from an OMElement to XML String

- *

- * @version $Rev$ $Date$

- */

-public class OMElement2Externalizable extends BaseTransformer<OMElement, Externalizable> implements PullTransformer<OMElement, Externalizable> {

-    // private XmlOptions options;

-    

-    public Externalizable transform(OMElement source, TransformationContext context) {

-        try {

-            String value = source.getText();

-            ByteArrayInputStream bis = new ByteArrayInputStream(Base64Binary.decode(value));

-            ObjectInputStream ois = new ObjectInputStream(bis);

-            Object obj = ois.readObject();

-            ois.close();

-            Externalizable aReference = (Externalizable) obj;

-            return aReference;

-        } catch (Exception e) {

-            throw new TransformationException(e);

-        }

-    }

-

-    @Override

-    protected Class<OMElement> getSourceType() {

-        return OMElement.class;

-    }

-

-    @Override

-    protected Class<Externalizable> getTargetType() {

-        return Externalizable.class;

-    }

-

-    @Override

-    public int getWeight() {

-        return 10;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
deleted file mode 100644
index ea40e61746..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.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.databinding.axiom;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.impl.SimpleType2JavaTransformer;
-
-/**
- * Transformer to convert data from a simple java Object to OMElement.
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2Object extends SimpleType2JavaTransformer<OMElement> {
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.SimpleType2JavaTransformer#close(java.lang.Object)
-     */
-    @Override
-    protected void close(OMElement source) {
-        if (source != null) {
-            AxiomHelper.completeAndClose(source);
-        }
-    }
-
-    @Override
-    protected String getText(OMElement source) {
-        return source.getText();
-    }
-
-    @Override
-    public Class getSourceType() {
-        return OMElement.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
deleted file mode 100644
index b2c004324c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.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.axiom;
-
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-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;
-
-/**
- * Transformer to convert data from an OMElement to XML String
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2String extends BaseTransformer<OMElement, String> implements PullTransformer<OMElement, String> {
-    // private XmlOptions options;
-    
-    public String transform(OMElement source, TransformationContext context) {
-        try {
-            StringWriter writer = new StringWriter();
-            source.serialize(writer);
-            return writer.toString();
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
deleted file mode 100644
index 01e7003b20..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.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.axiom;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class OMElement2XMLStreamReader extends BaseTransformer<OMElement, XMLStreamReader> implements
-    PullTransformer<OMElement, XMLStreamReader> {
-    // private XmlOptions options;
-
-    public static final QName QNAME_NIL = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil");
-
-    public XMLStreamReader transform(OMElement source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        } else {
-            if ("true".equals(source.getAttributeValue(QNAME_NIL))) {
-                return null;
-            } else {
-                return source.getXMLStreamReader();
-            }
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
deleted file mode 100644
index 9084f09dc0..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.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.databinding.axiom;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-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;
-
-/**
- * OMElement wrapper handler implementation
- *
- * @version $Rev$ $Date$
- */
-public class OMElementWrapperHandler implements WrapperHandler<OMElement> {
-
-    private OMFactory factory;
-
-    public OMElementWrapperHandler() {
-        super();
-        this.factory = OMAbstractFactory.getOMFactory();
-    }
-
-    public OMElement create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        // Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-        OMElement wrapper = AxiomHelper.createOMElement(factory, element.getQName());
-        return wrapper;
-    }
-
-    public void setChildren(OMElement 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]);
-        }
-
-    }
-
-    public void setChild(OMElement wrapper, int i, ElementInfo childElement, Object value) {
-        if (childElement.isMany()) {
-            Object[] elements = (Object[])value;
-            if (value != null) {
-                for (Object e : elements) {
-                    addChild(wrapper, childElement, (OMElement)e);
-                }
-            }
-        } else {
-            OMElement element = (OMElement)value;
-            addChild(wrapper, childElement, element);
-        }
-    }
-
-    private void addChild(OMElement wrapper, ElementInfo childElement, OMElement element) {
-        if (element == null) {
-            OMElement e = wrapper.getOMFactory().createOMElement(childElement.getQName(), wrapper);
-            attachXSINil(e);
-            return;
-        }
-        QName elementName = childElement.getQName();
-        // Make it a bit tolerating of element QName 
-        if (!elementName.equals(element.getQName())) {
-            OMNamespace namespace = factory.createOMNamespace(elementName.getNamespaceURI(), elementName.getPrefix());
-            element.setNamespace(namespace);
-            element.setLocalName(childElement.getQName().getLocalPart());
-        }
-        wrapper.addChild(element);
-    }
-
-    public List getChildren(OMElement wrapper, Operation operation, boolean input) {
-        List<ElementInfo> childElements = input? operation.getWrapper().getInputChildElements():
-            operation.getWrapper().getOutputChildElements();
-
-        List<Object> elements = new ArrayList<Object>();
-        int i = 0;
-        for (ElementInfo e : childElements) {
-            elements.add(getChild(wrapper, e, i));
-            i++;
-        }
-        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();
-        DataType<XMLType> wrapperType =
-            new DataTypeImpl<XMLType>(AxiomDataBinding.NAME, OMElement.class, new XMLType(element));
-        return wrapperType;
-    }
-
-    public boolean isInstance(Object wrapperObj, Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        //        List<ElementInfo> childElements =
-        //            input ? wrapperInfo.getInputChildElements() : wrapperInfo.getOutputChildElements();
-        OMElement wrapper = (OMElement)wrapperObj;
-        if (!element.getQName().equals(wrapper.getQName())) {
-            return false;
-        }
-        return true;
-        /*
-        Set<QName> names = new HashSet<QName>();
-        for (ElementInfo e : childElements) {
-            names.add(e.getQName());
-        }
-        for (Iterator i = wrapper.getChildElements(); i.hasNext();) {
-            OMElement child = (OMElement)i.next();
-            if (!names.contains(child.getQName())) {
-                return false;
-            }
-        }
-        return true;
-        */
-    }
-
-    private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
-
-    private List<List<OMElement>> getElements(OMElement wrapper) {
-        List<List<OMElement>> elements = new ArrayList<List<OMElement>>();
-        List<OMElement> current = new ArrayList<OMElement>();
-        elements.add(current);
-        boolean first = true;
-        QName last = null;
-
-        for (Iterator i = wrapper.getChildElements(); i.hasNext();) {
-            OMElement element = (OMElement)i.next();
-            if (first || element.getQName().equals(last)) {
-                current.add(element);
-                last = element.getQName();
-            } else {
-                current = new ArrayList<OMElement>();
-                elements.add(current);
-                current.add(element);
-                last = element.getQName();
-            }
-            first = false;
-        }
-        return elements;
-    }
-
-    public Object getChild(OMElement wrapper, ElementInfo childElement, int index) {
-        Iterator children = wrapper.getChildrenWithName(childElement.getQName());
-        if (!children.hasNext()) {
-            // No name match, try by index
-            List<List<OMElement>> list = getElements(wrapper);
-            List<OMElement> elements = list.get(index);
-            if (!childElement.isMany()) {
-                return elements.isEmpty() ? null : attachXSIType(childElement, elements.get(0));
-            } else {
-                Object[] array = elements.toArray();
-                for (Object item : array) {
-                    attachXSIType(childElement, (OMElement)item);
-                }
-                return array;
-            }
-        }
-        if (!childElement.isMany()) {
-            if (children.hasNext()) {
-                OMElement child = (OMElement)children.next();
-                attachXSIType(childElement, child);
-                return child;
-            } else {
-                return null;
-            }
-        } else {
-            List<OMElement> elements = new ArrayList<OMElement>();
-            for (; children.hasNext();) {
-                OMElement child = (OMElement)children.next();
-                attachXSIType(childElement, child);
-                elements.add(child);
-            }
-            return elements.toArray();
-        }
-    }
-
-    /**
-     * Create xis:type if required 
-     * @param childElement
-     * @param element
-     * @return
-     */
-    private OMElement attachXSIType(ElementInfo childElement, OMElement element) {
-        TypeInfo type = childElement.getType();
-        if (type != null && type.getQName() != null) {
-            OMAttribute attr = element.getAttribute(XSI_TYPE_QNAME);
-            if (attr == null) {
-                String typeNS = type.getQName().getNamespaceURI();
-                if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(typeNS)) {
-                    return element;
-                }
-                OMNamespace ns = element.getOMFactory().createOMNamespace(typeNS, "_typens_");
-                element.declareNamespace(ns);
-                OMNamespace xsiNS =
-                    element.getOMFactory().createOMNamespace(XSI_TYPE_QNAME.getNamespaceURI(),
-                                                             XSI_TYPE_QNAME.getPrefix());
-                element.declareNamespace(xsiNS);
-                attr =
-                    element.getOMFactory().createOMAttribute("type",
-                                                             xsiNS,
-                                                             "_typens_:" + type.getQName().getLocalPart());
-                element.addAttribute(attr);
-            }
-        }
-        return element;
-    }
-
-    private void attachXSINil(OMElement element) {
-        OMNamespace xsiNS =
-            element.getOMFactory().createOMNamespace(XSI_TYPE_QNAME.getNamespaceURI(), XSI_TYPE_QNAME.getPrefix());
-        element.declareNamespace(xsiNS);
-        OMAttribute attr = element.getOMFactory().createOMAttribute("nil", xsiNS, "true");
-        element.addAttribute(attr);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
deleted file mode 100644
index 88d6b462c1..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.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.axiom;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.Java2SimpleTypeTransformer;
-
-/**
- * Transformer to convert data from an simple OMElement to Java Object
- *
- * @version $Rev$ $Date$
- */
-public class Object2OMElement extends Java2SimpleTypeTransformer<OMElement> {
-
-    private OMFactory factory;
-
-    public Object2OMElement() {
-        super();
-        factory = OMAbstractFactory.getOMFactory();
-    }
-
-    @Override
-    protected OMElement createElement(QName element, String text, TransformationContext context) {
-        OMElement omElement = AxiomHelper.createOMElement(factory, element);
-        if (text == null) {
-            OMNamespace xsi = factory.createOMNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
-            OMAttribute nil = factory.createOMAttribute("nil", xsi, "true");
-            omElement.addAttribute(nil);
-        } else {
-            factory.createOMText(omElement, text);
-        }
-        return omElement;
-    }
-
-    @Override
-    public Class getTargetType() {
-        return OMElement.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
deleted file mode 100644
index 9eccd52d74..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.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.axiom;
-
-import java.io.ByteArrayInputStream;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-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 String2OMElement extends BaseTransformer<String, OMElement> implements
-    PullTransformer<String, OMElement> {
-
-    @SuppressWarnings("unchecked")
-    public OMElement transform(String source, TransformationContext context) {
-        try {
-            StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(source.getBytes()));
-            OMElement element = builder.getDocumentElement();
-            AxiomHelper.adjustElementName(context, element);
-            return element;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
deleted file mode 100644
index 761185c297..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.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.axiom;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-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 XMLStreamReader2OMElement extends BaseTransformer<XMLStreamReader, OMElement> implements
-    PullTransformer<XMLStreamReader, OMElement> {
-
-    public XMLStreamReader2OMElement() {
-        super();
-    }
-
-    public OMElement transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            StAXOMBuilder builder = new StAXOMBuilder(source);
-            OMElement element = builder.getDocumentElement();
-            AxiomHelper.adjustElementName(context, element);
-            return element;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 2e94116177..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/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.axiom.AxiomDataBinding;type=org.apache.axiom.om.OMElement,name=axiom
-
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index a1f18f9638..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.

-

-# Implementation classes for the transformers

-# org.apache.tuscany.sca.databinding.axiom.CallableReference2OMElement;source=org.osoa.sca.CallableReference,target=org.apache.axiom.om.OMElement,weight=10

-# org.apache.tuscany.sca.databinding.axiom.OMElement2CallableReference;source=org.apache.axiom.om.OMElement,target=org.osoa.sca.CallableReference,weight=10

-org.apache.tuscany.sca.databinding.axiom.Externalizable2OMElement;source=java.io.Externalizable,target=org.apache.axiom.om.OMElement,weight=10

-org.apache.tuscany.sca.databinding.axiom.OMElement2Externalizable;source=org.apache.axiom.om.OMElement,target=java.io.Externalizable,weight=10

-org.apache.tuscany.sca.databinding.axiom.Exception2OMElement;source=java:exception,target=org.apache.axiom.om.OMElement,weight=10

-org.apache.tuscany.sca.databinding.axiom.OMElement2Exception;source=org.apache.axiom.om.OMElement,target=java:exception,weight=10

-# org.apache.tuscany.sca.databinding.axiom.Object2OMElement;source=java:simpleType,target=org.apache.axiom.om.OMElement,weight=80000

-# org.apache.tuscany.sca.databinding.axiom.OMElement2Object;source=org.apache.axiom.om.OMElement,target=java:simpleType,weight=80000

-org.apache.tuscany.sca.databinding.axiom.OMElement2String;source=org.apache.axiom.om.OMElement,target=java.lang.String,weight=80

-org.apache.tuscany.sca.databinding.axiom.OMElement2XMLStreamReader;source=org.apache.axiom.om.OMElement,target=javax.xml.stream.XMLStreamReader,weight=60

-org.apache.tuscany.sca.databinding.axiom.String2OMElement;source=java.lang.String,target=org.apache.axiom.om.OMElement,weight=80

-org.apache.tuscany.sca.databinding.axiom.XMLStreamReader2OMElement;source=javax.xml.stream.XMLStreamReader,target=org.apache.axiom.om.OMElement,weight=60

diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/tags/java/sca/1.3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
deleted file mode 100644
index 7453cb787a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.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.databinding.axiom;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class OMElementTestCase 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 final void testStringTransform() {
-        String2OMElement t1 = new String2OMElement();
-        OMElement element = t1.transform(IPO_XML, null);
-        OMElement2String t2 = new OMElement2String();
-        String xml = t2.transform(element, null);
-        Assert.assertNotNull(xml);
-        Assert.assertNotNull(xml.indexOf("<ipo:comment>") != -1);
-    }
-
-    public final void testStringTransform2() {
-        String str =
-            "<p0:firstName xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" " + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
-                + "xmlns:p0=\"http://helloworld\">Robert</p0:firstName>";
-        String2OMElement t1 = new String2OMElement();
-        OMElement element = t1.transform(str, null);
-        OMElement2String t2 = new OMElement2String();
-        String xml = t2.transform(element, null);
-        Assert.assertNotNull(xml);
-        Assert.assertNotNull(xml.indexOf("<ipo:comment>") != -1);
-    }
-
-    public final void testStAXTransform() {
-        String2OMElement t1 = new String2OMElement();
-        OMElement element = t1.transform(IPO_XML, null);
-
-        OMElement2XMLStreamReader t2 = new OMElement2XMLStreamReader();
-        XMLStreamReader reader = t2.transform(element, null);
-
-        XMLStreamReader2OMElement t3 = new XMLStreamReader2OMElement();
-        OMElement element2 = t3.transform(reader, null);
-
-        Assert.assertEquals(element2.getQName(), element.getQName());
-        Assert.assertEquals(new QName("http://www.example.com/IPO", "purchaseOrder"), element2.getQName());
-    }
-
-    public final void testCopy() {
-        String2OMElement t1 = new String2OMElement();
-        OMElement element = t1.transform(IPO_XML, null);
-        OMElement copy = (OMElement)new AxiomDataBinding().copy(element, null, null);
-        assertNotSame(element, copy);
-        assertEquals(new QName("http://www.example.com/IPO", "purchaseOrder"), copy.getQName());
-    }
-
-    private static final QName XSI_NIL = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil", "xsi");
-
-    public final void testNil() {
-        Object2OMElement t1 = new Object2OMElement();
-        TransformationContext context = new TransformationContextImpl();
-        DataType<XMLType> dataType =
-            new DataTypeImpl<XMLType>(int.class, new XMLType(new QName("http://ns1", "nilElement"),
-                                                             SimpleTypeMapperImpl.XSD_INT));
-        context.setTargetDataType(dataType);
-        OMElement element = t1.transform(null, context);
-        OMAttribute attribute = element.getAttribute(XSI_NIL);
-        Assert.assertNotNull(attribute);
-        Assert.assertEquals("true", attribute.getAttributeValue());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xml b/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xml
deleted file mode 100644
index df901d183d..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xml
+++ /dev/null
@@ -1,51 +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.    
--->
-<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>
-
diff --git a/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xsd
deleted file mode 100755
index af1e73172d..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ /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.
--->
-
-<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/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/order.wsdl b/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/order.wsdl
deleted file mode 100644
index a5ead60382..0000000000
--- a/tags/java/sca/1.3/modules/databinding-axiom/src/test/resources/order.wsdl
+++ /dev/null
@@ -1,76 +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/order.wsdl" xmlns:tns="http://example.com/order.wsdl"

-    xmlns:xsd1="http://example.com/order.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/order.xsd" xmlns="http://www.w3.org/2001/XMLSchema"

-            xmlns:ipo="http://www.example.com/IPO">

-            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>

-            <element name="checkOrderStatus">

-                <complexType>

-                    <sequence>

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

-                        <element name="order" type="ipo:PurchaseOrderType" />

-                        <element name="flag" type="int" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="checkOrderStatusResponse">

-                <complexType>

-                    <sequence>

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

-                    </sequence>

-                </complexType>

-            </element>

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

-        </schema>

-    </types>

-

-    <message name="CheckOrderStatusInput1">

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

-    </message>

-

-    <message name="CheckOrderStatusOutput1">

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

-    </message>

-

-    <message name="CheckOrderStatusInput2">

-        <part name="p1" element="xsd1:checkOrderStatus" />

-        <part name="p2" element="xsd1:note" />

-    </message>

-

-    <message name="CheckOrderStatusOutput2">

-        <part name="p1" element="xsd1:checkOrderStatusResponse" />

-    </message>

-

-    <portType name="OrderPortType">

-        <operation name="checkOrderStatus">

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

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

-        </operation>

-        <operation name="checkOrderStatus2">

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

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

-        </operation>

-    </portType>

-

-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/LICENSE b/tags/java/sca/1.3/modules/databinding-fastinfoset/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-fastinfoset/NOTICE b/tags/java/sca/1.3/modules/databinding-fastinfoset/NOTICE
deleted file mode 100644
index d83ebbe236..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/pom.xml b/tags/java/sca/1.3/modules/databinding-fastinfoset/pom.xml
deleted file mode 100644
index 1a6cacd451..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/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.3</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>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</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.1</version>
-        </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>
-
-    <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.databinding.fastinfoset</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.fastinfoset*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
deleted file mode 100644
index 3fa1fd5615..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.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.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);
-        } 
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
deleted file mode 100644
index 9ddadb3b5d..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.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.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);
-        } 
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
deleted file mode 100644
index e2a4a7a32e..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.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.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);
-        } 
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return "xml:fastinfoset:java.io.InputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
deleted file mode 100644
index 9d95ae6448..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.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.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);
-        } 
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
deleted file mode 100644
index 9047b7158c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.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.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);
-        }
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
deleted file mode 100644
index 270911af46..0000000000
--- a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.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.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);
-        } 
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return "xml:fastinfoset:java.io.OutputStream";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index ea47ee7191..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
deleted file mode 100644
index 1610b4f54d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
deleted file mode 100644
index bb8adf39be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
deleted file mode 100644
index 5a493e1746..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-jaxb-axiom/LICENSE b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-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/tags/java/sca/1.3/modules/databinding-jaxb-axiom/NOTICE b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/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/tags/java/sca/1.3/modules/databinding-jaxb-axiom/pom.xml b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/pom.xml
deleted file mode 100644
index addd7fbe00..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/pom.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-    <name>Apache Tuscany SCA Data Binding for JAXB-AXIOM</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.5</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>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</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>
-
-    <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.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>
-            <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/jaxb-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.5</version>
-                <executions>
-                    <execution>
-                        <id>generate-jaxb</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <generatePackage>com.example.ipo.jaxb</generatePackage>
-                    <generateDirectory>${project.build.directory}/jaxb-source</generateDirectory>
-                    <schemaDirectory>${basedir}/src/test/resources</schemaDirectory>
-                    <schemaIncludes>
-                        <include>ipo.xsd</include>
-                    </schemaIncludes>
-                </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.databinding.jaxb.axiom</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.jaxb.axiom*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
deleted file mode 100644
index 93277e77bf..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.jaxb.axiom;
-
-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;
-        // 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/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
deleted file mode 100644
index c4726ad8fa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.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.jaxb.axiom;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-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.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-
-/**
- * JAXB Object --> AXIOM OMElement transformer
- * 
- * @version $Rev$ $Date$
- */
-public class JAXB2OMElement extends BaseTransformer<Object, OMElement> implements PullTransformer<Object, OMElement> {
-    private OMFactory factory = OMAbstractFactory.getOMFactory();
-
-    @Override
-    public String getSourceDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-
-    @SuppressWarnings("unchecked")
-    public OMElement transform(Object source, TransformationContext context) throws TransformationException {
-        JAXBContext jaxbContext;
-        try {
-            jaxbContext = JAXBContextHelper.createJAXBContext(context, true);
-        } catch (JAXBException e) {
-            throw new TransformationException(e);
-        }
-        Object element = JAXBContextHelper.createJAXBElement(jaxbContext, context.getTargetDataType(), source);
-        QName name = jaxbContext.createJAXBIntrospector().getElementName(element);
-        JAXBDataSource dataSource = new JAXBDataSource(element, jaxbContext);
-        OMElement omElement = AxiomHelper.createOMElement(factory, name, dataSource);
-        return omElement;
-    }
-
-    @Override
-    public Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    public Class<OMElement> getTargetType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 3000;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
deleted file mode 100644
index dd9fbfbfd0..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.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.databinding.jaxb.axiom;
-
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-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.util.StAXUtils;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXBDataSource implements OMDataSource {
-    private JAXBContext context;
-    private Object element;
-    private Marshaller marshaller;
-
-    public JAXBDataSource(Object element, JAXBContext context) {
-        this.element = element;
-        this.context = context;
-    }
-
-    private Marshaller getMarshaller() throws JAXBException {
-        if (marshaller == null) {
-            // For thread safety, not sure we can cache the marshaller
-            // marshaller = JAXBContextHelper.getMarshaller(context); 
-            marshaller = context.createMarshaller();
-        }
-        return marshaller;
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-        // FIXME: [rfeng] This is a quick and dirty implementation
-        // We could use the fastinfoset to optimize the roundtrip
-        StringWriter writer = new StringWriter();
-        serialize(writer, new OMOutputFormat());
-        StringReader reader = new StringReader(writer.toString());
-        return StAXUtils.createXMLStreamReader(reader);
-    }
-
-    public void serialize(final XMLStreamWriter xmlWriter) throws XMLStreamException {
-        try {
-            // marshaller.setProperty(Marshaller.JAXB_ENCODING, format.getCharSetEncoding());
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    Marshaller marshaller = getMarshaller();
-                    // Set the FRAGEMENT property to avoid duplicate XML declaration
-                    marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
-                    marshaller.marshal(element, xmlWriter);
-                    marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.FALSE);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new XMLStreamException(e.getException());
-        }
-    }
-
-    public void serialize(final OutputStream output, OMOutputFormat format) throws XMLStreamException {
-        try {
-            // marshaller.setProperty(Marshaller.JAXB_ENCODING, format.getCharSetEncoding());
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    Marshaller marshaller = getMarshaller();
-                    marshaller.marshal(element, output);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new XMLStreamException(e.getException());
-        }
-    }
-
-    public void serialize(final Writer writer, OMOutputFormat format) throws XMLStreamException {
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    Marshaller marshaller = getMarshaller();
-                    marshaller.marshal(element, writer);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new XMLStreamException(e.getException());
-        }
-    }
-    
-    public Object getObject() {
-        return element;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
deleted file mode 100644
index 00e99aaacd..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.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.databinding.jaxb.axiom;
-
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-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.jaxb.JAXBContextHelper;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OMElement2JAXB extends BaseTransformer<OMElement, Object> implements PullTransformer<OMElement, Object> {
-
-    @Override
-    public String getSourceDataBinding() {
-        return org.apache.axiom.om.OMElement.class.getName();
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object transform(final OMElement source, final TransformationContext context) throws TransformationException {
-        try {
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws JAXBException, XMLStreamException {
-                    // Marshalling directly to the output stream is faster than marshalling through the
-                    // XMLStreamWriter. 
-                    // Take advantage of this optimization if there is an output stream.
-                    JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, false);
-                    Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-                    XMLStreamReader reader = source.getXMLStreamReaderWithoutCaching();
-                    Object result =
-                        unmarshaller.unmarshal(reader, JAXBContextHelper.getJavaType(context.getTargetDataType()));
-                    reader.close();
-                    return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new TransformationException(e.getException());
-        }
-    }
-
-    @Override
-    public Class<OMElement> getSourceType() {
-        return OMElement.class;
-    }
-
-    @Override
-    public Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 3000;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
deleted file mode 100644
index b7a395a623..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.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.jaxb.axiom.ext;
-
-
-/**
- * JAXBCustomBuilder creates an OMSourcedElement backed by a JAXBDataSource
- * for the specified namespace and localPart.
- */
-public class JAXBCustomBuilder 
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// implements CustomBuilder 
-{
-
-    private JAXBDSContext jdsContext;
-
-    /**
-     * Create a JAXBCustomBuilder
-     * @param context JAXBDSContext
-     */
-    public JAXBCustomBuilder(JAXBDSContext context) {
-        super();
-        this.jdsContext = context;
-    }
-
- // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-    /*
-    public OMElement create(String namespace,
-                            String localPart,
-                            OMContainer parent,
-                            XMLStreamReader reader,
-                            OMFactory factory) throws OMException {
-
-        // There are some situations where we want to use normal
-        // unmarshalling, so return null
-        if (!shouldUnmarshal(namespace, localPart)) {
-            // JAXBCustomBuilderMonitor.updateTotalFailedCreates();
-            return null;
-        }
-        try {
-            // Create an OMSourcedElement backed by an unmarshalled JAXB object
-            OMNamespace ns = factory.createOMNamespace(namespace, reader.getPrefix());
-
-            Object jaxb = jdsContext.unmarshal(reader);
-
-            OMDataSource ds = new JAXBDataSourceExt(jaxb, jdsContext);
-            OMElement omse = factory.createOMElement(ds, localPart, ns);
-
-            parent.addChild(omse);
-            // JAXBCustomBuilderMonitor.updateTotalCreates();
-            return omse;
-        } catch (JAXBException e) {
-            // JAXBCustomBuilderMonitor.updateTotalFailedCreates();
-            throw new OMException(e);
-        }
-    }
-    */
-
-    /**
-     * The namespace identifier for the SOAP 1.1 envelope.
-     */
-    public static final String URI_NS_SOAP_1_1_ENVELOPE = "http://schemas.xmlsoap.org/soap/envelope/";
-    /**
-     * The namespace identifier for the SOAP 1.2 envelope.
-     */
-    public static final String URI_NS_SOAP_1_2_ENVELOPE = "http://www.w3.org/2003/05/soap-envelope";
-
-    /**
-     * @param namespace
-     * @param localPart
-     * @return true if this ns and local part is acceptable for unmarshalling
-     */
-    private boolean shouldUnmarshal(String namespace, String localPart) {
-
-        // Don't unmarshall SOAPFaults or anything else in the SOAP 
-        // namespace.
-        // Don't unmarshall elements that are unqualified
-        if (localPart == null || namespace == null
-            || namespace.length() == 0
-            || URI_NS_SOAP_1_1_ENVELOPE.equals(namespace)
-            || URI_NS_SOAP_1_2_ENVELOPE.equals(namespace)) {
-            return false;
-        }
-
-        // Don't unmarshal if this looks like encrypted data
-        if (localPart.equals("EncryptedData")) {
-            return false;
-        }
-
-        return true;
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
deleted file mode 100644
index 6fd65d4752..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.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.databinding.jaxb.axiom.ext;
-
-import java.io.OutputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-
-/*
- * To marshal or unmarshal a JAXB object, the JAXBContext is necessary.
- * In addition, access to the MessageContext and other context objects may be necessary
- * to get classloader information, store attachments etc.
- * 
- * The JAXBDSContext bundles all of this information together.
- */
-public class JAXBDSContext {
-
-    private static final Logger log = Logger.getLogger(JAXBDSContext.class.getName());
-    private static final boolean DEBUG_ENABLED = log.isLoggable(Level.FINER);
-
-    private JAXBContext jaxbContext = null; // JAXBContext
-
-    /**
-     * "Dispatch" Constructor Use this full constructor when the JAXBContent is provided by the
-     * customer.
-     *
-     * @param jaxbContext
-     */
-    public JAXBDSContext(JAXBContext jaxbContext) {
-        this.jaxbContext = jaxbContext;
-    }
-
-    public JAXBContext getJAXBContext() {
-        return jaxbContext;
-    }
-
-    /**
-     * Unmarshal the xml into a JAXB object
-     * @param reader
-     * @return
-     * @throws JAXBException
-     */
-    public Object unmarshal(XMLStreamReader reader) throws JAXBException {
-
-        Unmarshaller u = JAXBContextHelper.getUnmarshaller(getJAXBContext());
-
-        Object jaxb = null;
-
-        // Unmarshal into the business object.
-        jaxb = unmarshalElement(u, reader); // preferred and always used for
-        // style=document
-
-        // Successfully unmarshalled the object
-        // JAXBUtils.releaseJAXBUnmarshaller(getJAXBContext(cl), u);
-
-        // Don't close the reader.  The reader is owned by the caller, and it
-        // may contain other xml instance data (other than this JAXB object)
-        // reader.close();
-        return jaxb;
-    }
-
-    /**
-     * Marshal the jaxb object
-     * @param obj
-     * @param writer
-     * @param am AttachmentMarshaller, optional Attachment
-     */
-    public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
-
-        // Very easy, use the Context to get the Marshaller.
-        // Use the marshaller to write the object.
-        Marshaller m = JAXBContextHelper.getMarshaller(getJAXBContext());
-        AttachmentMarshaller am = m.getAttachmentMarshaller();
-        boolean xop = am != null ? am.isXOPPackage() : false;
-        // Marshal the object
-        marshalElement(obj, m, writer, !xop);
-    }
-
-    /**
-     * Preferred way to marshal objects.
-     * 
-     * @param b Object that can be rendered as an element and the element name is known by the
-     * Marshaller
-     * @param m Marshaller
-     * @param writer XMLStreamWriter
-     */
-    private static void marshalElement(final Object b,
-                                         final Marshaller m,
-                                         final XMLStreamWriter writer,
-                                         final boolean optimize) {
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                // Marshalling directly to the output stream is faster than marshalling through the
-                // XMLStreamWriter. 
-                // Take advantage of this optimization if there is an output stream.
-                try {
-                    OutputStream os = (optimize) ? getOutputStream(writer) : null;
-                    if (os != null) {
-                        writer.flush();
-                        m.marshal(b, os);
-                    } else {
-                        m.marshal(b, writer);
-                    }
-                } catch (OMException e) {
-                    throw e;
-                } catch (Throwable t) {
-                    throw new OMException(t);
-                }
-                return null;
-            }
-        });
-    }
-
-    /**
-     * If the writer is backed by an OutputStream, then return the OutputStream
-     * @param writer
-     * @return OutputStream or null
-     */
-    private static OutputStream getOutputStream(XMLStreamWriter writer) throws XMLStreamException {
-        if (writer.getClass() == MTOMXMLStreamWriter.class) {
-            return ((MTOMXMLStreamWriter)writer).getOutputStream();
-        }
-        if (writer.getClass() == XMLStreamWriterWithOS.class) {
-            return ((XMLStreamWriterWithOS)writer).getOutputStream();
-        }
-        return null;
-    }
-
-    /**
-     * Preferred way to unmarshal objects
-     * 
-     * @param u Unmarshaller
-     * @param reader XMLStreamReader
-     * @return Object that represents an element
-     */
-    private static Object unmarshalElement(final Unmarshaller u, final XMLStreamReader reader) {
-        try {
-            return AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    try {
-                        return u.unmarshal(reader);
-                    } catch (OMException e) {
-                        throw e;
-                    } catch (Throwable t) {
-                        throw new OMException(t);
-                    }
-                }
-            });
-
-        } catch (OMException e) {
-            throw e;
-        } catch (Throwable t) {
-            throw new OMException(t);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
deleted file mode 100644
index 7702d099b4..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.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.databinding.jaxb.axiom.ext;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.util.StAXUtils;
-
-/**
- * OMDataSource backed by a jaxb object
- */
-public class JAXBDataSourceExt
-
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase  
-{
-
-    private static final Logger log = Logger.getLogger(JAXBDataSourceExt.class.getName());
-
-    private Object jaxb;
-    private JAXBDSContext context;
-
-    public JAXBDataSourceExt(Object jaxb, JAXBDSContext context) {
-        super();
-        this.jaxb = jaxb;
-        this.context = context;
-    }
-
-    public void close() {
-    }
-
-    // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-    //    public OMDataSourceExt copy() {
-    //        return new JAXBDataSourceExt(jaxb, context);
-    //    }
-
-    public Object getObject() {
-        return jaxb;
-    }
-
-    public JAXBDSContext getContext() {
-        return context;
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-
-        try {
-            String encoding = "utf-8";
-            InputStream is = new ByteArrayInputStream(getXMLBytes(encoding));
-            return StAXUtils.createXMLStreamReader(is, encoding);
-        } catch (UnsupportedEncodingException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
-        MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
-        serialize(writer);
-        writer.flush();
-        try {
-            writer.close();
-        } catch (XMLStreamException e) {
-            // An exception can occur if nothing is written to the 
-            // writer.  This is possible if the underlying data source
-            // writers to the output stream directly.
-            if (log.isLoggable(Level.FINER)) {
-                log.finer("Catching and swallowing exception " + e);
-            }
-        }
-    }
-
-    public void serialize(Writer writerTarget, OMOutputFormat format) throws XMLStreamException {
-        MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writerTarget));
-        writer.setOutputFormat(format);
-        serialize(writer);
-        writer.flush();
-        writer.close();
-    }
-
-    public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
-        try {
-            context.marshal(jaxb, xmlWriter);
-        } catch (JAXBException je) {
-            throw new XMLStreamException(je);
-        }
-    }
-
-    public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-            // Exposes getOutputStream, which allows faster writes.
-            XMLStreamWriterWithOS writer = new XMLStreamWriterWithOS(baos, encoding);
-
-            // Write the business object to the writer
-            serialize(writer);
-
-            // Flush the writer
-            writer.flush();
-            writer.close();
-            return baos.toByteArray();
-        } catch (XMLStreamException e) {
-            throw new OMException(e);
-        }
-    }
-
-    public boolean isDestructiveRead() {
-        return false;
-    }
-
-    public boolean isDestructiveWrite() {
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
deleted file mode 100644
index 758a82f72f..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.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.databinding.jaxb.axiom.ext;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.util.StAXUtils;
-
-/**
- * OMDataSource backed by a source
- */
-public class SourceDataSource
-// FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase 
-{
-    private Source data;
-
-    public SourceDataSource(Source data) {
-        super();
-        this.data = data;
-    }
-
-    public void close() {
-    }
-
-    // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-    //    public OMDataSourceExt copy() {
-    //        return new SourceDataSource(data);
-    //    }
-
-    public Object getObject() {
-        return data;
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-
-        try {
-            String encoding = "UTF-8";
-            InputStream is = new ByteArrayInputStream(getXMLBytes(encoding));
-            return StAXUtils.createXMLStreamReader(is, encoding);
-        } catch (UnsupportedEncodingException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
-        byte[] bytes = null;
-        try {
-            bytes = (byte[])null;
-
-            if (data instanceof StreamSource) {
-                InputStream is = ((StreamSource)data).getInputStream();
-                if (is != null) {
-                    bytes = getBytesFromStream(is);
-                }
-            } else {
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                Result result = new StreamResult(out);
-                Transformer transformer = TransformerFactory.newInstance().newTransformer();
-                transformer.transform(data, result);
-                bytes = out.toByteArray();
-            }
-        } catch (OMException e) {
-            throw e;
-        } catch (UnsupportedEncodingException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new OMException(e);
-        }
-
-        return bytes;
-    }
-
-    public boolean isDestructiveRead() {
-        return false;
-    }
-
-    public boolean isDestructiveWrite() {
-        return false;
-    }
-
-    private static byte[] getBytesFromStream(InputStream is) throws IOException {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buf = new byte[4096];
-        while (true) {
-            int size = is.read(buf);
-            if (size < 0) {
-                break;
-            }
-            bos.write(buf, 0, size);
-        }
-        return bos.toByteArray();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
deleted file mode 100644
index 44e34c3647..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
+++ /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.
- */
-
-package org.apache.tuscany.sca.databinding.jaxb.axiom.ext;
-
-import java.io.OutputStream;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.util.StAXUtils;
-
-/**
- * XMLStreamReader that exposes direct access to the OutputStream.
- * Writing to the output stream is faster in some cases.
- */
-public class XMLStreamWriterWithOS implements XMLStreamWriter {
-    private XMLStreamWriter writer;
-    private String charSetEncoding;
-    private OutputStream os;
-
-    public XMLStreamWriterWithOS(OutputStream os, String charSetEncoding) throws XMLStreamException {
-        super();
-        writer = null; // Writer is created when needed
-        this.os = os;
-        this.charSetEncoding = charSetEncoding;
-    }
-
-    /**
-     * The writer is created lazily. 
-     * If only the output stream is used, then the writer is never created.
-     */
-    private void createWriter() throws XMLStreamException {
-        if (writer == null) {
-            writer = StAXUtils.createXMLStreamWriter(os, charSetEncoding);
-        }
-    }
-
-    public void close() throws XMLStreamException {
-        if (writer != null) {
-            writer.close();
-        }
-    }
-
-    public void flush() throws XMLStreamException {
-        if (writer != null) {
-            writer.flush();
-        }
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        try {
-            createWriter();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return writer.getNamespaceContext();
-    }
-
-    public String getPrefix(String arg0) throws XMLStreamException {
-        createWriter();
-        return writer.getPrefix(arg0);
-    }
-
-    public Object getProperty(String arg0) throws IllegalArgumentException {
-        try {
-            createWriter();
-        } catch (XMLStreamException e) {
-            throw new IllegalArgumentException(e);
-        }
-        return writer.getProperty(arg0);
-    }
-
-    public void setDefaultNamespace(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.setDefaultNamespace(arg0);
-    }
-
-    public void setNamespaceContext(NamespaceContext arg0) throws XMLStreamException {
-        createWriter();
-        writer.setNamespaceContext(arg0);
-    }
-
-    public void setPrefix(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.setPrefix(arg0, arg1);
-    }
-
-    public void writeAttribute(String arg0, String arg1, String arg2, String arg3) throws XMLStreamException {
-        createWriter();
-        writer.writeAttribute(arg0, arg1, arg2, arg3);
-    }
-
-    public void writeAttribute(String arg0, String arg1, String arg2) throws XMLStreamException {
-        createWriter();
-        writer.writeAttribute(arg0, arg1, arg2);
-    }
-
-    public void writeAttribute(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeAttribute(arg0, arg1);
-    }
-
-    public void writeCData(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeCData(arg0);
-    }
-
-    public void writeCharacters(char[] arg0, int arg1, int arg2) throws XMLStreamException {
-        createWriter();
-        writer.writeCharacters(arg0, arg1, arg2);
-    }
-
-    public void writeCharacters(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeCharacters(arg0);
-    }
-
-    public void writeComment(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeComment(arg0);
-    }
-
-    public void writeDefaultNamespace(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeDefaultNamespace(arg0);
-    }
-
-    public void writeDTD(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeDTD(arg0);
-    }
-
-    public void writeEmptyElement(String arg0, String arg1, String arg2) throws XMLStreamException {
-        createWriter();
-        writer.writeEmptyElement(arg0, arg1, arg2);
-    }
-
-    public void writeEmptyElement(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeEmptyElement(arg0, arg1);
-    }
-
-    public void writeEmptyElement(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeEmptyElement(arg0);
-    }
-
-    public void writeEndDocument() throws XMLStreamException {
-        createWriter();
-        writer.writeEndDocument();
-    }
-
-    public void writeEndElement() throws XMLStreamException {
-        createWriter();
-        writer.writeEndElement();
-    }
-
-    public void writeEntityRef(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeEntityRef(arg0);
-    }
-
-    public void writeNamespace(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeNamespace(arg0, arg1);
-    }
-
-    public void writeProcessingInstruction(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeProcessingInstruction(arg0, arg1);
-    }
-
-    public void writeProcessingInstruction(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeProcessingInstruction(arg0);
-    }
-
-    public void writeStartDocument() throws XMLStreamException {
-        createWriter();
-        writer.writeStartDocument();
-    }
-
-    public void writeStartDocument(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeStartDocument(arg0, arg1);
-    }
-
-    public void writeStartDocument(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeStartDocument(arg0);
-    }
-
-    public void writeStartElement(String arg0, String arg1, String arg2) throws XMLStreamException {
-        createWriter();
-        writer.writeStartElement(arg0, arg1, arg2);
-    }
-
-    public void writeStartElement(String arg0, String arg1) throws XMLStreamException {
-        createWriter();
-        writer.writeStartElement(arg0, arg1);
-    }
-
-    public void writeStartElement(String arg0) throws XMLStreamException {
-        createWriter();
-        writer.writeStartElement(arg0);
-    }
-
-    /**
-     * If this XMLStreamWriter is connected to an OutputStream
-     * then the OutputStream is returned.  This allows a node
-     * (perhaps an OMSourcedElement) to write its content
-     * directly to the OutputStream.
-     * @return OutputStream or null
-     */
-    public OutputStream getOutputStream() throws XMLStreamException {
-
-        if (os != null) {
-            // Flush the state of the writer..Many times the 
-            // write defers the writing of tag characters (>)
-            // until the next write.  Flush out this character
-            if (writer != null) {
-                this.writeCharacters("");
-                this.flush();
-            }
-        }
-        return os;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
deleted file mode 100644
index a2a68c8eb0..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.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.databinding.jaxb.axiom.ext;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.util.StAXUtils;
-
-/**
- * OMDataSource backed by a string containing xml data
- */
-// FIXME: To be refectored into databinding-axiom
-public class XMLStringDataSource
-
-//FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-// extends OMDataSourceExtBase 
-{
-    private String data;
-
-    public XMLStringDataSource(String data) {
-        super();
-        this.data = data;
-    }
-
-    public void close() {
-    }
-
-    // FIXME: [rfeng] Re-enable it after we move to AXIOM 1.2.7
-    //    public OMDataSourceExt copy() {
-    //        return new XMLStringDataSource(data);
-    //    }
-
-    public Object getObject() {
-        return data;
-    }
-
-    public XMLStreamReader getReader() throws XMLStreamException {
-        StringReader reader = new StringReader(data);
-        return StAXUtils.createXMLStreamReader(reader);
-    }
-
-    public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
-        try {
-            writer.write(data);
-        } catch (UnsupportedEncodingException e) {
-            throw new XMLStreamException(e);
-        } catch (IOException e) {
-            throw new XMLStreamException(e);
-        }
-    }
-
-    public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
-        return data.getBytes(encoding);
-    }
-
-    public boolean isDestructiveRead() {
-        return false;
-    }
-
-    public boolean isDestructiveWrite() {
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index b48e629927..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.jaxb.axiom.JAXB2OMElement;source=javax.xml.bind.JAXBElement,target=org.apache.axiom.om.OMElement,weight=3000
-org.apache.tuscany.sca.databinding.jaxb.axiom.JAXB2OMElement;source=java:simpleType,target=org.apache.axiom.om.OMElement,weight=3000
-org.apache.tuscany.sca.databinding.jaxb.axiom.JAXB2OMElement;source=java:complexType,target=org.apache.axiom.om.OMElement,weight=3000
-
-org.apache.tuscany.sca.databinding.jaxb.axiom.OMElement2JAXB;source=org.apache.axiom.om.OMElement,target=javax.xml.bind.JAXBElement,weight=3000,public=false
-org.apache.tuscany.sca.databinding.jaxb.axiom.OMElement2JAXB;source=org.apache.axiom.om.OMElement,target=java:complexType,weight=90000,public=false
-org.apache.tuscany.sca.databinding.jaxb.axiom.OMElement2JAXB;source=org.apache.axiom.om.OMElement,target=java:simpleType,weight=90000,public=false
-
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
deleted file mode 100644
index 543a76594f..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.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.databinding.jaxb.axiom;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.apache.tuscany.sca.databinding.jaxb.axiom.JAXB2OMElement;
-import org.apache.tuscany.sca.databinding.xml.Node2XMLStreamReader;
-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.junit.Test;
-import org.w3c.dom.Node;
-
-import com.example.ipo.jaxb.ObjectFactory;
-import com.example.ipo.jaxb.PurchaseOrderType;
-import com.example.ipo.jaxb.USAddress;
-import com.example.ipo.jaxb.USState;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JAXB2OMTestCase {
-    @Test
-    public void testTransformElement() throws Exception {
-        JAXBElement<PurchaseOrderType> po = createPO();
-        DataType<?> sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, XMLType.UNKNOWN);
-        DataType<?> targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(po.getName(), null));
-        TransformationContext tContext = new TransformationContextImpl();
-        tContext.setSourceDataType(sourceDataType);
-        tContext.setTargetDataType(targetDataType);
-
-        // Force the JAXBContext to be cached
-        JAXBContextHelper.createJAXBContext(tContext, true);
-
-        long start = System.currentTimeMillis();
-        JAXB2OMElement t1 = new JAXB2OMElement();
-        OMElement om = t1.transform(po, tContext);
-        long duration1 = System.currentTimeMillis() - start;
-        StringWriter sw = new StringWriter();
-        // serializeAndConsume() will trigger the JAXBDataSource.serialize(Writer, OMOutputFormat)
-        om.serializeAndConsume(sw);
-        System.out.println(sw.toString());
-
-        start = System.currentTimeMillis();
-        Node node = new JAXB2Node().transform(po, tContext);
-        XMLStreamReader reader = new Node2XMLStreamReader().transform(node, null);
-        om = new StAXOMBuilder(reader).getDocumentElement();
-        sw = new StringWriter();
-        om.serializeAndConsume(sw);
-        long duration2 = System.currentTimeMillis() - start;
-        System.out.println(sw.toString());
-        System.out.println(duration1 + " vs. " + duration2);
-    }
-
-    @Test
-    public void testTransformType() throws Exception {
-        JAXBElement<PurchaseOrderType> po = createPO();
-        DataType<?> sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, XMLType.UNKNOWN);
-        DataType<?> targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(po.getName(), null));
-        TransformationContext tContext = new TransformationContextImpl();
-        tContext.setSourceDataType(sourceDataType);
-        tContext.setTargetDataType(targetDataType);
-        OMElement om = new JAXB2OMElement().transform(po.getValue(), tContext);
-        StringWriter sw = new StringWriter();
-        om.serializeAndConsume(sw);
-        System.out.println(sw.toString());
-    }
-
-    private JAXBElement<PurchaseOrderType> createPO() {
-        ObjectFactory factory = new ObjectFactory();
-        PurchaseOrderType type = factory.createPurchaseOrderType();
-        JAXBElement<PurchaseOrderType> po = factory.createPurchaseOrder(type);
-        type.setItems(factory.createItems());
-        type.setComment("123");
-        USAddress address = factory.createUSAddress();
-        address.setCity("San Jose");
-        address.setStreet("ABC St.");
-        address.setState(USState.CA);
-        type.setShipTo(address);
-        return po;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
deleted file mode 100644
index 3c00307941..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.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.databinding.jaxb.axiom;
-
-import java.io.ByteArrayInputStream;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.databinding.jaxb.axiom.OMElement2JAXB;
-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.junit.Test;
-
-import com.example.ipo.jaxb.PurchaseOrderType;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OMElement2JAXBTestCase {
-    private static final String XML =
-        "<ns0:root xmlns:ns0=\"http://ns0\" xmlns:ns2=\"http://www.example.com/IPO\">" + "<ns1:next xmlns:ns1=\"http://ns1\">"
-            + "<ns2:purchaseOrder>"
-            + "<shipTo xsi:type=\"ns2:USAddress\" "
-            + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
-            + "<street>ABC St.</street><city>San Jose</city><state>CA</state></shipTo>"
-            + "<ns2:comment>123</ns2:comment><items/>"
-            + "</ns2:purchaseOrder>"
-            + "</ns1:next>"
-            + "</ns0:root>";
-
-    @Test
-    public void testTransform() throws Exception {
-        DataType<?> sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, XMLType.UNKNOWN);
-        QName qname = new QName("http://www.example.com/IPO", "purchaseOrder");
-        DataType<?> targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(qname, null));
-        TransformationContext tContext = new TransformationContextImpl();
-        tContext.setSourceDataType(sourceDataType);
-        tContext.setTargetDataType(targetDataType);
-
-        StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(XML.getBytes("UTF-8")));
-        OMElement root = builder.getDocumentElement();
-        OMElement next = (OMElement)root.getChildElements().next();
-        OMElement po = (OMElement)next.getChildElements().next();
-        Object jaxb = new OMElement2JAXB().transform(po, tContext);
-        Assert.assertTrue(jaxb instanceof PurchaseOrderType);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
deleted file mode 100644
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb-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/tags/java/sca/1.3/modules/databinding-jaxb/LICENSE b/tags/java/sca/1.3/modules/databinding-jaxb/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/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/tags/java/sca/1.3/modules/databinding-jaxb/NOTICE b/tags/java/sca/1.3/modules/databinding-jaxb/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/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/tags/java/sca/1.3/modules/databinding-jaxb/pom.xml b/tags/java/sca/1.3/modules/databinding-jaxb/pom.xml
deleted file mode 100644
index b38f661a8c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-databinding-jaxb</artifactId>
-    <name>Apache Tuscany SCA Data Binding for JAXB</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <!-- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</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.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jvnet.jaxb.reflection</groupId>
-            <artifactId>jaxb2-reflection</artifactId>
-            <version>2.1.4</version>
-            <scope>compile</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>
-
-    <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.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>
-            <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/jaxb-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.5</version>
-                <executions>
-                    <execution>
-                        <id>generate-jaxb</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <generatePackage>com.example.ipo.jaxb</generatePackage>
-                    <generateDirectory>${project.build.directory}/jaxb-source</generateDirectory>
-                    <schemaDirectory>${basedir}/src/test/resources</schemaDirectory>
-                    <schemaIncludes>
-                        <include>ipo.xsd</include>
-                    </schemaIncludes>
-                </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.databinding.jaxb</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.jaxb*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
deleted file mode 100644
index 0fde2ee9a5..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.jaxb;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.xml.SimpleXmlNodeImpl;
-import org.apache.tuscany.sca.databinding.xml.XmlNode;
-import org.apache.tuscany.sca.databinding.xml.XmlTreeStreamReaderImpl;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.jvnet.jaxb.reflection.model.annotation.RuntimeInlineAnnotationReader;
-import org.jvnet.jaxb.reflection.model.core.Ref;
-import org.jvnet.jaxb.reflection.model.impl.RuntimeModelBuilder;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeClassInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimePropertyInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeTypeInfoSet;
-import org.jvnet.jaxb.reflection.runtime.IllegalAnnotationsException;
-import org.jvnet.jaxb.reflection.runtime.JAXBContextImpl;
-
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class BeanXMLStreamReaderImpl extends XmlTreeStreamReaderImpl {
-    private static final Comparator<Accessor> COMPARATOR = new Comparator<Accessor>() {
-        public int compare(Accessor o1, Accessor o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    };
-
-    private static final String XSI_PREFIX = "xsi";
-    private static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-
-    private static XmlNode getXSIType(QName realType) {
-        QName xsiType = new QName(XSI_NS, "type", XSI_PREFIX);
-        String prefix = realType.getPrefix();
-        String typeName = realType.getLocalPart();
-        if (prefix != null && !prefix.equals("")) {
-            typeName = prefix + ":" + realType.getLocalPart();
-        }
-        return new SimpleXmlNodeImpl(xsiType, XmlNode.Type.ATTRIBUTE);
-    }
-
-    /**
-     * Represent a Map.Entry XML node
-     * @version $Rev$ $Date$
-     */
-    public static class MapEntryXmlNodeImpl extends SimpleXmlNodeImpl implements XmlNode {
-        private Map.Entry entry;
-
-        public MapEntryXmlNodeImpl(Entry entry) {
-            super(new QName("", "entry"), entry);
-            this.entry = entry;
-        }
-
-        public Iterator<XmlNode> children() {
-            List<XmlNode> nodes = new ArrayList<XmlNode>();
-            XmlNode key = new BeanXmlNodeImpl(new QName("", "key"), entry.getKey());
-            XmlNode value = new BeanXmlNodeImpl(new QName("", "value"), entry.getValue());
-            nodes.add(key);
-            nodes.add(value);
-            return nodes.iterator();
-        }
-    }
-
-    public static class BeanXmlNodeImpl extends SimpleXmlNodeImpl implements XmlNode {
-        private static final Object[] NULL = null;
-        private static final SimpleTypeMapperImpl MAPPER = new SimpleTypeMapperImpl();
-
-        public BeanXmlNodeImpl(Object bean) {
-            super(getName(bean == null ? null : bean.getClass()), bean);
-        }
-
-        public BeanXmlNodeImpl(QName name, Object bean) {
-            super(name, bean);
-        }
-
-        private static boolean isSimpleType(Class<?> javaType) {
-            return SimpleTypeMapperImpl.getXMLType(javaType) != 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);
-            }
-        }
-
-        public Iterator<XmlNode> children() {
-            if (name == null) {
-                return null;
-            }
-            if (value == null) {
-                return super.children();
-            }
-            if (isSimpleType(value.getClass())) {
-                XmlNode textNode = new BeanXmlNodeImpl(null, value);
-                return Arrays.asList(textNode).iterator();
-            }
-            if (Map.class.isAssignableFrom(value.getClass())) {
-                List<XmlNode> entries = new ArrayList<XmlNode>();
-                Map map = (Map)value;
-                if (map != null) {
-                    for (Object e : map.entrySet()) {
-                        Map.Entry entry = (Map.Entry)e;
-                        entries.add(new MapEntryXmlNodeImpl(entry));
-                    }
-                }
-                return entries.iterator();
-            }
-            try {
-                Map<String, Accessor> accessorMap = getAccessors(value);
-                List<Accessor> accessorList = new ArrayList<Accessor>(accessorMap.values());
-                Collections.sort(accessorList, COMPARATOR);
-
-                List<XmlNode> props = new ArrayList<XmlNode>();
-                for (Accessor accessor : accessorList) {
-                    Class<?> pType = accessor.getType();
-
-                    QName pName = new QName(name.getNamespaceURI(), accessor.getName());
-                    Object pValue = accessor.getValue();
-                    if (pType.isArray()) {
-                        if (pValue != null) {
-                            int i1 = Array.getLength(pValue);
-                            for (int j = 0; j < i1; j++) {
-                                Object o = Array.get(pValue, j);
-                                props.add(new BeanXmlNodeImpl(pName, o));
-                            }
-                        } else {
-                            // TODO: How to handle null?
-                        }
-                    } else if (Collection.class.isAssignableFrom(pType)) {
-                        Collection objList = (Collection)pValue;
-                        if (objList != null && objList.size() > 0) {
-                            for (Iterator j = objList.iterator(); j.hasNext();) {
-                                Object o = j.next();
-                                props.add(new BeanXmlNodeImpl(pName, o));
-                            }
-
-                        } else {
-                            // How to handle null
-                        }
-                    } else {
-                        props.add(new BeanXmlNodeImpl(pName, pValue));
-                    }
-                }
-                return props.iterator();
-            } catch (Exception e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-
-        public QName getName() {
-            return name;
-        }
-
-        public String getValue() {
-            return getStringValue(value);
-        }
-
-        private static String getPackageName(Class<?> cls) {
-            String name = cls.getName();
-            int index = name.lastIndexOf('.');
-            return index == -1 ? "" : name.substring(0, index);
-        }
-
-        public static QName getName(Class<?> cls) {
-            if (cls == null) {
-                return null;
-            }
-
-            String packageName = getPackageName(cls);
-
-            if ("".equals(packageName)) {
-                return new QName("", cls.getSimpleName());
-            }
-            StringBuffer ns = new StringBuffer("http://");
-            String[] names = packageName.split("\\.");
-            for (int i = names.length - 1; i >= 0; i--) {
-                ns.append(names[i]);
-                if (i != 0) {
-                    ns.append('.');
-                }
-            }
-            ns.append('/');
-            return new QName(ns.toString(), cls.getSimpleName());
-        }
-    }
-
-    public BeanXMLStreamReaderImpl(QName name, Object bean) {
-        super(getXmlNode(name, bean));
-    }
-
-    private static BeanXmlNodeImpl getXmlNode(QName name, Object bean) {
-        BeanXmlNodeImpl root = null;
-        if (name != null) {
-            root = new BeanXmlNodeImpl(name, bean);
-        } else {
-            root = new BeanXmlNodeImpl(bean);
-        }
-        return root;
-    }
-
-    public static interface Accessor {
-        String getName();
-
-        Class<?> getType();
-
-        Object getValue() throws Exception;
-
-        void setValue(Object value) throws Exception;
-    }
-
-    private static RuntimeTypeInfoSet create(Class... classes) throws Exception {
-        IllegalAnnotationsException.Builder errorListener = new IllegalAnnotationsException.Builder();
-        RuntimeInlineAnnotationReader reader = new RuntimeInlineAnnotationReader();
-        JAXBContextImpl context =
-            new JAXBContextImpl(classes, null, Collections.<Class, Class> emptyMap(), null, false, reader, false, false);
-        RuntimeModelBuilder builder =
-            new RuntimeModelBuilder(context, reader, Collections.<Class, Class> emptyMap(), null);
-        builder.setErrorHandler(errorListener);
-        for (Class c : classes)
-            builder.getTypeInfo(new Ref<Type, Class>(c));
-
-        RuntimeTypeInfoSet r = builder.link();
-        errorListener.check();
-        return r;
-    }
-
-    private static class JAXBAccessor implements Accessor {
-        private Object target;
-        private RuntimePropertyInfo prop;
-
-        public JAXBAccessor(Object target, RuntimePropertyInfo field) {
-            super();
-            this.target = target;
-            this.prop = field;
-        }
-
-        public String getName() {
-            return prop.getName();
-        }
-
-        public Object getValue() throws Exception {
-            return prop.getAccessor().get(target);
-        }
-
-        public void setValue(Object value) throws Exception {
-            prop.getAccessor().set(target, value);
-        }
-
-        public Class<?> getType() {
-            Type type = prop.getRawType();
-            if (type instanceof Class) {
-                return (Class<?>)type;
-            } else if (type instanceof ParameterizedType) {
-                ParameterizedType pType = (ParameterizedType)type;
-                type = pType.getRawType();
-                if (type instanceof Class) {
-                    return (Class<?>)type;
-                }
-            }
-            return Object.class;
-        }
-
-    }
-
-    private static Map<String, Accessor> getAccessors(Object target) throws Exception {
-        if (target == null) {
-            return Collections.emptyMap();
-        }
-        Map<String, Accessor> map = new HashMap<String, Accessor>();
-        Class<?> type = target.getClass();
-        RuntimeTypeInfoSet set = create(type);
-        RuntimeClassInfo clsInfo = (RuntimeClassInfo)set.getTypeInfo(type);
-        for (RuntimePropertyInfo f : clsInfo.getProperties()) {
-            map.put(f.getName(), new JAXBAccessor(target, f));
-        }
-        return map;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
deleted file mode 100644
index 003b4fb992..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.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.databinding.jaxb;
-
-import java.awt.Image;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.activation.DataHandler;
-import javax.imageio.ImageIO;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Provides utilities to convert an object into a different kind of Object. For example, convert a
- * String[] into a List<String>
- */
-public class DataConverter {
-
-    /**
-     * This method should return true if the convert method will succeed.
-     * <p/>
-     * Note that any changes to isConvertable() must also be accompanied by similar changes to
-     * convert()
-     *
-     * @param obj  source object or class
-     * @param dest destination class
-     * @return boolean true if convert(..) can convert obj to the destination class
-     */
-    public static boolean isConvertable(Object obj, Class dest) {
-        Class src = null;
-
-        if (obj != null) {
-            if (obj instanceof Class) {
-                src = (Class)obj;
-            } else {
-                src = obj.getClass();
-            }
-        }
-
-        if (dest == null) {
-            return false;
-        }
-
-        if (src == null) {
-            return true;
-        }
-
-        // If we're directly assignable, we're good.
-        if (dest.isAssignableFrom(src)) {
-            return true;
-        }
-
-        // If it's a wrapping conversion, we're good.
-        if (getWrapperClass(src) == dest) {
-            return true;
-        }
-        if (getWrapperClass(dest) == src) {
-            return true;
-        }
-
-        // If it's List -> Array or vice versa, we're good.
-        if ((Collection.class.isAssignableFrom(src) || src.isArray()) && (Collection.class.isAssignableFrom(dest) || dest
-            .isArray())) {
-
-            // TODO this should consider the component types instead of returning true.
-            return true;
-        }
-
-        // Allow mapping of HashMaps to Hashtables
-        if (src == HashMap.class && dest == Hashtable.class)
-            return true;
-
-        // Allow mapping of Calendar to Date
-        if (Calendar.class.isAssignableFrom(src) && dest == Date.class) {
-            return true;
-        }
-
-        if (src.isPrimitive()) {
-            return isConvertable(getWrapperClass(src), dest);
-        }
-
-        if (InputStream.class.isAssignableFrom(src) && dest == byte[].class) {
-            return true;
-        }
-
-        if (Source.class.isAssignableFrom(src) && dest == byte[].class) {
-            return true;
-        }
-
-        if (DataHandler.class.isAssignableFrom(src) && isConvertable(byte[].class, dest)) {
-            return true;
-        }
-
-        if (DataHandler.class.isAssignableFrom(src) && dest == Image.class) {
-            return true;
-        }
-
-        if (DataHandler.class.isAssignableFrom(src) && dest == Source.class) {
-            return true;
-        }
-
-        if (byte[].class.isAssignableFrom(src) && dest == String.class) {
-            return true;
-        }
-
-        // If it's a MIME type mapping and we want a DataHandler,
-        // then we're good.
-        // REVIEW Do we want to support this
-        /*
-        if (dest.getName().equals("javax.activation.DataHandler")) {
-            String name = src.getName();
-            if (src == String.class
-                    || src == java.awt.Image.class
-                    || name.equals("javax.mail.internet.MimeMultipart")
-                    || name.equals("javax.xml.transform.Source"))
-                return true;
-        }
-        */
-
-        return false;
-    }
-
-    /**
-     * Utility function to convert an Object to some desired Class.
-     * <p/>
-     * Normally this is used for T[] to List<T> processing. Other conversions are also done (i.e.
-     * HashMap <->Hashtable, etc.)
-     * <p/>
-     * Use the isConvertable() method to determine if conversion is possible. Note that any changes
-     * to convert() must also be accompanied by similar changes to isConvertable()
-     *
-     * @param arg       the array to convert
-     * @param destClass the actual class we want
-     * @return object of destClass if conversion possible, otherwise returns arg
-     */
-    public static Object convert(Object arg, Class<?> destClass) {
-        if (destClass == null) {
-            return arg;
-        }
-
-        if (arg != null && destClass.isAssignableFrom(arg.getClass())) {
-            return arg;
-        }
-
-        // Convert between Calendar and Date
-        if (arg instanceof Calendar && destClass == Date.class) {
-            return ((Calendar)arg).getTime();
-        }
-
-        // Convert between HashMap and Hashtable
-        if (arg instanceof HashMap && destClass == Hashtable.class) {
-            return new Hashtable((HashMap)arg);
-        }
-
-        if (arg instanceof InputStream && destClass == byte[].class) {
-
-            try {
-                InputStream is = (InputStream)arg;
-                return getBytesFromStream(is);
-            } catch (IOException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        if (arg instanceof Source && destClass == byte[].class) {
-            try {
-                if (arg instanceof StreamSource) {
-                    InputStream is = ((StreamSource)arg).getInputStream();
-                    if (is != null) {
-                        return getBytesFromStream(is);
-                    }
-                }
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                Result result = new StreamResult(out);
-                Transformer transformer = TransformerFactory.newInstance().newTransformer();
-                transformer.transform((Source)arg, result);
-                byte[] bytes = out.toByteArray();
-                return bytes;
-
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        if (arg instanceof DataHandler) {
-            try {
-                InputStream is = ((DataHandler)arg).getInputStream();
-                if (destClass == Image.class) {
-                    return ImageIO.read(is);
-                } else if (destClass == Source.class) {
-                    return new StreamSource(is);
-                }
-                byte[] bytes = getBytesFromStream(is);
-                return convert(bytes, destClass);
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        if (arg instanceof byte[] && destClass == String.class) {
-            return new String((byte[])arg);
-        }
-
-        // If the destination is an array and the source
-        // is a suitable component, return an array with 
-        // the single item.
-        /* REVIEW do we need to support atomic to array conversion ?
-        if (arg != null &&
-            destClass.isArray() &&
-            !destClass.getComponentType().equals(Object.class) &&
-            destClass.getComponentType().isAssignableFrom(arg.getClass())) {
-            Object array = 
-                Array.newInstance(destClass.getComponentType(), 1);
-            Array.set(array, 0, arg);
-            return array;
-        }
-        */
-
-        // Return if no conversion is available
-        if (!(arg instanceof Collection || (arg != null && arg.getClass().isArray()))) {
-            return arg;
-        }
-
-        if (arg == null) {
-            return null;
-        }
-
-        // The arg may be an array or List 
-        Object destValue = null;
-        int length = 0;
-        if (arg.getClass().isArray()) {
-            length = Array.getLength(arg);
-        } else {
-            length = ((Collection)arg).size();
-        }
-
-        try {
-            if (destClass.isArray()) {
-                if (destClass.getComponentType().isPrimitive()) {
-
-                    Object array = Array.newInstance(destClass.getComponentType(), length);
-                    // Assign array elements
-                    if (arg.getClass().isArray()) {
-                        for (int i = 0; i < length; i++) {
-                            Array.set(array, i, Array.get(arg, i));
-                        }
-                    } else {
-                        int idx = 0;
-                        for (Iterator i = ((Collection)arg).iterator(); i.hasNext();) {
-                            Array.set(array, idx++, i.next());
-                        }
-                    }
-                    destValue = array;
-
-                } else {
-                    Object[] array;
-                    try {
-                        array = (Object[])Array.newInstance(destClass.getComponentType(), length);
-                    } catch (Exception e) {
-                        return arg;
-                    }
-
-                    // Use convert to assign array elements.
-                    if (arg.getClass().isArray()) {
-                        for (int i = 0; i < length; i++) {
-                            array[i] = convert(Array.get(arg, i), destClass.getComponentType());
-                        }
-                    } else {
-                        int idx = 0;
-                        for (Iterator i = ((Collection)arg).iterator(); i.hasNext();) {
-                            array[idx++] = convert(i.next(), destClass.getComponentType());
-                        }
-                    }
-                    destValue = array;
-                }
-            } else if (Collection.class.isAssignableFrom(destClass)) {
-                Collection newList = null;
-                try {
-                    // if we are trying to create an interface, build something
-                    // that implements the interface
-                    if (destClass == Collection.class || destClass == List.class) {
-                        newList = new ArrayList();
-                    } else if (destClass == Set.class) {
-                        newList = new HashSet();
-                    } else {
-                        newList = (Collection)destClass.newInstance();
-                    }
-                } catch (Exception e) {
-                    // No FFDC code needed
-                    // Couldn't build one for some reason... so forget it.
-                    return arg;
-                }
-
-                if (arg.getClass().isArray()) {
-                    for (int j = 0; j < length; j++) {
-                        newList.add(Array.get(arg, j));
-                    }
-                } else {
-                    for (Iterator j = ((Collection)arg).iterator(); j.hasNext();) {
-                        newList.add(j.next());
-                    }
-                }
-                destValue = newList;
-            } else {
-                destValue = arg;
-            }
-        } catch (Throwable t) {
-            throw new ServiceRuntimeException(t);
-        }
-
-        return destValue;
-    }
-
-    private static byte[] getBytesFromStream(InputStream is) throws IOException {
-        // TODO This code assumes that available is the length of the stream.
-        byte[] bytes = new byte[is.available()];
-        is.read(bytes);
-        return bytes;
-    }
-
-    public static Class getWrapperClass(Class primitive) {
-        if (primitive == int.class) {
-            return java.lang.Integer.class;
-        } else if (primitive == short.class) {
-            return java.lang.Short.class;
-        } else if (primitive == boolean.class) {
-            return java.lang.Boolean.class;
-        } else if (primitive == byte.class) {
-            return java.lang.Byte.class;
-        } else if (primitive == long.class) {
-            return java.lang.Long.class;
-        } else if (primitive == double.class) {
-            return java.lang.Double.class;
-        } else if (primitive == float.class) {
-            return java.lang.Float.class;
-        } else if (primitive == char.class) {
-            return java.lang.Character.class;
-        }
-
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
deleted file mode 100644
index 062da48206..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.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.jaxb;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultXMLAdapterExtensionPoint implements XMLAdapterExtensionPoint {
-    private Map<Class<?>, Class<? extends XmlAdapter>> adapters =
-        new ConcurrentHashMap<Class<?>, Class<? extends XmlAdapter>>();
-
-    public void addAdapter(Class<?> boundType, Class<? extends XmlAdapter> adapter) {
-        adapters.put(boundType, adapter);
-    }
-
-    public Class<? extends XmlAdapter> getAdapter(Class<?> boundType) {
-        Class<? extends XmlAdapter> cls = adapters.get(boundType);
-        if (cls != null) {
-            return cls;
-        }
-        for (Map.Entry<Class<?>, Class<? extends XmlAdapter>> e : adapters.entrySet()) {
-            if (e.getKey().isAssignableFrom(boundType)) {
-                return e.getValue();
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Class<? extends XmlAdapter> removeAdapter(Class<?> boundType) {
-        return adapters.remove(boundType);
-    }
-
-    public Map<Class<?>, Class<? extends XmlAdapter>> getAdapters() {
-        return adapters;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
deleted file mode 100644
index 3e262c7d12..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.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.jaxb;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXB2Node extends BaseTransformer<Object, Node> implements PullTransformer<Object, Node> {
-
-    public Node transform(Object source, TransformationContext tContext) {
-//        if (source == null) {
-//            return null;
-//        }
-        try {
-            JAXBContext context = JAXBContextHelper.createJAXBContext(tContext, true);
-            Marshaller marshaller = context.createMarshaller();
-            // FIXME: The default Marshaller doesn't support
-            // marshaller.getNode()
-            Document document = DOMHelper.newDocument();
-            Object jaxbElement = JAXBContextHelper.createJAXBElement(context, tContext.getSourceDataType(), source);
-            marshaller.marshal(jaxbElement, document);
-            return DOMHelper.adjustElementName(tContext, document.getDocumentElement());
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
deleted file mode 100644
index 097fc6124f..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.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.jaxb;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-
-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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JAXB2SAX extends BaseTransformer<Object, ContentHandler> implements
-    PushTransformer<Object, ContentHandler> {
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.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(Object source, ContentHandler target, TransformationContext tContext) {
-        try {
-            JAXBContext context = JAXBContextHelper.createJAXBContext(tContext, true);
-            Marshaller marshaller = context.createMarshaller();
-            Object jaxbElement = JAXBContextHelper.createJAXBElement(context, tContext.getSourceDataType(), source);
-            marshaller.marshal(jaxbElement, target);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    public int getWeight() {
-        return 20;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
deleted file mode 100644
index 29951a5e16..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.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.jaxb;
-
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.transform.stream.StreamResult;
-
-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.XMLStringDataBinding;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXB2String extends BaseTransformer<Object, String> implements PullTransformer<Object, String> {
-
-    public String transform(Object source, TransformationContext tContext) {
-        try {
-            JAXBContext context = JAXBContextHelper.createJAXBContext(tContext, true);
-            Marshaller marshaller = context.createMarshaller();
-            StringWriter writer = new StringWriter();
-            StreamResult result = new StreamResult(writer);
-            Object jaxbElement = JAXBContextHelper.createJAXBElement(context, tContext.getSourceDataType(), source);
-            marshaller.marshal(jaxbElement, result);
-            return writer.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return XMLStringDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
deleted file mode 100644
index e2151e23a1..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.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.databinding.jaxb;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXB2XMLStreamReader extends BaseTransformer<Object, XMLStreamReader> implements
-    PullTransformer<Object, XMLStreamReader> {
-
-    public JAXB2XMLStreamReader() {
-        super();
-    }
-
-    public XMLStreamReader transform(Object source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            QName name = null;
-            Object bean = null;
-            if (source instanceof JAXBElement) {
-                bean = ((JAXBElement)source).getValue();
-                name = ((JAXBElement)source).getName();
-            } else {
-                JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, true);
-                Object element = JAXBContextHelper.createJAXBElement(jaxbContext, context.getSourceDataType(), source);
-                name = jaxbContext.createJAXBIntrospector().getElementName(element);
-                bean = source;
-            }
-            BeanXMLStreamReaderImpl reader = new BeanXMLStreamReaderImpl(name, bean);
-            return reader;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
deleted file mode 100644
index 296c39c50f..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.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.databinding.jaxb;
-
-import java.awt.Image;
-import java.net.URI;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.transform.Source;
-
-import org.apache.tuscany.sca.databinding.util.LRUCache;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JAXBContextCache {
-    private static final int CACHE_SIZE = 128;
-
-    private static HashMap<String, Class<?>> loadClassMap = new HashMap<String, Class<?>>();
-
-    static {
-        loadClassMap.put("byte", byte.class);
-        loadClassMap.put("int", int.class);
-        loadClassMap.put("short", short.class);
-        loadClassMap.put("long", long.class);
-        loadClassMap.put("float", float.class);
-        loadClassMap.put("double", double.class);
-        loadClassMap.put("boolean", boolean.class);
-        loadClassMap.put("char", char.class);
-        loadClassMap.put("void", void.class);
-    }
-
-    protected static Class<?>[] JAXB_BUILTIN_CLASSES =
-        {byte[].class, boolean.class, byte.class, char.class, double.class, float.class, int.class, long.class,
-         short.class, void.class, java.awt.Image.class, java.io.File.class, java.lang.Boolean.class,
-         java.lang.Byte.class, java.lang.Character.class, java.lang.Class.class, java.lang.Double.class,
-         java.lang.Float.class, java.lang.Integer.class, java.lang.Long.class, java.lang.Object.class,
-         java.lang.Short.class, java.lang.String.class, java.lang.Void.class, java.math.BigDecimal.class,
-         java.math.BigInteger.class, java.net.URI.class, java.net.URL.class, java.util.Calendar.class,
-         java.util.Date.class, java.util.GregorianCalendar.class, java.util.UUID.class,
-         javax.activation.DataHandler.class, javax.xml.bind.JAXBElement.class, javax.xml.datatype.Duration.class,
-         javax.xml.datatype.XMLGregorianCalendar.class, javax.xml.namespace.QName.class,
-         javax.xml.transform.Source.class};
-
-    protected static final Set<Class<?>> BUILTIN_CLASSES_SET = new HashSet<Class<?>>(Arrays.asList(JAXB_BUILTIN_CLASSES));
-
-    /*
-    protected static Class<?>[] COMMON_ARRAY_CLASSES =
-        new Class[] {char[].class, short[].class, int[].class, long[].class, float[].class, double[].class,
-                     String[].class
-                     };
-
-    protected static final Set<Class<?>> COMMON_CLASSES_SET = new HashSet<Class<?>>(Arrays.asList(COMMON_ARRAY_CLASSES));
-    */
-
-    protected LRUCache<Object, JAXBContext> cache;
-    protected LRUCache<JAXBContext, Unmarshaller> upool;
-    protected LRUCache<JAXBContext, Marshaller> mpool;
-    
-    // protected JAXBContext commonContext;
-    protected JAXBContext defaultContext;
-
-    public JAXBContextCache() {
-        this(CACHE_SIZE, CACHE_SIZE, CACHE_SIZE);
-    }
-
-    public JAXBContextCache(int contextSize, int marshallerSize, int unmarshallerSize) {
-        cache = new LRUCache<Object, JAXBContext>(contextSize);
-        upool = new LRUCache<JAXBContext, Unmarshaller>(unmarshallerSize);
-        mpool = new LRUCache<JAXBContext, Marshaller>(marshallerSize);
-        defaultContext = getDefaultJAXBContext();
-    }
-    
-    public static JAXBContext getDefaultJAXBContext() {
-        try {
-            return JAXBContext.newInstance();
-        } catch (JAXBException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    /**
-     * @param name of primitive type
-     * @return primitive Class or null
-     */
-    public static Class<?> getPrimitiveClass(String text) {
-        return loadClassMap.get(text);
-    }
-
-    /**
-     * Return the class for this name
-     *
-     * @return Class
-     */
-    private static Class<?> forName(final String className, final boolean initialize, final ClassLoader classloader)
-        throws ClassNotFoundException {
-        // NOTE: This method must remain private because it uses AccessController
-        Class<?> cl = null;
-        try {
-            cl = AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
-                public Class<?> run() throws ClassNotFoundException {
-                    // Class.forName does not support primitives
-                    Class<?> cls = getPrimitiveClass(className);
-                    if (cls == null) {
-                        cls = Class.forName(className, initialize, classloader);
-                    }
-                    return cls;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (ClassNotFoundException)e.getException();
-        }
-
-        return cl;
-    }
-
-    /**
-     * @param p  Package
-     * @param cl
-     * @return true if each package has a ObjectFactory class or package-info
-     */
-    public static boolean checkPackage(String p, ClassLoader cl) {
-
-        // Each package must have an ObjectFactory
-        try {
-            Class<?> cls = forName(p + ".ObjectFactory", false, cl);
-            if (cls != null) {
-                return true;
-            }
-            //Catch Throwable as ClassLoader can throw an NoClassDefFoundError that
-            //does not extend Exception. So we will absorb any Throwable exception here.
-        } catch (Throwable e) {
-            // Ignore
-        }
-
-        try {
-            Class<?> cls = forName(p + ".package-info", false, cl);
-            if (cls != null) {
-                return cls.isAnnotationPresent(XmlSchema.class);
-            }
-            //Catch Throwable as ClassLoader can throw an NoClassDefFoundError that
-            //does not extend Exception. So we will absorb any Throwable exception here.
-        } catch (Throwable e) {
-            // Ignore
-        }
-
-        return false;
-    }
-
-    public Marshaller getMarshaller(JAXBContext context) throws JAXBException {
-        synchronized (mpool) {
-            Marshaller marshaller = mpool.get(context);
-            if (marshaller == null) {
-                marshaller = context.createMarshaller();
-                mpool.put(context, marshaller);
-            }
-            return marshaller;
-        }
-    }
-
-    public Unmarshaller getUnmarshaller(JAXBContext context) throws JAXBException {
-        synchronized (upool) {
-            Unmarshaller unmarshaller = upool.get(context);
-            if (unmarshaller == null) {
-                unmarshaller = context.createUnmarshaller();
-                upool.put(context, unmarshaller);
-            }
-            return unmarshaller;
-        }
-    }
-
-    public LRUCache<Object, JAXBContext> getCache() {
-        return cache;
-    }
-
-    public JAXBContext getJAXBContext(Class<?> cls) throws JAXBException {
-        if (BUILTIN_CLASSES_SET.contains(cls)) {
-            return defaultContext;
-        }
-        synchronized (cache) {
-            JAXBContext context = cache.get(cls);
-            if (context != null) {
-                return context;
-            }
-            Package pkg = cls.getPackage();
-            if (pkg != null) {
-                context = cache.get(pkg);
-                if (context != null) {
-                    return context;
-                }
-            }
-
-            if (pkg != null && checkPackage(pkg.getName(), cls.getClassLoader())) {
-                context = JAXBContext.newInstance(pkg.getName(), cls.getClassLoader());
-                cache.put(pkg, context);
-            } else {
-                context = JAXBContext.newInstance(cls);
-                cache.put(cls, context);
-            }
-            return context;
-
-        }
-    }
-
-    public JAXBContext getJAXBContext(Class<?>[] classes) throws JAXBException {
-        Set<Class<?>> classSet = new HashSet<Class<?>>(Arrays.asList(classes));
-        return getJAXBContext(classSet);
-    }
-
-    public JAXBContext getJAXBContext(Set<Class<?>> classes) throws JAXBException {
-        // Remove the JAXB built-in types to maximize the cache hit 
-        Set<Class<?>> classSet = new HashSet<Class<?>>(classes);
-        classSet.removeAll(BUILTIN_CLASSES_SET);
-        
-        // FIXME: [rfeng] Remove java classes that are mapped to the same XSD type to avoid
-        // conflicts
-        if (classSet.contains(Date[].class)) {
-            classSet.remove(Calendar[].class);
-        }
-
-        if (classSet.contains(URI[].class)) {
-            classSet.remove(UUID[].class);
-        }
-
-        if (classSet.contains(Source[].class)) {
-            classSet.remove(Image[].class);
-            classSet.remove(DataHandler[].class);
-        } 
-        
-        if(classSet.isEmpty()) {
-            return defaultContext;
-        }
-        
-        // For single class
-        if (classSet.size() == 1) {
-            return getJAXBContext(classSet.iterator().next());
-        }
-        synchronized (cache) {
-            JAXBContext context = cache.get(classSet);
-            if (context != null) {
-                return context;
-            }
-            context = JAXBContext.newInstance(classSet.toArray(new Class<?>[classSet.size()]));
-            cache.put(classSet, context);
-            return context;
-        }
-    }
-
-    public void clear() {
-        synchronized (cache) {
-            cache.clear();
-        }
-        synchronized (upool) {
-            upool.clear();
-        }
-        synchronized (upool) {
-            upool.clear();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
deleted file mode 100644
index 6d66f10a8e..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.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.sca.databinding.jaxb;
-
-import java.beans.Introspector;
-import java.io.IOException;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBIntrospector;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.SchemaOutputResolver;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.dom.DOMResult;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.util.LRUCache;
-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.w3c.dom.Node;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-// FIXME: [rfeng] We probably should turn this into a pluggable system service
-public class JAXBContextHelper {
-    // public static final String JAXB_CLASSES = "jaxb.classes";
-
-    // public static final String JAXB_CONTEXT_PATH = "jaxb.contextPath";
-
-    private static final JAXBContextCache cache = new JAXBContextCache();
-
-    private JAXBContextHelper() {
-    }
-
-    /**
-     * Create a JAXBContext for a given class
-     * @param cls
-     * @return
-     * @throws JAXBException
-     */
-    public static JAXBContext createJAXBContext(Class<?> cls) throws JAXBException {
-        return cache.getJAXBContext(cls);
-    }
-
-    public static JAXBContext createJAXBContext(TransformationContext tContext, boolean source) throws JAXBException {
-        if (tContext == null)
-            throw new TransformationException("JAXB context is not set for the transformation.");
-
-        // TODO: [rfeng] Need to figure out what's the best grantularity to create the JAXBContext
-        // per interface, operation or parameter
-        Operation op = source ? tContext.getSourceOperation() : tContext.getTargetOperation();
-        if (op != null) {
-            synchronized (op) {
-                JAXBContext context = op.getInputType().getMetaData(JAXBContext.class);
-                if (context == null) {
-                    context = createJAXBContext(getDataTypes(op, true));
-                    op.getInputType().setMetaData(JAXBContext.class, context);
-                }
-                return context;
-            }
-        }
-
-        // For property transformation, the operation can be null
-        DataType<?> dataType = source ? tContext.getSourceDataType() : tContext.getTargetDataType();
-        return createJAXBContext(dataType);
-
-    }
-
-    public static JAXBContext createJAXBContext(DataType dataType) throws JAXBException {
-        return createJAXBContext(findClasses(dataType));
-    }
-
-    public static Unmarshaller getUnmarshaller(JAXBContext context) throws JAXBException {
-        return cache.getUnmarshaller(context);
-    }
-
-    public static Marshaller getMarshaller(JAXBContext context) throws JAXBException {
-        return cache.getMarshaller(context);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Object createJAXBElement(JAXBContext context, DataType dataType, Object value) {
-        Class<?> type = dataType == null ? value.getClass() : dataType.getPhysical();
-        QName name = JAXBDataBinding.ROOT_ELEMENT;
-        if (context != null) {
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (logical instanceof XMLType) {
-                XMLType xmlType = (XMLType)logical;
-                if (xmlType.isElement()) {
-                    name = xmlType.getElementName();
-                } else {
-                    /**
-                     * Set the declared type to Object.class so that xsi:type
-                     * will be produced
-                     */
-                    type = Object.class;
-                }
-            } else {
-                type = Object.class;
-            }
-        }
-
-        JAXBIntrospector introspector = context.createJAXBIntrospector();
-        Object element = null;
-        if (value != null && introspector.isElement(value)) {
-            // NOTE: [rfeng] We cannot wrap an element in a JAXBElement
-            element = value;
-        }
-        if (element == null) {
-            element = new JAXBElement(name, type, value);
-        }
-        return element;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Object createReturnValue(JAXBContext context, DataType dataType, Object value) {
-        Class<?> cls = getJavaType(dataType);
-        if (cls == JAXBElement.class) {
-            return createJAXBElement(context, dataType, value);
-        } else {
-            if (value instanceof JAXBElement) {
-                return ((JAXBElement)value).getValue();
-            } else {
-                return value;
-            }
-        }
-    }
-
-    /**
-     * Create a JAXContext for an array of classes
-     * @param classes
-     * @return
-     * @throws JAXBException
-     */
-    public static JAXBContext createJAXBContext(Class<?>[] classes) throws JAXBException {
-        return cache.getJAXBContext(classes);
-    }
-
-    public static JAXBContext createJAXBContext(Set<Class<?>> classes) throws JAXBException {
-        return cache.getJAXBContext(classes);
-    }
-
-    /**
-     * Create a JAXBContext for a given java interface
-     * @param intf
-     * @return
-     * @throws JAXBException
-     */
-    public static JAXBContext createJAXBContext(Interface intf, boolean useWrapper) throws JAXBException {
-        synchronized (cache) {
-            LRUCache<Object, JAXBContext> map = cache.getCache();
-            Integer key = new Integer(System.identityHashCode(intf));
-            JAXBContext context = map.get(key);
-            if (context != null) {
-                return context;
-            }
-            List<DataType> dataTypes = getDataTypes(intf, useWrapper);
-            context = createJAXBContext(dataTypes);
-            map.put(key, context);
-            return context;
-        }
-    }
-
-    public static JAXBContext createJAXBContext(List<DataType> dataTypes) throws JAXBException {
-        JAXBContext context;
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        Set<Type> visited = new HashSet<Type>();
-        for (DataType d : dataTypes) {
-            findClasses(d, classes, visited);
-        }
-
-        context = createJAXBContext(classes);
-        return context;
-    }
-
-    private static Set<Class<?>> findClasses(DataType d) {
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        Set<Type> visited = new HashSet<Type>();
-        findClasses(d, classes, visited);
-        return classes;
-    }
-
-    private static void findClasses(DataType d, Set<Class<?>> classes, Set<Type> visited) {
-        if (d == null) {
-            return;
-        }
-        String db = d.getDataBinding();
-        if (JAXBDataBinding.NAME.equals(db) || (db != null && db.startsWith("java:")) || db == null) {
-            if (!d.getPhysical().isInterface() && !JAXBElement.class.isAssignableFrom(d.getPhysical())) {
-                classes.add(d.getPhysical());
-            }
-        }
-        if (d.getPhysical() != d.getGenericType()) {
-            findClasses(d.getGenericType(), classes, visited);
-        }
-    }
-
-    /**
-     * Find referenced classes in the generic type
-     * @param type
-     * @param classSet
-     * @param visited
-     */
-    private static void findClasses(Type type, Set<Class<?>> classSet, Set<Type> visited) {
-        if (visited.contains(type) || type == null) {
-            return;
-        }
-        visited.add(type);
-        if (type instanceof Class) {
-            Class<?> cls = (Class<?>)type;
-            if (!cls.isInterface()) {
-                classSet.add(cls);
-            }
-            return;
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType pType = (ParameterizedType)type;
-            findClasses(pType.getRawType(), classSet, visited);
-            for (Type t : pType.getActualTypeArguments()) {
-                findClasses(t, classSet, visited);
-            }
-        } else if (type instanceof TypeVariable) {
-            TypeVariable<?> tv = (TypeVariable<?>)type;
-            for (Type t : tv.getBounds()) {
-                findClasses(t, classSet, visited);
-            }
-        } else if (type instanceof GenericArrayType) {
-            GenericArrayType gType = (GenericArrayType)type;
-            findClasses(gType, classSet, visited);
-        } else if (type instanceof WildcardType) {
-            WildcardType wType = (WildcardType)type;
-            for (Type t : wType.getLowerBounds()) {
-                findClasses(t, classSet, visited);
-            }
-            for (Type t : wType.getUpperBounds()) {
-                findClasses(t, classSet, visited);
-            }
-        }
-    }
-
-    public static JAXBContext createJAXBContext(Interface intf) throws JAXBException {
-        return createJAXBContext(intf, true);
-    }
-
-    /**
-     * @param intf
-     * @param useWrapper Use wrapper classes?
-     * @return
-     */
-    private static List<DataType> getDataTypes(Interface intf, boolean useWrapper) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        for (Operation op : intf.getOperations()) {
-            getDataTypes(dataTypes, op, useWrapper);
-        }
-        return dataTypes;
-    }
-
-    private static List<DataType> getDataTypes(Operation op, boolean useWrapper) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        getDataTypes(dataTypes, op, useWrapper);
-        return dataTypes;
-    }
-
-    private static void getDataTypes(List<DataType> dataTypes, Operation op, boolean useWrapper) {
-        WrapperInfo wrapper = op.getWrapper();
-        if (useWrapper && wrapper != null) {
-            DataType dt1 = wrapper.getInputWrapperType();
-            if (dt1 != null) {
-                dataTypes.add(dt1);
-            }
-            DataType dt2 = wrapper.getOutputWrapperType();
-            if (dt2 != null) {
-                dataTypes.add(dt2);
-            }
-        }
-        // FIXME: [rfeng] We may need to find the referenced classes in the child types
-        // 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);
-            }
-        }
-    }
-
-    public static Class<?> getJavaType(DataType<?> dataType) {
-        if (dataType == null) {
-            return null;
-        }
-        Class type = dataType.getPhysical();
-        if (JAXBElement.class.isAssignableFrom(type)) {
-            Type generic = dataType.getGenericType();
-            type = Object.class;
-        }
-        if (type == Object.class && dataType.getLogical() instanceof XMLType) {
-            XMLType xType = (XMLType)dataType.getLogical();
-            Class javaType = SimpleTypeMapperImpl.getJavaType(xType.getTypeName());
-            if (javaType != null) {
-                type = javaType;
-            }
-        }
-        return type;
-    }
-
-    public static XMLType getXmlTypeName(Class<?> javaType) {
-        if (javaType.isInterface()) {
-            // JAXB doesn't support interfaces
-            return null;
-        }
-        String namespace = null;
-        String name = null;
-        Package pkg = javaType.getPackage();
-        if (pkg != null) {
-            XmlSchema schema = pkg.getAnnotation(XmlSchema.class);
-            if (schema != null) {
-                namespace = schema.namespace();
-            }
-        }
-
-        QName elementQName = null;
-        QName typeQName = null;
-        XmlRootElement rootElement = javaType.getAnnotation(XmlRootElement.class);
-        if (rootElement != null) {
-            String elementName = rootElement.name();
-            String elementNamespace = rootElement.namespace();
-            if (elementNamespace.equals("##default")) {
-                elementNamespace = namespace;
-            }
-            if (elementName.equals("##default")) {
-                elementName = Introspector.decapitalize(javaType.getSimpleName());
-            }
-            elementQName = new QName(elementNamespace, elementName);
-        }
-        XmlType type = javaType.getAnnotation(XmlType.class);
-        if (type != null) {
-            String typeNamespace = type.namespace();
-            String typeName = type.name();
-
-            if (typeNamespace.equals("##default")) {
-                // namespace is from the package
-                typeNamespace = namespace;
-            }
-
-            if (typeName.equals("##default")) {
-                typeName = Introspector.decapitalize(javaType.getSimpleName());
-            }
-            typeQName = new QName(typeNamespace, typeName);
-        } else {
-            XmlEnum xmlEnum = javaType.getAnnotation(XmlEnum.class);
-            if (xmlEnum != null) {
-                name = Introspector.decapitalize(javaType.getSimpleName());
-                typeQName = new QName(namespace, name);
-            }
-        }
-        if (elementQName == null && typeQName == null) {
-            return null;
-        }
-        return new XMLType(elementQName, typeQName);
-    }
-
-    public static Node generateSchema(JAXBContext context) throws Exception {
-        SchemaOutputResolverImpl resolver = new SchemaOutputResolverImpl();
-        context.generateSchema(resolver);
-        return resolver.getSchema();
-    }
-
-    public static class SchemaOutputResolverImpl extends SchemaOutputResolver {
-        private DOMResult result = new DOMResult();
-
-        @Override
-        public Result createOutput(String ns, String file) throws IOException {
-            result.setSystemId("sca:dom");
-            return result;
-        }
-
-        public Node getSchema() {
-            return result != null ? result.getNode() : null;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
deleted file mode 100644
index eebb4b2e37..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.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.databinding.jaxb;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-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.databinding.impl.DOMHelper;
-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.w3c.dom.Document;
-
-/**
- * JAXB DataBinding
- *
- * @version $Rev$ $Date$
- */
-public class JAXBDataBinding extends BaseDataBinding {
-    public static final String NAME = JAXBElement.class.getName();
-    public static final String[] ALIASES = new String[] {"jaxb"};
-
-    public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/jaxb/1.0";
-    public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
-    
-    private JAXBWrapperHandler wrapperHandler;
-    private JAXBTypeHelper xmlTypeHelper;
-    
-    public JAXBDataBinding() {
-        super(NAME, ALIASES, JAXBElement.class);
-        this.wrapperHandler = new JAXBWrapperHandler();
-        this.xmlTypeHelper = new JAXBTypeHelper();
-    }
-
-    @Override
-    public boolean introspect(DataType dataType, Operation operation) {
-        Class javaType = dataType.getPhysical();
-        if (JAXBElement.class.isAssignableFrom(javaType)) {
-            Type type = javaType.getGenericSuperclass();
-            if (type instanceof ParameterizedType) {
-                ParameterizedType parameterizedType = ((ParameterizedType)type);
-                Type rawType = parameterizedType.getRawType();
-                if (rawType == JAXBElement.class) {
-                    Type actualType = parameterizedType.getActualTypeArguments()[0];
-                    if (actualType instanceof Class) {
-                        XMLType xmlType = JAXBContextHelper.getXmlTypeName((Class)actualType);
-                        dataType.setLogical(xmlType);
-                        dataType.setDataBinding(NAME);
-                        return true;
-                    }
-                }
-            }
-            if (dataType.getLogical() == null) {
-                dataType.setLogical(XMLType.UNKNOWN);
-            }
-            dataType.setDataBinding(NAME);
-            return true;
-        }
-
-        XMLType xmlType = JAXBContextHelper.getXmlTypeName(javaType);
-        if (xmlType == null) {
-            return false;
-        }
-        dataType.setLogical(xmlType);
-        dataType.setDataBinding(NAME);
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object copy(Object arg, DataType dataType, Operation operation) {
-        try {
-            boolean isElement = false;
-            if (dataType == null) {
-                Class cls = arg.getClass();
-                if (arg instanceof JAXBElement) {
-                    isElement = true;
-                    cls = ((JAXBElement)arg).getDeclaredType();
-                }
-                dataType = new DataTypeImpl<XMLType>(NAME, cls, XMLType.UNKNOWN);
-            }
-            JAXBContext context = JAXBContextHelper.createJAXBContext(dataType);
-            arg = JAXBContextHelper.createJAXBElement(context, dataType, arg);
-            Document doc = DOMHelper.newDocument();
-            context.createMarshaller().marshal(arg, doc);
-            Object value = context.createUnmarshaller().unmarshal(doc, dataType.getPhysical());
-            if (isElement && value instanceof JAXBElement) {
-                return value;
-            }
-            return JAXBContextHelper.createReturnValue(context, dataType, value);
-        } catch (Exception e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return wrapperHandler;
-    }
-
-    @Override
-    public XMLTypeHelper getXMLTypeHelper() {
-        // return new JAXBTypeHelper();
-        return xmlTypeHelper;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
deleted file mode 100644
index b85cbb0f42..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.jaxb;
-
-import java.beans.IndexedPropertyDescriptor;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A PropertyDescriptor provides acesss to a bean property.  Values can be queried/changed using the
- * read and writer methods of the PropertyDescriptor.
- * <p/>
- * A PropertyDescriptorPlus object wraps a PropertyDescriptor and supplies enhanced set/get methods
- * that match JAXB semantis.
- * <p/>
- * For example, the set(..) method is smart enough to add lists, arrays and atomic values on JAXB
- * beans.
- * <p/>
- * The PropertyDescriptorPlus object also stores the xmlName of the property.
- *
- * @See XMLRootElementUtil.createPropertyDescriptorMap , which creates the PropertyDescriptorPlus
- * objects
- */
-public class JAXBPropertyDescriptor implements Comparable<JAXBPropertyDescriptor> {
-    PropertyDescriptor descriptor;
-    QName xmlName = null;
-    int index;
-
-    /**
-     * Package protected constructor.  Only created by XMLRootElementUtil.createPropertyDescriptorMap
-     * @param descriptor
-     * @param index TODO
-     * @param propertyName
-     *
-     * @see XMLRootElementUtil.createPropertyDescriptorMap
-     */
-    JAXBPropertyDescriptor(PropertyDescriptor descriptor, QName xmlName, int index) {
-        super();
-        this.descriptor = descriptor;
-        this.xmlName = xmlName;
-    }
-
-    /**
-     * Package protected constructor.  Only created by XMLRootElementUtil.createPropertyDescriptorMap
-     * @param descriptor
-     * @param index TODO
-     * @param propertyName
-     *
-     * @see XMLRootElementUtil.createPropertyDescriptorMap
-     */
-    JAXBPropertyDescriptor(PropertyDescriptor descriptor, String xmlName, int index) {
-        super();
-        this.descriptor = descriptor;
-        this.xmlName = new QName("", xmlName);
-    }
-
-    public int compareTo(JAXBPropertyDescriptor o) {
-        return index - o.index;
-    }
-
-    /** @return xmlname */
-    public String getXmlName() {
-        return xmlName.getLocalPart();
-    }
-
-    public QName getXmlQName() {
-        return xmlName;
-    }
-
-    /** @return property type */
-    public Class<?> getPropertyType() {
-        return descriptor.getPropertyType();
-    }
-
-    /** @return property name */
-    public String getPropertyName() {
-        return descriptor.getName();
-    }
-
-    /**
-     * Get the object
-     *
-     * @param targetBean
-     * @return Object for this property or null
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     */
-    public Object get(Object targetBean) throws InvocationTargetException, IllegalAccessException {
-        Method method = descriptor.getReadMethod();
-        if (method == null && descriptor.getPropertyType() == Boolean.class) {
-            String propertyName = descriptor.getName();
-            if (propertyName != null) {
-                String methodName = "is";
-                methodName =
-                    methodName + ((propertyName.length() > 0) ? propertyName.substring(0, 1).toUpperCase() : "");
-                methodName = methodName + ((propertyName.length() > 1) ? propertyName.substring(1) : "");
-                try {
-                    method = targetBean.getClass().getMethod(methodName);
-                } catch (NoSuchMethodException e) {
-                }
-            }
-        }
-        if (method == null) {
-            throw new ServiceRuntimeException("No getter is found");
-        }
-        Object ret = method.invoke(targetBean);
-        if (method.getReturnType() == JAXBElement.class) {
-            ret = ((JAXBElement<?>)ret).getValue();
-        }
-        return ret;
-    }
-
-    /**
-     * Set the object
-     *
-     * @param targetBean
-     * @param propValue
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws JAXBWrapperException
-     */
-    public void set(Object targetBean, Object propValue) throws InvocationTargetException, IllegalAccessException,
-        JAXBWrapperException {
-
-        Method writeMethod = null;
-        try {
-            // No set occurs if the value is null
-            if (propValue == null) {
-                return;
-            }
-
-            // There are 3 different types of setters that can occur.
-            // 1) Normal Attomic Setter : setFoo(type)
-            // 2) Indexed Array Setter : setFoo(type[])
-            // 3) No Setter case if the property is a List<T>.
-
-            writeMethod = descriptor.getWriteMethod();
-            if (descriptor instanceof IndexedPropertyDescriptor) {
-                // Set for indexed  T[]
-                setIndexedArray(targetBean, propValue, writeMethod);
-            } else if (writeMethod == null) {
-                // Set for List<T>
-                setList(targetBean, propValue);
-            } else if (descriptor.getPropertyType() == JAXBElement.class) {
-                if (propValue != null) {
-                    Class<?> clazz = propValue.getClass();
-                    JAXBElement<?> element = new JAXBElement(xmlName, clazz, propValue);
-                    setAtomic(targetBean, element, writeMethod);
-                }
-            } else {
-                // Normal case
-                setAtomic(targetBean, propValue, writeMethod);
-            }
-        } catch (RuntimeException e) {
-            throw e;
-        }
-    }
-
-    /**
-     * Set the property value onto targetBean using the writeMethod
-     *
-     * @param targetBean
-     * @param propValue
-     * @param writeMethod (set(T))
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws JAXBWrapperException
-     */
-    private void setAtomic(Object targetBean, Object propValue, Method writeMethod) throws InvocationTargetException,
-        IllegalAccessException, JAXBWrapperException {
-        // JAXB provides setters for atomic value.
-
-        if (propValue != null) {
-            // Normal case
-            Object[] SINGLE_PARAM = new Object[1];
-            SINGLE_PARAM[0] = propValue;
-            writeMethod.invoke(targetBean, SINGLE_PARAM);
-        } else {
-            Class<?>[] paramTypes = writeMethod.getParameterTypes();
-
-            if (paramTypes != null && paramTypes.length == 1) {
-                Class<?> paramType = paramTypes[0];
-                if (paramType.isPrimitive() && propValue == null) {
-                    //Ignoring null value for primitive type, this could potentially be the way of a customer indicating to set
-                    //default values defined in JAXBObject/xmlSchema.
-                    return;
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Set the property value using the indexed array setter
-     *
-     * @param targetBean
-     * @param propValue
-     * @param writeMethod set(T[])
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws JAXBWrapperException
-     */
-    private void setIndexedArray(Object targetBean, Object propValue, Method writeMethod)
-        throws InvocationTargetException, IllegalAccessException, JAXBWrapperException {
-
-        Class<?> paramType = writeMethod.getParameterTypes()[0];
-        Object value = asArray(propValue, paramType);
-        // JAXB provides setters for atomic value.
-        Object[] SINGLE_PARAM = new Object[1];
-        SINGLE_PARAM[0] = value;
-
-        writeMethod.invoke(targetBean, SINGLE_PARAM);
-    }
-
-    /**
-     * Set the property value for the collection case.
-     *
-     * @param targetBean
-     * @param propValue
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws JAXBWrapperException
-     */
-    private void setList(Object targetBean, Object propValue) throws InvocationTargetException, IllegalAccessException,
-        JAXBWrapperException {
-        // For the List<T> case, there is no setter. 
-        // You are supposed to use the getter to obtain access to the collection and then add the collection
-
-        Collection value = asCollection(propValue, descriptor.getPropertyType());
-        Collection collection = (Collection)get(targetBean);
-
-        // Now add our our object to the collection
-        collection.clear();
-        if (propValue != null) {
-            collection.addAll(value);
-        }
-    }
-
-    /**
-     * @param propValue
-     * @param destType
-     * @return propValue as a Collection
-     */
-    private static Collection asCollection(Object propValue, Class<?> destType) {
-        // TODO Missing function
-        // Convert the object into an equivalent object that is a collection
-        if (DataConverter.isConvertable(propValue, destType)) {
-            return (Collection)DataConverter.convert(propValue, destType);
-        } else {
-            String objectClass = (propValue == null) ? "null" : propValue.getClass().getName();
-            throw new ServiceRuntimeException("Cannot convert " + objectClass);
-        }
-    }
-
-    /**
-     * @param propValue
-     * @param destType  T[]
-     * @return array of component type
-     */
-    private static Object asArray(Object propValue, Class<?> destType) {
-        if (DataConverter.isConvertable(propValue, destType)) {
-            return DataConverter.convert(propValue, destType);
-        } else {
-            String objectClass = (propValue == null) ? "null" : propValue.getClass().getName();
-            throw new ServiceRuntimeException("Cannot convert " + objectClass);
-
-        }
-    }
-
-    public String toString() {
-        String value = "PropertyDescriptorPlus[";
-        value += " name=" + this.getPropertyName();
-        value += " type=" + this.getPropertyType().getName();
-        value += " propertyDecriptor=" + this.descriptor;
-        return value + "]";
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
deleted file mode 100644
index 8c7ab2f8cd..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.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.databinding.jaxb;
-
-import java.beans.Introspector;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.SchemaOutputResolver;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Result;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamResult;
-
-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.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.osoa.sca.ServiceRuntimeException;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-public class JAXBTypeHelper implements XMLTypeHelper {
-    private static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
-    private static final String ANYTYPE_NAME = "anyType";
-    private static final QName ANYTYPE_QNAME = new QName(SCHEMA_NS, ANYTYPE_NAME);
-
-    // private List<Class<?>> types = new ArrayList<Class<?>>();
-
-    public JAXBTypeHelper() {
-        super();
-    }
-
-    public TypeInfo getTypeInfo(Class javaType, Object logical) {
-        QName xmlType = JavaXMLMapper.getXMLType(javaType);
-        if (xmlType != null) {
-            return new TypeInfo(xmlType, true, null);
-        } else if (javaType.isInterface()) {
-            return new TypeInfo(ANYTYPE_QNAME, true, null);
-        } else {
-            // types.add(javaType);
-            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);
-        }
-    }
-
-    /*
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver) {
-        List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-        generateJAXBSchemas(definitions, factory);
-        return definitions;
-    }
-    */
-
-    public static Map<String, String> generateSchema(JAXBContext context) throws IOException {
-        StringResolverImpl resolver = new StringResolverImpl();
-        context.generateSchema(resolver);
-        Map<String, String> xsds = new HashMap<String, String>();
-        for (Map.Entry<String, StreamResult> xsd : resolver.getResults().entrySet()) {
-            xsds.put(xsd.getKey(), xsd.getValue().getWriter().toString());
-        }
-        return xsds;
-    }
-
-    private static class XSDResolver implements URIResolver {
-        private Map<String, String> xsds;
-
-        public XSDResolver(Map<String, String> xsds) {
-            super();
-            this.xsds = xsds;
-        }
-
-        public InputSource resolveEntity(java.lang.String namespace,
-                                         java.lang.String schemaLocation,
-                                         java.lang.String baseUri) {
-            String xsd = xsds.get(schemaLocation);
-            if (xsd == null) {
-                return null;
-            }
-            return new InputSource(new StringReader(xsd));
-        }
-
-    }
-
-    /*
-    private void generateJAXBSchemas1(List<XSDefinition> definitions, XSDFactory factory) {
-        if (types.size() > 0) {
-            try {
-                XmlSchemaCollection collection = new XmlSchemaCollection();
-                Class[] typesArray = new Class[types.size()];
-                typesArray = types.toArray(typesArray);
-                JAXBContext context = JAXBContextHelper.createJAXBContext(typesArray);
-                Map<String, String> results = generateSchema(context);
-                collection.setSchemaResolver(new XSDResolver(results));
-
-                for (Map.Entry<String, String> entry : results.entrySet()) {
-                    XSDefinition definition = factory.createXSDefinition();
-                    int index = entry.getKey().lastIndexOf('#');
-                    String ns = entry.getKey().substring(0, index);
-                    String file = entry.getKey().substring(index + 1);
-                    definition.setUnresolved(true);
-                    definition.setNamespace(ns);
-                    definition.setSchema(collection.read(new StringReader(entry.getValue()), null));
-                    definition.setSchemaCollection(collection);
-                    definition.setUnresolved(false);
-                    definitions.add(definition);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-    */
-
-    private static class DOMResolverImpl extends SchemaOutputResolver {
-        private Map<String, DOMResult> results = new HashMap<String, DOMResult>();
-
-        @Override
-        public Result createOutput(String ns, String file) throws IOException {
-            DOMResult result = new DOMResult();
-            // TUSCANY-2498: Set the system id to "" so that the xsd:import doesn't produce 
-            // an illegal schemaLocation attr 
-            result.setSystemId("");
-            results.put(ns, result);
-            return result;
-        }
-
-        public Map<String, DOMResult> getResults() {
-            return results;
-        }
-    }
-
-    /*
-    private void generateJAXBSchemas(List<XSDefinition> definitions, XSDFactory factory) {
-        if (types.size() > 0) {
-            try {
-                Class<?>[] typesArray = new Class<?>[types.size()];
-                typesArray = types.toArray(typesArray);
-                JAXBContext context = JAXBContext.newInstance(typesArray);
-                generateSchemas(definitions, factory, context);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-    */
-
-    private void generateSchemas(List<XSDefinition> definitions, XSDFactory factory, JAXBContext context)
-        throws IOException {
-        DOMResolverImpl resolver = new DOMResolverImpl();
-        context.generateSchema(resolver);
-        Map<String, DOMResult> results = resolver.getResults();
-        for (Map.Entry<String, DOMResult> entry : results.entrySet()) {
-            XSDefinition definition = factory.createXSDefinition();
-            definition.setUnresolved(true);
-            definition.setDocument((Document)entry.getValue().getNode());
-            definition.setNamespace(entry.getKey());
-            URI location = null;
-            try {
-                location = new URI(entry.getValue().getSystemId());
-            } catch (URISyntaxException e) {
-                // ignore: use null value
-            }    
-            definition.setLocation(location);
-            definitions.add(definition);
-        }
-    }
-
-    private static class StringResolverImpl extends SchemaOutputResolver {
-        private Map<String, StreamResult> results = new HashMap<String, StreamResult>();
-
-        @Override
-        public Result createOutput(String ns, String file) throws IOException {
-            StringWriter sw = new StringWriter();
-            StreamResult result = new StreamResult(sw);
-            String sysId = ns + '#' + file;
-            result.setSystemId(sysId);
-            results.put(sysId, result);
-            return result;
-        }
-
-        public Map<String, StreamResult> getResults() {
-            return results;
-        }
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, Interface intf) {
-        try {
-            JAXBContext context = JAXBContextHelper.createJAXBContext(intf, false);
-            List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-            generateSchemas(definitions, factory, context);
-            return definitions;
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, List<DataType> dataTypes) {
-        try {
-
-            JAXBContext context = JAXBContextHelper.createJAXBContext(dataTypes);
-            List<XSDefinition> definitions = new ArrayList<XSDefinition>();
-            generateSchemas(definitions, factory, context);
-            return definitions;
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
deleted file mode 100644
index f83c7f09d9..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.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.databinding.jaxb;
-
-import org.osoa.sca.ServiceRuntimeException;
-
-public class JAXBWrapperException extends ServiceRuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     *
-     */
-    public JAXBWrapperException() {
-        super();
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public JAXBWrapperException(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-    /** @param message  */
-    public JAXBWrapperException(String message) {
-        super(message);
-
-    }
-
-    /** @param cause  */
-    public JAXBWrapperException(Throwable cause) {
-        super(cause);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
deleted file mode 100644
index a1f4c12c8f..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.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.databinding.jaxb;
-
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.TransformationException;
-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;
-
-/**
- * JAXB WrapperHandler implementation
- *
- * @version $Rev$ $Date$
- */
-public class JAXBWrapperHandler implements WrapperHandler<Object> {
-    private JAXBWrapperHelper helper = new JAXBWrapperHelper();
-
-    public Object create(Operation operation, boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        final Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-        try {
-            if (wrapperClass == null) {
-                return null;
-            }
-            return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws Exception {
-                    return wrapperClass.newInstance();
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    public void setChildren(Object wrapper, Object[] childObjects, Operation operation, boolean input) {
-        List<ElementInfo> childElements =
-            input ? operation.getWrapper().getInputChildElements() : operation.getWrapper().getOutputChildElements();
-        List<String> childNames = new ArrayList<String>();
-        Map<String, Object> values = new HashMap<String, Object>();
-        for (int i = 0; i < childElements.size(); i++) {
-            ElementInfo e = childElements.get(i);
-            String name = e.getQName().getLocalPart();
-            childNames.add(name);
-            values.put(name, childObjects[i]);
-        }
-        // Get the property descriptor map
-        Map<String, JAXBPropertyDescriptor> pdMap = null;
-        try {
-            pdMap = XMLRootElementUtil.createPropertyDescriptorMap(wrapper.getClass());
-        } catch (Throwable t) {
-            throw new JAXBWrapperException(t);
-        }
-        helper.wrap(wrapper, childNames, values, pdMap);
-    }
-
-    public void setChild(Object wrapper, int i, ElementInfo childElement, Object value) {
-        Object wrapperValue = wrapper;
-        Class<?> wrapperClass = wrapperValue.getClass();
-
-        // FIXME: We probably should use the jaxb-reflection to handle the properties
-        try {
-            String prop = childElement.getQName().getLocalPart();
-            boolean collection = (value instanceof Collection);
-            Method getter = null;
-            for (Method m : wrapperClass.getMethods()) {
-                Class<?>[] paramTypes = m.getParameterTypes();
-                if (paramTypes.length == 1 && m.getName().equals("set" + capitalize(prop))) {
-                    m.invoke(wrapperValue, new Object[] {value});
-                    return;
-                }
-                if (collection && paramTypes.length == 0 && m.getName().equals("get" + capitalize(prop))) {
-                    getter = m;
-                }
-            }
-            if (getter != null && Collection.class.isAssignableFrom(getter.getReturnType())) {
-                ((Collection)getter.invoke(wrapperValue)).addAll((Collection)value);
-            }
-
-        } catch (Throwable e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    private static String capitalize(String name) {
-        char first = Character.toUpperCase(name.charAt(0));
-        return first + name.substring(1);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getChildren(java.lang.Object, Operation, boolean)
-     */
-    public List getChildren(Object wrapper, Operation operation, boolean input) {
-        List<ElementInfo> childElements = input? operation.getWrapper().getInputChildElements():
-            operation.getWrapper().getOutputChildElements();
-
-        List<String> childNames = new ArrayList<String>();
-        for (ElementInfo e : childElements) {
-            childNames.add(e.getQName().getLocalPart());
-        }
-        return Arrays.asList(helper.unwrap(wrapper, childNames));
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#getWrapperType(Operation, boolean)
-     */
-    public DataType getWrapperType(Operation operation, boolean input) {
-        WrapperInfo wrapper = operation.getWrapper();
-        DataType dt = input ? wrapper.getInputWrapperType() : wrapper.getOutputWrapperType();
-        return dt;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.WrapperHandler#isInstance(java.lang.Object, Operation, boolean)
-     */
-    public boolean isInstance(Object wrapper, Operation operation, boolean input) {
-        Class<?> wrapperClass =
-            input ? operation.getWrapper().getInputWrapperClass() : operation.getWrapper().getOutputWrapperClass();
-        return wrapperClass == null ? false : wrapperClass.isInstance(wrapper);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
deleted file mode 100644
index 5f90aa4d7a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.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.databinding.jaxb;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The JAXBWrapper tool is used to create a JAXB Object from a series of child objects (wrap) or get
- * the child objects from a JAXB Object (unwrap)
- */
-public class JAXBWrapperHelper {
-
-    /**
-     * unwrap Returns the list of child objects of the jaxb object
-     *
-     * @param jaxbObject that represents the type
-     * @param childNames list of xml child names as String
-     * @param pdMap      PropertyDescriptor map for this jaxbObject
-     * @return list of Objects in the same order as the element names.
-     */
-    public Object[] unwrap(Object jaxbObject, List<String> childNames, Map<String, JAXBPropertyDescriptor> pdMap)
-        throws JAXBWrapperException {
-
-        // Get the object that will have the property descriptors (i.e. the object representing the complexType)
-        Object jaxbComplexTypeObj = jaxbObject;
-
-        // Get the PropertyDescriptorPlus map.
-        // The method makes sure that each child name has a matching jaxb property
-        // checkPropertyDescriptorMap(jaxbComplexTypeObj.getClass(), childNames, pdMap);
-
-        // Get the corresponsing objects from the jaxb bean
-        ArrayList<Object> objList = new ArrayList<Object>();
-        int index = 0;
-        for (String childName : childNames) {
-            JAXBPropertyDescriptor propInfo = getPropertyDescriptor(pdMap, childName, index);
-
-            Object object = null;
-            try {
-                object = propInfo.get(jaxbComplexTypeObj);
-            } catch (Throwable e) {
-                throw new JAXBWrapperException(e);
-            }
-
-            objList.add(object);
-            index++;
-        }
-        Object[] jaxbObjects = objList.toArray();
-        objList = null;
-        return jaxbObjects;
-
-    }
-
-    private JAXBPropertyDescriptor getPropertyDescriptor(Map<String, JAXBPropertyDescriptor> pdMap,
-                                                         String childName,
-                                                         int index) {
-        JAXBPropertyDescriptor propInfo = pdMap.get(childName);
-        if (propInfo == null) {
-            // FIXME: [rfeng] Sometimes the child element names don't match. Get chilld by location?
-            List<JAXBPropertyDescriptor> props = new ArrayList<JAXBPropertyDescriptor>(pdMap.values());
-            // Sort the properties by index. We might need to take propOrder into consideration
-            Collections.sort(props);
-            propInfo = props.get(index);
-        }
-        return propInfo;
-    }
-
-    /**
-     * wrap Creates a jaxb object that is initialized with the child objects.
-     * <p/>
-     * Note that the jaxbClass must be the class the represents the complexType. (It should never be
-     * JAXBElement)
-     *
-     * @param jaxbClass
-     * @param childNames    list of xml child names as String
-     * @param childObjects, component type objects
-     * @param pdMap         PropertyDescriptor map for this jaxbObject
-     */
-    public Object wrap(Class<?> jaxbClass,
-                       List<String> childNames,
-                       Map<String, Object> childObjects,
-                       Map<String, JAXBPropertyDescriptor> pdMap) throws JAXBWrapperException {
-
-        // Just like unWrap, get the property info map
-        // checkPropertyDescriptorMap(jaxbClass, childNames, pdMap);
-
-        // The jaxb object always has a default constructor.  Create the object
-        Object jaxbObject = null;
-        try {
-            jaxbObject = jaxbClass.newInstance();
-        } catch (Throwable t) {
-            throw new JAXBWrapperException(t);
-        }
-
-        wrap(jaxbObject, childNames, childObjects, pdMap);
-
-        // Return the jaxb object 
-        return jaxbObject;
-    }
-
-    public void wrap(Object jaxbObject,
-                     List<String> childNames,
-                     Map<String, Object> childObjects,
-                     Map<String, JAXBPropertyDescriptor> pdMap) {
-        // Now set each object onto the jaxb object
-        int index = 0;
-        for (String childName : childNames) {
-            JAXBPropertyDescriptor propInfo = getPropertyDescriptor(pdMap, childName, index);
-            Object value = childObjects.get(childName);
-            try {
-                propInfo.set(jaxbObject, value);
-            } catch (Throwable t) {
-                throw new JAXBWrapperException(t);
-            }
-            index++;
-        }
-    }
-
-    public Object[] unwrap(Object jaxbObject, List<String> childNames) throws JAXBWrapperException {
-        // Get the property descriptor map for this JAXBClass
-        Class<?> jaxbClass = jaxbObject.getClass();
-        Map<String, JAXBPropertyDescriptor> pdMap = null;
-        try {
-            pdMap = XMLRootElementUtil.createPropertyDescriptorMap(jaxbClass);
-        } catch (Throwable t) {
-            throw new JAXBWrapperException(t);
-        }
-
-        // Delegate
-        return unwrap(jaxbObject, childNames, pdMap);
-    }
-
-    public Object wrap(Class<?> jaxbClass, List<String> childNames, Map<String, Object> childObjects)
-        throws JAXBWrapperException {
-        // Get the property descriptor map
-        Map<String, JAXBPropertyDescriptor> pdMap = null;
-        try {
-            pdMap = XMLRootElementUtil.createPropertyDescriptorMap(jaxbClass);
-        } catch (Throwable t) {
-            throw new JAXBWrapperException(t);
-        }
-
-        // Delegate
-        return wrap(jaxbClass, childNames, childObjects, pdMap);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
deleted file mode 100644
index e375a9b85e..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.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.jaxb;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Node2JAXB extends BaseTransformer<Node, Object> implements PullTransformer<Node, Object> {
-
-    public Node2JAXB() {
-        super();
-    }
-
-    public Object transform(Node source, TransformationContext context) {
-        if (source == null)
-            return null;
-        try {
-            JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, false);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            Object result = unmarshaller.unmarshal(source, JAXBContextHelper.getJavaType(context.getTargetDataType()));
-            return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
deleted file mode 100644
index 840edfd234..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.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.jaxb;
-
-import java.io.Reader;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
-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 Reader2JAXB extends BaseTransformer<Reader, Object> implements
-    PullTransformer<Reader, Object> {
-
-    public Object transform(final Reader source, final TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, false);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            StreamSource streamSource = new StreamSource(source);
-            Object result = unmarshaller.unmarshal(streamSource, JAXBContextHelper.getJavaType(context.getTargetDataType()));
-            return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Reader> getSourceType() {
-        return Reader.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JAXBDataBinding.NAME;
-    }    
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
deleted file mode 100644
index 5559690de8..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.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.databinding.jaxb;
-
-import java.io.StringReader;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-
-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.XMLStringDataBinding;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class String2JAXB extends BaseTransformer<String, Object> implements
-    PullTransformer<String, Object> {
-
-    public Object transform(final String source, final TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, false);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            StreamSource streamSource = new StreamSource(new StringReader(source));
-            Object result = unmarshaller.unmarshal(streamSource, JAXBContextHelper.getJavaType(context.getTargetDataType()));
-            return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return XMLStringDataBinding.NAME;
-    }    
-    
-    @Override
-    public String getTargetDataBinding() {
-        return JAXBDataBinding.NAME;
-    }    
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
deleted file mode 100644
index 5fa98b5ed1..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.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.databinding.jaxb;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface XMLAdapterExtensionPoint {
-    /**
-     * @param boundType
-     * @param adapter
-     */
-    void addAdapter(Class<?> boundType, Class<? extends XmlAdapter> adapter);
-
-    /**
-     * @param boundType
-     * @return
-     */
-    Class<? extends XmlAdapter> getAdapter(Class<?> boundType);
-
-    /**
-     * @param boundType
-     * @return
-     */
-    Class<? extends XmlAdapter> removeAdapter(Class<?> boundType);
-
-    /**
-     * @return
-     */
-    Map<Class<?>, Class<? extends XmlAdapter>> getAdapters();
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
deleted file mode 100644
index ad4bd04084..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.jaxb;
-
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.namespace.QName;
-
-/**
- * 
- */
-public class XMLRootElementUtil {
-
-    /** Constructor is intentionally private.  This class only provides static utility methods */
-    private XMLRootElementUtil() {
-
-    }
-
-    /**
-     * @param clazz
-     * @return namespace of root element qname or null if this is not object does not represent a
-     *         root element
-     */
-    public static QName getXmlRootElementQNameFromObject(Object obj) {
-
-        // A JAXBElement stores its name
-        if (obj instanceof JAXBElement) {
-            return ((JAXBElement<?>)obj).getName();
-        }
-
-        Class<?> clazz = (obj instanceof java.lang.Class) ? (Class<?>)obj : obj.getClass();
-        return getXmlRootElementQName(clazz);
-    }
-
-    /**
-     * @param clazz
-     * @return namespace of root element qname or null if this is not object does not represent a
-     *         root element
-     */
-    public static QName getXmlRootElementQName(Class<?> clazz) {
-
-        // See if the object represents a root element
-        XmlRootElement root = (XmlRootElement)getAnnotation(clazz, XmlRootElement.class);
-        if (root == null) {
-            return null;
-        }
-
-        String name = root.name();
-        String namespace = root.namespace();
-
-        // The name may need to be defaulted
-        if (name == null || name.length() == 0 || name.equals("##default")) {
-            name = getSimpleName(clazz.getCanonicalName());
-        }
-
-        // The namespace may need to be defaulted
-        if (namespace == null || namespace.length() == 0 || namespace.equals("##default")) {
-            Package pkg = clazz.getPackage();
-            XmlSchema schema = (XmlSchema)getAnnotation(pkg, XmlSchema.class);
-            if (schema != null) {
-                namespace = schema.namespace();
-            } else {
-                namespace = "";
-            }
-        }
-
-        return new QName(namespace, name);
-    }
-
-    /**
-     * @param clazz
-     * @return namespace of root element qname or null if this is not object does not represent a root element
-     */
-    public static String getEnumValue(Enum<?> myEnum) {
-        Field f;
-        String value;
-        try {
-            f = myEnum.getClass().getField(myEnum.name());
-
-            f.setAccessible(true);
-
-            XmlEnumValue xev = (XmlEnumValue)getAnnotation(f, XmlEnumValue.class);
-            if (xev == null) {
-                value = f.getName();
-            } else {
-                value = xev.value();
-            }
-        } catch (SecurityException e) {
-            value = null;
-        } catch (NoSuchFieldException e) {
-            value = null;
-        }
-
-        return value;
-    }
-
-    /**
-     * utility method to get the last token in a "."-delimited package+classname string
-     *
-     * @return
-     */
-    private static String getSimpleName(String in) {
-        if (in == null || in.length() == 0) {
-            return in;
-        }
-        String out = null;
-        StringTokenizer tokenizer = new StringTokenizer(in, ".");
-        if (tokenizer.countTokens() == 0)
-            out = in;
-        else {
-            while (tokenizer.hasMoreTokens()) {
-                out = tokenizer.nextToken();
-            }
-        }
-        return out;
-    }
-
-    /**
-     * The JAXBClass has a set of bean properties each represented by a PropertyDescriptor Each of
-     * the fields of the class has an associated xml name. The method returns a map where the key is
-     * the xml name and value is the PropertyDescriptor
-     *
-     * @param jaxbClass
-     * @return map
-     */
-    public static Map<String, JAXBPropertyDescriptor> createPropertyDescriptorMap(Class<?> jaxbClass)
-        throws NoSuchFieldException, IntrospectionException {
-
-        PropertyDescriptor[] pds = Introspector.getBeanInfo(jaxbClass).getPropertyDescriptors();
-        Map<String, JAXBPropertyDescriptor> map = new HashMap<String, JAXBPropertyDescriptor>();
-
-        // Unfortunately the element names are stored on the fields.
-        // Get all of the fields in the class and super classes
-
-        List<Field> fields = getFields(jaxbClass);
-
-        // Now match up the fields with the property descriptors...Sigh why didn't JAXB put the @XMLElement annotations on the 
-        // property methods!
-        for (PropertyDescriptor pd : pds) {
-
-            // Skip over the class property..it is never represented as an xml element
-            if (pd.getName().equals("class")) {
-                continue;
-            }
-
-            // For the current property, find a matching field...so that we can get the xml name
-            boolean found = false;
-
-            int index = 0;
-            for (Field field : fields) {
-                String fieldName = field.getName();
-
-                // Use the name of the field and property to find the match
-                if (fieldName.equalsIgnoreCase(pd.getDisplayName()) || fieldName.equalsIgnoreCase(pd.getName())) {
-                    // Get the xmlElement name for this field
-                    QName xmlName = getXmlElementRefOrElementQName(field.getDeclaringClass(), field);
-                    found = true;
-                    map.put(xmlName.getLocalPart(), new JAXBPropertyDescriptor(pd, xmlName, index));
-                    index++;
-                    break;
-                }
-
-                // Unfortunately, sometimes the field name is preceeded by an underscore
-                if (fieldName.startsWith("_")) {
-                    fieldName = fieldName.substring(1);
-                    if (fieldName.equalsIgnoreCase(pd.getDisplayName()) || fieldName.equalsIgnoreCase(pd.getName())) {
-                        // Get the xmlElement name for this field
-                        QName xmlName = getXmlElementRefOrElementQName(field.getDeclaringClass(), field);
-                        found = true;
-
-                        map.put(xmlName.getLocalPart(), new JAXBPropertyDescriptor(pd, xmlName, index));
-                        index++;
-                        break;
-                    }
-                }
-            }
-
-            // We didn't find a field.  Default the xmlname to the property name
-            if (!found) {
-                String xmlName = pd.getName();
-
-                map.put(xmlName, new JAXBPropertyDescriptor(pd, xmlName, index));
-                index++;
-            }
-
-        }
-        return map;
-    }
-
-    /**
-     * Gets all of the fields in this class and the super classes
-     *
-     * @param beanClass
-     * @return
-     */
-    static private List<Field> getFields(final Class<?> beanClass) {
-        // This class must remain private due to Java 2 Security concerns
-        List<Field> fields = AccessController.doPrivileged(new PrivilegedAction<List<Field>>() {
-            public List<Field> run() {
-                List<Field> fields = new ArrayList<Field>();
-                Class<?> cls = beanClass;
-                while (cls != null) {
-                    Field[] fieldArray = cls.getDeclaredFields();
-                    for (Field field : fieldArray) {
-                        fields.add(field);
-                    }
-                    cls = cls.getSuperclass();
-                }
-                return fields;
-            }
-        });
-
-        return fields;
-    }
-
-    /**
-     * Get the name of the field by looking at the XmlElement annotation.
-     *
-     * @param jaxbClass
-     * @param fieldName
-     * @return
-     * @throws NoSuchFieldException
-     */
-    private static QName getXmlElementRefOrElementQName(Class<?> jaxbClass, Field field) throws NoSuchFieldException {
-        XmlElementRef xmlElementRef = (XmlElementRef)getAnnotation(field, XmlElementRef.class);
-        if (xmlElementRef != null) {
-            return new QName(xmlElementRef.namespace(), xmlElementRef.name());
-        }
-        XmlElement xmlElement = (XmlElement)getAnnotation(field, XmlElement.class);
-
-        // If XmlElement does not exist, default to using the field name
-        if (xmlElement == null || xmlElement.name().equals("##default")) {
-            return new QName("", field.getName());
-        }
-        return new QName(xmlElement.namespace(), xmlElement.name());
-    }
-
-    /**
-     * Get an annotation.  This is wrappered to avoid a Java2Security violation.
-     * @param cls Class that contains annotation 
-     * @param annotation Class of requrested Annotation
-     * @return annotation or null
-     */
-    private static <T extends Annotation> T getAnnotation(final AnnotatedElement element, final Class<T> annotation) {
-        return AccessController.doPrivileged(new PrivilegedAction<T>() {
-            public T run() {
-                return element.getAnnotation(annotation);
-            }
-        });
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
deleted file mode 100644
index af3fa3fb66..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.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.jaxb;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2JAXB extends BaseTransformer<XMLStreamReader, Object> implements
-    PullTransformer<XMLStreamReader, Object> {
-
-    public XMLStreamReader2JAXB() {
-        super();
-    }
-
-    public Object transform(XMLStreamReader source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            JAXBContext jaxbContext = JAXBContextHelper.createJAXBContext(context, false);
-            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
-            // FIXME: [rfeng] If the java type is Object.class, the unmarshalled result will be
-            // a DOM Node
-            Object result = unmarshaller.unmarshal(source, JAXBContextHelper.getJavaType(context.getTargetDataType()));
-            source.close();
-            return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 58d6123373..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/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.jaxb.JAXBDataBinding;type=javax.xml.bind.JAXBElement,name=jaxb
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 4e062e4c22..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;source=javax.xml.bind.JAXBElement,target=org.w3c.dom.Node,weight=500
-org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;source=org.w3c.dom.Node,target=javax.xml.bind.JAXBElement,weight=500
-org.apache.tuscany.sca.databinding.jaxb.Reader2JAXB;source=java.io.Reader,target=javax.xml.bind.JAXBElement,weight=510
-org.apache.tuscany.sca.databinding.jaxb.XMLStreamReader2JAXB;source=javax.xml.stream.XMLStreamReader,target=javax.xml.bind.JAXBElement,weight=490
-
-org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;source=java:complexType,target=org.w3c.dom.Node,weight=90000
-org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;source=org.w3c.dom.Node,target=java:complexType,weight=90000
-
-org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;source=org.w3c.dom.Node,target=java:simpleType,weight=90000
-org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;source=java:simpleType,target=org.w3c.dom.Node,weight=90000
-
-org.apache.tuscany.sca.databinding.jaxb.XMLStreamReader2JAXB;source=javax.xml.stream.XMLStreamReader,target=java:complexType,weight=90000
-org.apache.tuscany.sca.databinding.jaxb.XMLStreamReader2JAXB;source=javax.xml.stream.XMLStreamReader,target=java:simpleType,weight=90000
-
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
deleted file mode 100644
index d1f6d9f1e3..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ /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.databinding.jaxb.DefaultXMLAdapterExtensionPoint
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
deleted file mode 100644
index 5c5c892f33..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.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 com.example.stock;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"input"})
-@XmlRootElement(name = "stockQuoteOffer")
-public class StockQuoteOffer {
-
-    protected String input;
-
-    public String getInput() {
-        return this.input;
-    }
-
-    public void setInput(String input) {
-        this.input = input;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBContextCacheTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBContextCacheTestCase.java
deleted file mode 100644
index 8e82e7bb38..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBContextCacheTestCase.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.databinding.jaxb;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextCache;
-import org.apache.tuscany.sca.databinding.util.LRUCache;
-import org.junit.Test;
-
-import com.example.ipo.jaxb.Address;
-import com.example.ipo.jaxb.PurchaseOrderType;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JAXBContextCacheTestCase {
-    @Test
-    public void testCache() throws JAXBException {
-        JAXBContextCache cache = new JAXBContextCache();
-        JAXBContext context1 = cache.getJAXBContext(String.class);
-        JAXBContext context2 = cache.getJAXBContext(int.class);
-        JAXBContext context3 = cache.getJAXBContext(String[].class);
-        JAXBContext context4 = cache.getJAXBContext(Source.class);
-        Assert.assertSame(context1, context2);
-        Assert.assertNotSame(context2, context3);
-        Assert.assertSame(context1, context4);
-
-        QName name = new QName("http://example.com/ns1", "e1");
-        JAXBElement<String> element = new JAXBElement<String>(name, String.class, "123");
-        StringWriter sw = new StringWriter();
-        context4.createMarshaller().marshal(element, sw);
-        StreamSource source = new StreamSource(new StringReader(sw.toString()), null);
-        context4.createUnmarshaller().unmarshal(source, String.class);
-
-        JAXBContext context5 = cache.getJAXBContext(Address.class);
-        JAXBContext context6 = cache.getJAXBContext(PurchaseOrderType.class);
-        Assert.assertSame(context5, context6);
-    }
-
-    @Test
-    public void testLRUCache() {
-        LRUCache<String, String> cache = new LRUCache<String, String>(3);
-        cache.put("1", "A");
-        Assert.assertEquals(1, cache.size());
-        cache.put("2", "B");
-        Assert.assertEquals(2, cache.size());
-        cache.put("3", "C");
-        Assert.assertEquals(3, cache.size());
-        cache.put("4", "D");
-        Assert.assertEquals(3, cache.size());
-        String data = cache.get("1");
-        Assert.assertNull(data);
-        data = cache.get("2");
-        Assert.assertEquals("B", data);
-        cache.put("5", "E");
-        data = cache.get("2");
-        Assert.assertEquals("B", data);
-    }
-
-    @Test
-    public void testPerf() throws JAXBException {
-        JAXBContextCache cache = new JAXBContextCache();
-        
-        // Test JAXBContext for simple java classes
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < 100; i++) {
-            JAXBContext context = JAXBContext.newInstance(String.class);
-        }
-        long end = System.currentTimeMillis();
-        long d1 = end - start;
-        start = System.currentTimeMillis();
-        for (int i = 0; i < 100; i++) {
-            JAXBContext context = cache.getJAXBContext(String.class);
-        }
-        end = System.currentTimeMillis();
-        long d2 = end - start;
-        System.out.println(d1 + "ms vs. " + d2 + "ms");
-        
-        // Test JAXBContext for generated JAXB classes
-        start = System.currentTimeMillis();
-        for (int i = 0; i < 20; i++) {
-            JAXBContext context = JAXBContext.newInstance(PurchaseOrderType.class);
-        }
-        end = System.currentTimeMillis();
-        d1 = end - start;
-        start = System.currentTimeMillis();
-        for (int i = 0; i < 20; i++) {
-            JAXBContext context = cache.getJAXBContext(PurchaseOrderType.class);
-        }
-        end = System.currentTimeMillis();
-        d2 = end - start;
-        System.out.println(d1 + "ms vs. " + d2 + "ms");
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.java
deleted file mode 100644
index 8506bc296b..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBDataBindingTestCase.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.databinding.jaxb;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-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.jaxb.ObjectFactory;
-import com.example.ipo.jaxb.PurchaseOrderType;
-import com.example.ipo.jaxb.USAddress;
-import com.example.ipo.jaxb.USState;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXBDataBindingTestCase extends TestCase {
-    private JAXBDataBinding binding;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        binding = new JAXBDataBinding();
-    }
-
-    /**
-     * Test method for
-     * {@link org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding#introspect(java.lang.Class, Operation)}.
-     */
-    public final void testIntrospect() {
-        DataType dataType = new DataTypeImpl<Class>(JAXBElement.class, null);
-        Operation op = null;
-        boolean yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertTrue(dataType.getDataBinding().equals(binding.getName()));
-        assertTrue(dataType.getPhysical() == JAXBElement.class && dataType.getLogical() == XMLType.UNKNOWN);
-        dataType = new DataTypeImpl<Class>(MockJAXBElement.class, null);
-        yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertEquals(MockJAXBElement.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());
-        dataType = new DataTypeImpl<Class>(USState.class, null);
-        yes = binding.introspect(dataType, op);
-        assertTrue(yes);
-        assertTrue(dataType.getDataBinding().equals(binding.getName()));
-        assertEquals(USState.class, dataType.getPhysical());
-        assertEquals(new QName("http://www.example.com/IPO", "USState"), ((XMLType)dataType.getLogical()).getTypeName());
-
-    }
-
-    private static class MockJAXBElement extends JAXBElement<PurchaseOrderType> {
-
-        private static final long serialVersionUID = -2767569071002707973L;
-
-        /**
-         * @param elementName
-         * @param type
-         * @param value
-         */
-        public MockJAXBElement(QName elementName, Class<PurchaseOrderType> type, PurchaseOrderType value) {
-            super(elementName, type, value);
-        }
-
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testCopy() {
-        ObjectFactory factory = new ObjectFactory();
-        PurchaseOrderType poType = factory.createPurchaseOrderType();
-        JAXBElement<PurchaseOrderType> po = factory.createPurchaseOrder(poType);
-        JAXBElement<PurchaseOrderType> copy = (JAXBElement<PurchaseOrderType>)binding.copy(po, null, null);
-        assertEquals(new QName("http://www.example.com/IPO", "purchaseOrder"), copy.getName());
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testCopyNonElement() {
-        ObjectFactory factory = new ObjectFactory();
-        PurchaseOrderType poType = factory.createPurchaseOrderType();
-        poType.setComment("Comment");
-        PurchaseOrderType copy = (PurchaseOrderType)binding.copy(poType, null, null);
-        assertTrue(copy instanceof PurchaseOrderType);
-        assertEquals("Comment", (copy).getComment());
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testCopyNonRoot() {
-        ObjectFactory factory = new ObjectFactory();
-        USAddress address = factory.createUSAddress();
-        address.setCity("San Jose");
-        USAddress copy = (USAddress)binding.copy(address, null, null);
-        assertTrue(copy instanceof USAddress);
-        assertEquals("San Jose", (copy).getCity());
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.java
deleted file mode 100644
index 3ec6a6785a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBReflectionTestCase.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.databinding.jaxb;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.jvnet.jaxb.reflection.model.annotation.RuntimeInlineAnnotationReader;
-import org.jvnet.jaxb.reflection.model.core.Ref;
-import org.jvnet.jaxb.reflection.model.impl.RuntimeModelBuilder;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeClassInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimePropertyInfo;
-import org.jvnet.jaxb.reflection.model.runtime.RuntimeTypeInfoSet;
-import org.jvnet.jaxb.reflection.runtime.IllegalAnnotationsException;
-import org.jvnet.jaxb.reflection.runtime.JAXBContextImpl;
-import org.w3c.dom.Node;
-
-import com.example.ipo.jaxb.ObjectFactory;
-import com.example.ipo.jaxb.PurchaseOrderType;
-import com.example.ipo.jaxb.USAddress;
-import com.example.ipo.jaxb.USState;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JAXBReflectionTestCase extends TestCase {
-
-    public void testGenerateSchema() throws Exception {
-        JAXBContext context = JAXBContext.newInstance("com.example.ipo.jaxb");
-        Node schema = JAXBContextHelper.generateSchema(context);
-        System.out.println(new Node2String().transform(schema, null));
-    }
-
-    /**
-     * This is a workaround for the NPE bug in jaxb-reflection
-     * @param classes
-     * @return
-     * @throws Exception
-     */
-    @SuppressWarnings("unchecked")
-    private static RuntimeTypeInfoSet create(Class... classes) throws Exception {
-        IllegalAnnotationsException.Builder errorListener = new IllegalAnnotationsException.Builder();
-        RuntimeInlineAnnotationReader reader = new RuntimeInlineAnnotationReader();
-        JAXBContextImpl context =
-            new JAXBContextImpl(classes, null, Collections.<Class, Class> emptyMap(), null, false, reader, false, false);
-        RuntimeModelBuilder builder =
-            new RuntimeModelBuilder(context, reader, Collections.<Class, Class> emptyMap(), null);
-        builder.setErrorHandler(errorListener);
-        for (Class c : classes)
-            builder.getTypeInfo(new Ref<Type, Class>(c));
-
-        RuntimeTypeInfoSet r = builder.link();
-        errorListener.check();
-        return r;
-    }
-
-    public void testReflection() throws Exception {
-        org.jvnet.jaxb.reflection.model.runtime.RuntimeTypeInfoSet model = create(PurchaseOrderType.class);
-        RuntimeClassInfo type = (RuntimeClassInfo)model.getTypeInfo(PurchaseOrderType.class);
-        Assert.assertEquals(new QName("http://www.example.com/IPO", "PurchaseOrderType"), type.getTypeName());
-        type = (RuntimeClassInfo)model.getTypeInfo(USAddress.class);
-        Assert.assertEquals(new QName("http://www.example.com/IPO", "USAddress"), type.getTypeName());
-        RuntimePropertyInfo prop = type.getProperty("state");
-        Assert.assertNotNull(prop);
-        USAddress address = new ObjectFactory().createUSAddress();
-        prop.getAccessor().set(address, USState.CA);
-        Assert.assertEquals(USState.CA, address.getState());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.java
deleted file mode 100644
index 21a745cd9a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBTestCase.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.databinding.jaxb;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.jaxb.JAXB2Node;
-import org.apache.tuscany.sca.databinding.jaxb.Node2JAXB;
-import org.apache.tuscany.sca.databinding.jaxb.Reader2JAXB;
-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.Node;
-
-import com.example.ipo.jaxb.ObjectFactory;
-import com.example.ipo.jaxb.PurchaseOrderType;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXBTestCase 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 testTransform() throws Exception {
-        Reader2JAXB t0 = new Reader2JAXB();
-
-        DataType targetDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
-
-        TransformationContext tContext = createMock(TransformationContext.class);
-        expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
-        expect(tContext.getTargetOperation()).andReturn(null).anyTimes();
-        replay(tContext);
-
-        Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
-
-        DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
-
-        TransformationContext tContext1 = createMock(TransformationContext.class);
-        expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
-        expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
-        expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
-        expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
-        replay(tContext1);
-
-        JAXB2Node t1 = new JAXB2Node();
-        Node node = t1.transform(object1, tContext1);
-
-        Assert.assertNotNull(node);
-
-        Node2JAXB t2 = new Node2JAXB();
-        Object object2 = t2.transform(node, tContext);
-        Assert.assertNotNull(object2);
-
-    }
-
-    public void testTransform2() throws Exception {
-        Reader2JAXB t0 = new Reader2JAXB();
-
-        QName root = new QName("http://www.example.com/IPO", "purchaseOrder");
-        DataType targetDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
-        // targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
-
-        TransformationContext tContext = createMock(TransformationContext.class);
-        expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
-        expect(tContext.getTargetOperation()).andReturn(null).anyTimes();
-        replay(tContext);
-
-        Object object1 = t0.transform(new StringReader(IPO_XML), tContext);
-
-        DataType sourceDataType = new DataTypeImpl<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
-        // sourceDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
-
-        TransformationContext tContext1 = createMock(TransformationContext.class);
-        expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
-        expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
-        expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
-        expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
-        replay(tContext1);
-
-        JAXB2Node t1 = new JAXB2Node();
-        Node node = t1.transform(object1, tContext1);
-
-        Assert.assertNotNull(node);
-
-        Node2JAXB t2 = new Node2JAXB();
-        Object object2 = t2.transform(node, tContext);
-        Assert.assertNotNull(object2);
-
-    }    
-
-    public void testTransform3() throws Exception {
-
-        DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
-
-        TransformationContext tContext1 = createMock(TransformationContext.class);
-        expect(tContext1.getSourceDataType()).andReturn(sourceDataType).anyTimes();
-        expect(tContext1.getTargetDataType()).andReturn(null).anyTimes();
-        expect(tContext1.getSourceOperation()).andReturn(null).anyTimes();
-        expect(tContext1.getTargetOperation()).andReturn(null).anyTimes();
-        replay(tContext1);
-
-        JAXB2Node t1 = new JAXB2Node();
-        PurchaseOrderType po = new ObjectFactory().createPurchaseOrderType();
-        Node node = t1.transform(po, tContext1);
-
-        Assert.assertNotNull(node);
-
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.java
deleted file mode 100644
index 10bc858d80..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/JAXBWrapperHandlerTestCase.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.databinding.jaxb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBWrapperHandler;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-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.sca.interfacedef.util.XMLType;
-
-import com.example.stock.StockQuoteOffer;
-
-/**
- * Test case for JAXBExceptionHandler
- *
- * @version $Rev$ $Date$
- */
-public class JAXBWrapperHandlerTestCase extends TestCase {
-    private static final QName ELEMENT = new QName("http://www.example.com/stock", "stockQuoteOffer");
-    private static final QName INPUT = new QName("", "input");
-    private JAXBWrapperHandler handler;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        this.handler = new JAXBWrapperHandler();
-    }
-
-    public void testCreate() {
-        ElementInfo element = new ElementInfo(ELEMENT, null);
-        Operation op = new OperationImpl();
-        WrapperInfo wrapperInfo = new WrapperInfo(JAXBDataBinding.NAME, element, null, null, null);
-        wrapperInfo.setInputWrapperType(new DataTypeImpl<XMLType>(JAXBDataBinding.NAME, StockQuoteOffer.class,
-                                                                  XMLType.UNKNOWN));
-        op.setWrapper(wrapperInfo);
-        Object offer = handler.create(op, true);
-        Assert.assertTrue(offer instanceof StockQuoteOffer);
-    }
-
-    public void testSetChild() {
-        StockQuoteOffer wrapper = new StockQuoteOffer();
-        handler.setChild(wrapper, 0, new ElementInfo(INPUT, null), "IBM");
-        Assert.assertEquals("IBM", wrapper.getInput());
-    }
-
-    public void testGetChildren() {
-        StockQuoteOffer wrapper = new StockQuoteOffer();
-        wrapper.setInput("IBM");
-        List<ElementInfo> elements = new ArrayList<ElementInfo>();
-        elements.add(new ElementInfo(INPUT, null));
-        WrapperInfo wrapperInfo = new WrapperInfo(JAXBDataBinding.NAME, null, null, elements, null);
-        Operation op = new OperationImpl();
-        op.setWrapper(wrapperInfo);
-        List children = handler.getChildren(wrapper, op, true);
-        assertNotNull(children);
-        assertEquals(1, children.size());
-        assertEquals("IBM", children.get(0));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.java
deleted file mode 100644
index 4b09f49246..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyBean.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.databinding.jaxb;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-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/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterface.java
deleted file mode 100644
index 5f998c4b2c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/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.databinding.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface MyInterface {
-    void setId(String id);
-
-    String getId();
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MyInterfaceImpl.java
deleted file mode 100644
index 928acb9f3c..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/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.databinding.jaxb;
-
-/**
- * @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/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MySubBean.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MySubBean.java
deleted file mode 100644
index 157d1065d4..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/MySubBean.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.databinding.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MySubBean extends MyBean {
-    private String addtional;
-
-    public String getAddtional() {
-        return addtional;
-    }
-
-    public void setAddtional(String addtional) {
-        this.addtional = addtional;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.java
deleted file mode 100644
index 2735c650ee..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/java/org/apache/tuscany/databinding/jaxb/POJOTestCase.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.databinding.jaxb;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.Collections;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.sca.databinding.jaxb.JAXB2XMLStreamReader;
-
-import com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader;
-import com.sun.xml.bind.v2.model.core.Ref;
-import com.sun.xml.bind.v2.model.impl.RuntimeModelBuilder;
-import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo;
-import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo;
-import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet;
-import com.sun.xml.bind.v2.runtime.IllegalAnnotationsException;
-import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class POJOTestCase extends TestCase {
-    public void testPOJO() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
-        StringWriter writer = new StringWriter();
-        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);
-        JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, bean);
-        context.createMarshaller().marshal(element, writer);
-        // System.out.println(writer.toString());
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof MyBean);
-        MyBean newBean = (MyBean)e2.getValue();
-        assertEquals(bean, newBean);
-    }
-    
-    public void testPOJOArray() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(MyBean[].class);
-        StringWriter writer = new StringWriter();
-        MySubBean bean = new MySubBean();
-        bean.setAddtional("SUB");
-        bean.setName("Test");
-        bean.setAge(20);
-        bean.getNotes().add("1");
-        bean.getNotes().add("2");
-        bean.getMap().put("1", 1);
-
-        JAXBElement<Object> element =
-            new JAXBElement<Object>(new QName("http://ns1", "beans"), Object.class, new MyBean[] {bean});
-        context.createMarshaller().marshal(element, writer);
-        System.out.println(writer.toString());
-
-        Object result =
-            context.createUnmarshaller().unmarshal(new StreamSource(new StringReader(writer.toString())),
-                                                   MyBean[].class);
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof MyBean[]);
-        MyBean newBean = ((MyBean[])e2.getValue())[0];
-        assertFalse(newBean instanceof MySubBean);
-    }
-
-    public void testXMLStreamReader() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
-
-        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);
-        QName name = new QName("http://ns1", "bean");
-        JAXBElement<Object> element = new JAXBElement<Object>(name, Object.class, bean);
-        TransformationContext tContext = new TransformationContextImpl();
-        XMLStreamReader reader = new JAXB2XMLStreamReader().transform(element, tContext);
-
-//        XMLStreamReader2String t2 = new XMLStreamReader2String();
-//        String xml = t2.transform(reader, null);
-        // System.out.println(xml);
-        Object result = context.createUnmarshaller().unmarshal(reader, MyBean.class);
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof MyBean);
-        MyBean newBean = (MyBean)e2.getValue();
-        // FIXME :To be implemented
-        // assertEquals(bean, newBean);
-    }
-
-    public void testString() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(String.class);
-        StringWriter writer = new StringWriter();
-        JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, "ABC");
-        context.createMarshaller().marshal(element, writer);
-        // System.out.println(writer.toString());
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertEquals("ABC", e2.getValue());
-    }
-
-    public void testNull() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(String.class);
-        StringWriter writer = new StringWriter();
-        JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, null);
-        element.setNil(true);
-        context.createMarshaller().marshal(element, writer);
-        // System.out.println(writer.toString());
-        StreamSource source = new StreamSource(new StringReader(writer.toString()));
-        Object result = context.createUnmarshaller().unmarshal(source, String.class);
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertNull(e2.getValue());
-    }
-
-    public void testArray() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(String[].class);
-        StringWriter writer = new StringWriter();
-        JAXBElement<Object> element =
-            new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, new String[] {"ABC", "123"});
-        context.createMarshaller().marshal(element, writer);
-        // System.out.println(writer.toString());
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof String[]);
-    }
-
-    public void testByteArray() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(byte[].class);
-        StringWriter writer = new StringWriter();
-        JAXBElement<Object> element =
-            new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, "ABC".getBytes());
-        context.createMarshaller().marshal(element, writer);
-        String xml = writer.toString();
-        assertTrue(xml.contains("QUJD"));
-        assertTrue(xml.contains("base64Binary"));
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(xml));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof byte[]);
-    }
-
-    public void testPrimitive() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(int.class);
-        StringWriter writer = new StringWriter();
-        JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, 1);
-        context.createMarshaller().marshal(element, writer);
-        // System.out.println(writer.toString());
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertEquals(1, e2.getValue());
-    }
-
-    /*
-    public void testException() throws Exception {
-        JAXBContext context = JAXBContext.newInstance(IllegalArgumentException.class);
-        StringWriter writer = new StringWriter();
-        Exception e = new IllegalArgumentException("123");
-        JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, e);
-        context.createMarshaller().marshal(element, writer);
-        System.out.println(writer.toString());
-
-        Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
-        assertTrue(result instanceof JAXBElement);
-        JAXBElement e2 = (JAXBElement)result;
-        assertTrue(e2.getValue() instanceof Exception);
-    }
-    */
-
-    private static RuntimeTypeInfoSet create(Class... classes) throws Exception {
-        IllegalAnnotationsException.Builder errorListener = new IllegalAnnotationsException.Builder();
-        RuntimeInlineAnnotationReader reader = new RuntimeInlineAnnotationReader();
-        JAXBContextImpl context =
-            new JAXBContextImpl(classes, null, Collections.<Class, Class> emptyMap(), null, false, reader, false, false);
-        RuntimeModelBuilder builder =
-            new RuntimeModelBuilder(context, reader, Collections.<Class, Class> emptyMap(), null);
-        builder.setErrorHandler(errorListener);
-        for (Class c : classes)
-            builder.getTypeInfo(new Ref<Type, Class>(c));
-
-        RuntimeTypeInfoSet r = builder.link();
-        errorListener.check();
-        return r;
-    }
-
-    public void testReflection() throws Exception {
-        MyBean bean = new MyBean();
-        RuntimeTypeInfoSet model = create(MyBean.class);
-        RuntimeClassInfo clsInfo = (RuntimeClassInfo)model.getTypeInfo(MyBean.class);
-        for (RuntimePropertyInfo p : clsInfo.getProperties()) {
-            // System.out.print(p.getName());
-            // System.out.println(" " + p.isCollection());
-            if (p.getName().equals("notes")) {
-                Collection c = (Collection)p.getAccessor().get(bean);
-                c.add("123");
-            }
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding-jaxb/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-jaxb/src/test/resources/ipo.xsd
deleted file mode 100755
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/modules/databinding-jaxb/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/tags/java/sca/1.3/modules/databinding-json/LICENSE b/tags/java/sca/1.3/modules/databinding-json/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/NOTICE b/tags/java/sca/1.3/modules/databinding-json/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-json/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/tags/java/sca/1.3/modules/databinding-json/pom.xml b/tags/java/sca/1.3/modules/databinding-json/pom.xml
deleted file mode 100644
index 1cdd47ef4a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-json/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</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</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.5</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>                 
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>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.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.databinding.json</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.json*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
deleted file mode 100644
index b1813c9eab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
deleted file mode 100644
index 4e08384f09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
deleted file mode 100644
index b70f772696..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
deleted file mode 100644
index 0ecf9dde19..0000000000
--- a/tags/java/sca/1.3/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[] ALIASES = new String[] {"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, ALIASES, org.json.JSONObject.class);
-    }
-
-    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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
deleted file mode 100644
index fb29710506..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
deleted file mode 100644
index a928deef22..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
deleted file mode 100644
index de023157bc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
deleted file mode 100644
index ff5968bccd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
deleted file mode 100644
index aa75afc9d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
deleted file mode 100644
index 1072b70029..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
deleted file mode 100644
index adc38772be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/tags/java/sca/1.3/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
deleted file mode 100644
index 5b0312056e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index b0baaeb398..0000000000
--- a/tags/java/sca/1.3/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;type=JSON,name=json
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 4ce2f2342a..0000000000
--- a/tags/java/sca/1.3/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.
-
-# 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=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
diff --git a/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
deleted file mode 100644
index 3c7f151ed7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
deleted file mode 100644
index 3b36f5be74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
deleted file mode 100644
index 60b293c1d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
deleted file mode 100644
index d32e0763c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
deleted file mode 100644
index 3a2b95a4e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/tags/java/sca/1.3/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
deleted file mode 100644
index 84995baadf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-json/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-json/src/test/resources/ipo.xsd
deleted file mode 100644
index 5a493e1746..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/LICENSE b/tags/java/sca/1.3/modules/databinding-saxon/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/NOTICE b/tags/java/sca/1.3/modules/databinding-saxon/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-saxon/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/tags/java/sca/1.3/modules/databinding-saxon/pom.xml b/tags/java/sca/1.3/modules/databinding-saxon/pom.xml
deleted file mode 100644
index d4c4a07947..0000000000
--- a/tags/java/sca/1.3/modules/databinding-saxon/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</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-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.1</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.databinding.saxon</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.saxon*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
deleted file mode 100644
index 25f8ee886f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
deleted file mode 100644
index fabadd34ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
deleted file mode 100644
index a5093f8cdf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
deleted file mode 100644
index 1e5b816662..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
deleted file mode 100644
index 616bcca6c5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
deleted file mode 100644
index ecb20b24b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
deleted file mode 100644
index ccf842710d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
deleted file mode 100644
index 2f51cf86ec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
deleted file mode 100644
index 67d89a6e0b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
deleted file mode 100644
index 7589f6789b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/tags/java/sca/1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
deleted file mode 100644
index 5da4effcfd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index d895237c7d..0000000000
--- a/tags/java/sca/1.3/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;type=net.sf.saxon.om.NodeInfo,name=saxon_node
-org.apache.tuscany.sca.databinding.saxon.SaxonValueDataBinding;type=net.sf.saxon.value.Value,name=saxon_value
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 671d07afd8..0000000000
--- a/tags/java/sca/1.3/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.
-
-# 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
diff --git a/tags/java/sca/1.3/modules/databinding-sdo-axiom/LICENSE b/tags/java/sca/1.3/modules/databinding-sdo-axiom/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/NOTICE b/tags/java/sca/1.3/modules/databinding-sdo-axiom/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo-axiom/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/pom.xml b/tags/java/sca/1.3/modules/databinding-sdo-axiom/pom.xml
deleted file mode 100644
index b2a17c6422..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo-axiom/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.5</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>                
-            </exclusions>
-        </dependency>
-
-		<dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>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-incubating</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>
-
-            <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.databinding.sdo.axiom</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.sdo*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
deleted file mode 100644
index 02f43000b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
deleted file mode 100644
index aa7f99724d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
deleted file mode 100644
index dc3c2610a4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
deleted file mode 100644
index a55a9f37cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index c870ec2406..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
deleted file mode 100644
index 57dd056526..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
deleted file mode 100644
index f69ef598b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
deleted file mode 100644
index 5015a1b697..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
deleted file mode 100644
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/tags/java/sca/1.3/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
deleted file mode 100644
index a0a6717371..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/LICENSE b/tags/java/sca/1.3/modules/databinding-sdo/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/NOTICE b/tags/java/sca/1.3/modules/databinding-sdo/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/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/tags/java/sca/1.3/modules/databinding-sdo/pom.xml b/tags/java/sca/1.3/modules/databinding-sdo/pom.xml
deleted file mode 100644
index dccf1b2fd0..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</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>1.3</version>
-        </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>
-    </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-incubating</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>
-
-            <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.databinding.sdo</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.sdo*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
deleted file mode 100644
index 503e54e530..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
deleted file mode 100644
index 8ce8eae587..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
deleted file mode 100644
index 116ac4c553..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
deleted file mode 100644
index 30a3e1c3a9..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.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.sdo;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.impl.BaseImpl;
-
-import commonj.sdo.helper.HelperContext;
-
-/**
- * The model object for import.sdo
- * 
- * @version $Rev$ $Date$
- */
-public class ImportSDO extends BaseImpl {
-    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;
-
-    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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
deleted file mode 100644
index 115af19042..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-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.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(ModelFactoryExtensionPoint 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 = new ProblemImpl(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 = new ProblemImpl(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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
deleted file mode 100644
index 4a05492dd8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
deleted file mode 100644
index 695722be18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
deleted file mode 100644
index 5a5e35cbbd..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.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.sdo;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-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[] ALIASES = new String[] {"sdo"};
-
-    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, ALIASES, 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 SimpleTypeMapper getSimpleTypeMapper() {
-        return new SDOSimpleTypeMapper();
-    }
-
-    @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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
deleted file mode 100644
index c83ec53b01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
deleted file mode 100644
index 082ce48fbd..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.osoa.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()) {
-                QName typeName = new QName(type.getURI(), type.getName());
-                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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
deleted file mode 100644
index 8a1cd666d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
deleted file mode 100644
index 7ac423f8d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
deleted file mode 100644
index 4e5aa1d5fd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
deleted file mode 100644
index e70fa08477..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
deleted file mode 100644
index baf3e2e90a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/tags/java/sca/1.3/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
deleted file mode 100644
index ac452910f6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ffe8b895b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index afd00b552c..0000000000
--- a/tags/java/sca/1.3/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;type=commonj.sdo.DataObject,name=sdo
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index b1916fd32a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/tags/java/sca/1.3/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
deleted file mode 100644
index f53f08f377..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
deleted file mode 100644
index 5a0208b290..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
deleted file mode 100644
index 4bc41a5541..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
deleted file mode 100644
index 44d11cd586..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
deleted file mode 100644
index 6a82a7fb18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
deleted file mode 100644
index fa765f9bf4..0000000000
--- a/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.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.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.DefaultModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-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 DefaultModelFactoryExtensionPoint(), 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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
deleted file mode 100644
index e0d1c9bf12..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
deleted file mode 100644
index 3c21b56c9f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
deleted file mode 100644
index 2aaae3c6d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
deleted file mode 100644
index 11d8495de8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
deleted file mode 100644
index ce04f5be3f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
deleted file mode 100644
index 114c568c38..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/ipo.xsd
deleted file mode 100755
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/model/sca-core.xsd b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/model/sca-core.xsd
deleted file mode 100755
index 56c6977254..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/model/sca-implementation-mock.xsd
deleted file mode 100755
index bbaf58f00c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/stock.xsd b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/stock.xsd
deleted file mode 100644
index a0a6717371..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/wrapper.xml b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/wrapper.xml
deleted file mode 100644
index 2526629409..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/wrapper.xsd b/tags/java/sca/1.3/modules/databinding-sdo/src/test/resources/wrapper.xsd
deleted file mode 100644
index ea4dc5f7f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/LICENSE b/tags/java/sca/1.3/modules/databinding-xmlbeans/LICENSE
deleted file mode 100755
index d645695673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/NOTICE b/tags/java/sca/1.3/modules/databinding-xmlbeans/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding-xmlbeans/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/tags/java/sca/1.3/modules/databinding-xmlbeans/pom.xml b/tags/java/sca/1.3/modules/databinding-xmlbeans/pom.xml
deleted file mode 100644
index 6f55899a61..0000000000
--- a/tags/java/sca/1.3/modules/databinding-xmlbeans/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>2.3.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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/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>
-
-            <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.databinding.xmlbeans</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.xmlbeans*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
deleted file mode 100644
index e7b240b781..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
deleted file mode 100644
index 94e74321c4..0000000000
--- a/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.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.databinding.xmlbeans;
-
-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.xmlbeans.XmlObject;
-
-/**
- * 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 Object copy(Object object, DataType dataType, Operation operation) {
-        return ((XmlObject) object).copy();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
deleted file mode 100644
index ca84f961b1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
deleted file mode 100644
index c820d9d250..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
deleted file mode 100644
index bbffb7d748..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 907d06559a..0000000000
--- a/tags/java/sca/1.3/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;type=org.apache.xmlbeans.XmlObject,name=xmlbeans
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 4e419de051..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
deleted file mode 100644
index 7b98ddb021..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
deleted file mode 100755
index 5a493e1746..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/tags/java/sca/1.3/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
deleted file mode 100755
index a397182672..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/databinding/LICENSE b/tags/java/sca/1.3/modules/databinding/LICENSE
deleted file mode 100644
index 616bec99ed..0000000000
--- a/tags/java/sca/1.3/modules/databinding/LICENSE
+++ /dev/null
@@ -1,244 +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.
-
------------------------------------------------------------------
-The test cases use xmlunit with the following license:
------------------------------------------------------------------ 
-
-/*
-******************************************************************
-Copyright (c) 2001-2007, Jeff Martin, Tim Bacon
-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 xmlunit.sourceforge.net 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.
-
-******************************************************************
-*/
-
-
diff --git a/tags/java/sca/1.3/modules/databinding/NOTICE b/tags/java/sca/1.3/modules/databinding/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/databinding/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/tags/java/sca/1.3/modules/databinding/pom.xml b/tags/java/sca/1.3/modules/databinding/pom.xml
deleted file mode 100644
index 0072f4fa18..0000000000
--- a/tags/java/sca/1.3/modules/databinding/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>1.3</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>tuscany-databinding</artifactId>
-	<name>Apache Tuscany SCA DataBinding Framework</name>
-
-	<dependencies>
-		<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-	
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface</artifactId>
-			<version>1.3</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-contribution</artifactId>
-			<version>1.3</version>
-		</dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>		
-
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax-api</artifactId>
-			<version>1.0.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.woodstox</groupId>
-			<artifactId>wstx-asl</artifactId>
-			<version>3.2.1</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<version>1.1</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.databinding</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
deleted file mode 100644
index 547f9d9f4f..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.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.databinding;
-
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * DataBinding represents a data representation, for example, SDO, JAXB and AXIOM
- *
- * @version $Rev$ $Date$
- */
-public interface DataBinding {
-    /**
-     * A special databinding for input message of an operation
-     */
-    String IDL_INPUT = "idl:input";
-    /**
-     * A special databinding for output message of an operation
-     */
-    String IDL_OUTPUT = "idl:output";
-    /**
-     * A special databinding for fault message of an operation
-     */
-    String IDL_FAULT = "idl:fault";
-    /**
-     * The name of a databinding should be case-insensitive and unique
-     * 
-     * @return The name of the databinding
-     */
-    String getName();
-    
-    /**
-     * Get the aliases for the databinding
-     * 
-     * @return An array of aliases
-     */
-    String[] getAliases();
-
-    /**
-     * Introspect and populate information to a DataType model
-     * 
-     * @param dataType The data type to be introspected
-     * @param operation The operation
-     * @return true if the databinding has recognized the given data type
-     */
-    boolean introspect(DataType dataType, Operation operation);
-
-    /**
-     * Introspect the data to figure out the corresponding data type
-     * 
-     * @param value The object to be checked
-     * @param operation The operation
-     * @return The DataType or null if the java type is not supported by this databinding
-     */
-    DataType introspect(Object value, Operation operation);
-
-    /**
-     * Provide a WrapperHandler for this databinding
-     * @return A wrapper handler which can handle wrapping/wrapping for this databinding
-     */
-    WrapperHandler getWrapperHandler();
-
-    /**
-     * Make a copy of the object for "pass-by-value" semantics.
-     *
-     * @param object source object to copy 
-     * @param dataType The data type
-     * @param operation The operation
-     * @return copy of the object passed in as argument
-     */
-    Object copy(Object object, DataType dataType, Operation operation);
-    
-    /**
-     * Get the type mapper for simple types
-     * @return The databinding-specific simple type mapper
-     */
-    SimpleTypeMapper getSimpleTypeMapper();
-    
-    /**
-     * Get the XML type helper for Java types
-     * @return The databinding-specific XML type helper class
-     */
-    XMLTypeHelper getXMLTypeHelper();
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
deleted file mode 100644
index 2ff5d866b4..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.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;
-
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * An extension point for data binding extensions.
- *
- * @version $Rev$ $Date$
- */
-public interface DataBindingExtensionPoint {
-
-    /**
-     * Register a data binding
-     * 
-     * @param dataBinding
-     */
-    void addDataBinding(DataBinding dataBinding);
-
-    /**
-     * Look up a data binding by id
-     * 
-     * @param id The name of the databinding
-     * @return The databinding
-     */
-    DataBinding getDataBinding(String id);
-
-    /**
-     * Unregister a data binding
-     * 
-     * @param id
-     * @return The unregistered databinding
-     */
-    DataBinding removeDataBinding(String id);
-
-    /**
-     * Introspect the java class to figure out what DataType supports it.
-     * 
-     * @param dataType The initial data type
-     * @param operation TODO
-     * @return A DataType representing the java type or null if no databinding
-     *         recognizes the java type
-     */
-    boolean introspectType(DataType dataType, Operation operation);
-
-    /**
-     * Introspect the value to figure out the corresponding DataType
-     * 
-     * @param value The object value
-     * @param operation TODO
-     * @return A DataType representing the value or null if no databinding
-     *         recognizes the value
-     */
-    DataType introspectType(Object value, Operation operation);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
deleted file mode 100644
index 505a810276..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.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.databinding;
-
-/**
- * Data pipe allows a data source pushes data into its sink and pipe the data into its result
- * 
- * @param <S> The data binding type of the sink
- * @param <R> The data binding type of the result
- *
- * @version $Rev$ $Date$
- */
-public interface DataPipe<S, R> {
-
-    /**
-     * Returns a sink (for example, java.io.OutputStream, java.io.Writer or org.xml.sax.ContentHandler) to receive data
-     * pushed by the source
-     * 
-     * @return The sink to consume data
-     */
-    S getSink();
-
-    /**
-     * Returns the data populated by the sink
-     * 
-     * @return
-     */
-    R getResult();
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
deleted file mode 100644
index 1aac6d48be..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.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;
-
-/**
- * Data pipe allows a data source pushes data into its sink and pipe the data into its result
- *
- * @version $Rev$ $Date$
- */
-public interface DataPipeTransformer<S, R> extends Transformer {
-
-    DataPipe<S, R> newInstance();
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
deleted file mode 100644
index b2da024a72..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
-import org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-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;
-
-/**
- * The default implementation of a data binding extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoint {
-    private final Map<String, DataBinding> bindings = new HashMap<String, DataBinding>();
-    private final List<DataBinding> databindings = new ArrayList<DataBinding>();
-    private static final Logger logger = Logger.getLogger(DefaultDataBindingExtensionPoint.class.getName());
-    private boolean loadedDataBindings;
-
-    public DefaultDataBindingExtensionPoint() {
-    }
-
-    public DataBinding getDataBinding(String id) {
-        if (id == null) {
-            return null;
-        }
-        DataBinding dataBinding = bindings.get(id.toLowerCase());
-        if (dataBinding == null) {
-            loadDataBindings();
-            dataBinding = bindings.get(id.toLowerCase());
-        }
-        return dataBinding;
-    }
-
-    public void addDataBinding(DataBinding dataBinding) {
-        if (logger.isLoggable(Level.FINE)) {
-            String className = dataBinding.getClass().getName();
-            boolean lazy = false;
-            if (dataBinding instanceof LazyDataBinding) {
-                className = ((LazyDataBinding)dataBinding).dataBindingDeclaration.getClassName();
-                lazy = true;
-            }
-            logger.fine("Adding databinding: " + className + ";type=" + dataBinding.getName() + ",lazy=" + lazy);
-        }
-        databindings.add(dataBinding);
-        bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
-
-        String[] aliases = dataBinding.getAliases();
-        if (aliases != null) {
-            for (String alias : aliases) {
-                bindings.put(alias.toLowerCase(), dataBinding);
-            }
-        }
-    }
-
-    public DataBinding removeDataBinding(String id) {
-        if (id == null) {
-            return null;
-        }
-        DataBinding dataBinding = bindings.remove(id.toLowerCase());
-        if (dataBinding != null) {
-            databindings.remove(dataBinding);
-            String[] aliases = dataBinding.getAliases();
-            if (aliases != null) {
-                for (String alias : aliases) {
-                    bindings.remove(alias.toLowerCase());
-                }
-            }
-        }
-        return dataBinding;
-    }
-
-    /**
-     * Dynamically load data bindings declared under META-INF/services
-     */
-    private synchronized void loadDataBindings() {
-        if (loadedDataBindings)
-            return;
-
-        // Get the databinding service declarations
-        Set<ServiceDeclaration> dataBindingDeclarations;
-        try {
-            dataBindingDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(DataBinding.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-
-        // Load data bindings
-        for (ServiceDeclaration dataBindingDeclaration : dataBindingDeclarations) {
-            Map<String, String> attributes = dataBindingDeclaration.getAttributes();
-            String type = attributes.get("type");
-            String name = attributes.get("name");
-
-            // Create a data binding wrapper and register it
-            DataBinding dataBinding = new LazyDataBinding(type, name, dataBindingDeclaration);
-            addDataBinding(dataBinding);
-        }
-
-        loadedDataBindings = true;
-    }
-
-    /**
-     * A data binding facade allowing data bindings to be lazily loaded and
-     * initialized.
-     */
-    private static class LazyDataBinding implements DataBinding {
-
-        private String name;
-        private String[] aliases;
-        private ServiceDeclaration dataBindingDeclaration;
-        private DataBinding dataBinding;
-
-        private LazyDataBinding(String type, String name, ServiceDeclaration dataBindingDeclaration) {
-            this.name = type;
-            if (name != null) {
-                this.aliases = new String[] {name};
-            }
-            this.dataBindingDeclaration = dataBindingDeclaration;
-        }
-
-        /**
-         * Load and instantiate the data binding class.
-         * 
-         * @return The data binding.
-         */
-        @SuppressWarnings("unchecked")
-        private DataBinding getDataBinding() {
-            if (dataBinding == null) {
-                try {
-                    Class<DataBinding> dataBindingClass = (Class<DataBinding>)dataBindingDeclaration.loadClass();
-                    Constructor<DataBinding> constructor = dataBindingClass.getConstructor();
-                    dataBinding = constructor.newInstance();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return dataBinding;
-        }
-
-        public Object copy(Object object, DataType dataType, Operation operation) {
-            return getDataBinding().copy(object, dataType, operation);
-        }
-
-        public String[] getAliases() {
-            return aliases;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public SimpleTypeMapper getSimpleTypeMapper() {
-            return getDataBinding().getSimpleTypeMapper();
-        }
-
-        public XMLTypeHelper getXMLTypeHelper() {
-            return getDataBinding().getXMLTypeHelper();
-        }
-
-        public WrapperHandler getWrapperHandler() {
-            return getDataBinding().getWrapperHandler();
-        }
-
-        public boolean introspect(DataType dataType, Operation operation) {
-            return getDataBinding().introspect(dataType, operation);
-        }
-
-        public DataType introspect(Object value, Operation operation) {
-            return getDataBinding().introspect(value, operation);
-        }
-    }
-
-    //FIXME The following methods should not be on the extension point
-    // they should be on a separate class
-    public boolean introspectType(DataType dataType, Operation operation) {
-        loadDataBindings();
-        for (DataBinding binding : databindings) {
-            // don't introspect for JavaBeansDatabinding as all javatypes will
-            // anyways match to its basetype
-            // which is java.lang.Object. Default to this only if no databinding
-            // results
-            if (!binding.getName().equals(JavaBeansDataBinding.NAME)) {
-                if (binding.introspect(dataType, operation)) {
-                    return true;
-                }
-            }
-        }
-        // FIXME: Should we honor the databinding from operation/interface
-        // level?
-        Class physical = dataType.getPhysical();
-        if (physical == Object.class) {
-            dataType.setDataBinding(JavaBeansDataBinding.NAME);
-            return false;
-        }
-        if (dataType.getPhysical().isArray()) {
-            introspectArray(dataType, operation);
-            return true;
-        } else if (Throwable.class.isAssignableFrom(physical)) {
-            dataType.setDataBinding(JavaExceptionDataBinding.NAME);
-            return true;
-        } else {
-            dataType.setDataBinding(JavaBeansDataBinding.NAME);
-            return false;
-        }
-    }
-
-    private boolean introspectArray(DataType dataType, Operation operation) {
-        Class physical = dataType.getPhysical();
-        if (!physical.isArray() || physical == byte[].class) {
-            return false;
-        }
-        Class componentType = physical.getComponentType();
-        DataType logical = new DataTypeImpl(componentType, dataType.getLogical());
-        introspectType(logical, operation);
-        dataType.setDataBinding("java:array");
-        dataType.setLogical(logical);
-        return true;
-    }
-
-    public DataType introspectType(Object value, Operation operation) {
-        loadDataBindings();
-        DataType dataType = null;
-        for (DataBinding binding : databindings) {
-            // don't introspect for JavaBeansDatabinding as all javatypes will
-            // anyways match to its basetype
-            // which is java.lang.Object. Default to this only if no databinding
-            // results
-            if (!binding.getName().equals(JavaBeansDataBinding.NAME)) {
-                dataType = binding.introspect(value, operation);
-            }
-            if (dataType != null) {
-                return dataType;
-            }
-        }
-        return new DataTypeImpl<XMLType>(JavaBeansDataBinding.NAME, value.getClass(), XMLType.UNKNOWN);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
deleted file mode 100644
index 05e7af946b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.databinding.impl.DirectedGraph;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DefaultTransformerExtensionPoint implements TransformerExtensionPoint {
-    private static final Logger logger = Logger.getLogger(DefaultTransformerExtensionPoint.class.getName());
-    private boolean loadedTransformers;
-
-    private final DirectedGraph<Object, Transformer> graph = new DirectedGraph<Object, Transformer>();
-
-    public DefaultTransformerExtensionPoint() {
-    }
-
-    public void addTransformer(String sourceType, String resultType, int weight, Transformer transformer, boolean publicTransformer) {
-        if (logger.isLoggable(Level.FINE)) {
-            String className = transformer.getClass().getName();
-            boolean lazy = false;
-            boolean pull = (transformer instanceof PullTransformer);
-            if (transformer instanceof LazyPullTransformer) {
-                className = ((LazyPullTransformer)transformer).transformerDeclaration.getClassName();
-                lazy = true;
-            }
-            if (transformer instanceof LazyPushTransformer) {
-                className = ((LazyPushTransformer)transformer).transformerDeclaration.getClassName();
-                lazy = true;
-            }
-
-            logger.fine("Adding transformer: " + className
-                + ";source="
-                + sourceType
-                + ",target="
-                + resultType
-                + ",weight="
-                + weight
-                + ",type="
-                + (pull ? "pull" : "push")
-                + ",lazy="
-                + lazy);
-        }
-        graph.addEdge(sourceType, resultType, transformer, weight, publicTransformer);
-    }
-
-    public void addTransformer(Transformer transformer, boolean publicTransformer) {
-        addTransformer(transformer.getSourceDataBinding(),
-                       transformer.getTargetDataBinding(),
-                       transformer.getWeight(),
-                       transformer, publicTransformer);
-    }
-
-    public boolean removeTransformer(String sourceType, String resultType) {
-        return graph.removeEdge(sourceType, resultType);
-    }
-
-    public Transformer getTransformer(String sourceType, String resultType) {
-        loadTransformers();
-
-        DirectedGraph<Object, Transformer>.Edge edge = graph.getEdge(sourceType, resultType);
-        return (edge == null) ? null : edge.getValue();
-    }
-
-    /**
-     * Dynamically load transformers registered under META-INF/services.
-     *
-     */
-    private void loadTransformers() {
-        if (loadedTransformers) {
-            return;
-        }
-        loadTransformers(PullTransformer.class);
-        loadTransformers(PushTransformer.class);
-        loadedTransformers = true;
-    }
-
-    /**
-     * Dynamically load transformers registered under META-INF/services.
-     * 
-     * @param transformerClass
-     */
-    private void loadTransformers(Class<?> transformerClass) {
-
-        // Get the transformer service declarations
-        Set<ServiceDeclaration> transformerDeclarations;
-
-        try {
-            transformerDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(transformerClass);
-
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-
-        // Load transformers
-        for (ServiceDeclaration transformerDeclaration : transformerDeclarations) {
-            Map<String, String> attributes = transformerDeclaration.getAttributes();
-
-            String source = attributes.get("source");
-            String target = attributes.get("target");
-            int weight = Integer.valueOf(attributes.get("weight"));
-            String b = attributes.get("public");
-            boolean pub = true;
-            if (b != null) {
-                pub = Boolean.valueOf(b);
-            }
-
-            // Create a transformer wrapper and register it
-            Transformer transformer;
-            if (transformerClass == PullTransformer.class) {
-                transformer = new LazyPullTransformer(source, target, weight, transformerDeclaration);
-            } else {
-                transformer = new LazyPushTransformer(source, target, weight, transformerDeclaration);
-            }
-            addTransformer(transformer, pub);
-        }
-    }
-
-    /**
-     * A transformer facade allowing transformers to be lazily loaded
-     * and initialized.
-     */
-    private static class LazyPullTransformer implements PullTransformer<Object, Object> {
-
-        private String source;
-        private String target;
-        private int weight;
-        private ServiceDeclaration transformerDeclaration;
-        private PullTransformer<Object, Object> transformer;
-
-        public LazyPullTransformer(String source, String target, int weight, ServiceDeclaration transformerDeclaration) {
-            this.source = source;
-            this.target = target;
-            this.weight = weight;
-            this.transformerDeclaration = transformerDeclaration;
-        }
-
-        /**
-         * Load and instantiate the transformer class.
-         * 
-         * @return The transformer.
-         */
-        @SuppressWarnings("unchecked")
-        private PullTransformer<Object, Object> getTransformer() {
-            if (transformer == null) {
-                try {
-                    Class<PullTransformer<Object, Object>> transformerClass =
-                        (Class<PullTransformer<Object, Object>>)transformerDeclaration.loadClass();
-                    Constructor<PullTransformer<Object, Object>> constructor = transformerClass.getConstructor();
-                    transformer = constructor.newInstance();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return transformer;
-        }
-
-        public String getSourceDataBinding() {
-            return source;
-        }
-
-        public String getTargetDataBinding() {
-            return target;
-        }
-
-        public int getWeight() {
-            return weight;
-        }
-
-        public Object transform(Object source, TransformationContext context) {
-            return getTransformer().transform(source, context);
-        }
-
-        public String toString() {
-            StringBuffer sb = new StringBuffer(super.toString());
-            sb.append(";className=").append(transformerDeclaration.getClassName());
-            return sb.toString();
-        }
-    }
-
-    /**
-     * A transformer facade allowing transformers to be lazily loaded
-     * and initialized.
-     */
-    private static class LazyPushTransformer implements PushTransformer<Object, Object> {
-
-        private String source;
-        private String target;
-        private int weight;
-        private ServiceDeclaration transformerDeclaration;
-        private PushTransformer<Object, Object> transformer;
-
-        public LazyPushTransformer(String source, String target, int weight, ServiceDeclaration transformerDeclaration) {
-            this.source = source;
-            this.target = target;
-            this.weight = weight;
-            this.transformerDeclaration = transformerDeclaration;
-        }
-
-        /**
-         * Load and instantiate the transformer class.
-         * 
-         * @return The transformer.
-         */
-        @SuppressWarnings("unchecked")
-        private PushTransformer<Object, Object> getTransformer() {
-            if (transformer == null) {
-                try {
-                    Class<PushTransformer<Object, Object>> transformerClass =
-                        (Class<PushTransformer<Object, Object>>)transformerDeclaration.loadClass();
-                    Constructor<PushTransformer<Object, Object>> constructor = transformerClass.getConstructor();
-                    transformer = constructor.newInstance();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            return transformer;
-        }
-
-        public String getSourceDataBinding() {
-            return source;
-        }
-
-        public String getTargetDataBinding() {
-            return target;
-        }
-
-        public int getWeight() {
-            return weight;
-        }
-
-        public void transform(Object source, Object sink, TransformationContext context) {
-            getTransformer().transform(source, sink, context);
-        }
-
-        public String toString() {
-            StringBuffer sb = new StringBuffer(super.toString());
-            sb.append(";className=").append(transformerDeclaration.getClassName());
-            return sb.toString();
-        }
-    }
-
-    //FIXME The following methods should be on a different class from
-    // extension point
-
-    public List<Transformer> getTransformerChain(String sourceType, String resultType) {
-        loadTransformers();
-
-        String source = sourceType;
-        String result = resultType;
-        List<Transformer> transformers = new ArrayList<Transformer>();
-        // First check if there is a direct path, if yes, use it regardless of the weight
-        DirectedGraph<Object, Transformer>.Edge link = graph.getEdge(sourceType, resultType);
-        if (link != null) {
-            transformers.add(link.getValue());
-        } else {
-            DirectedGraph<Object, Transformer>.Path path = graph.getShortestPath(source, result);
-            if (path == null) {
-                return null;
-            }
-            for (DirectedGraph<Object, Transformer>.Edge edge : path.getEdges()) {
-                transformers.add(edge.getValue());
-            }
-        }
-        return transformers;
-    }
-
-    @Override
-    public String toString() {
-        loadTransformers();
-
-        return graph.toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
deleted file mode 100644
index 6b8acfc7b4..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.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;
-
-import java.util.Map;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-/**
- * This interface will be used as a Tuscany system service to perform data mediations
- * 
- * Mediate the data from one type to the other one
- *
- * @version $Rev$ $Date$
- */
-public interface Mediator {
-
-    /**
-     * Mediate the data from the source type to the target type
-     * @param source The data to be mediated
-     * @param sourceDataType Data type for the source data
-     * @param targetDataType Data type for the target data
-     * @param context 
-     * @return
-     */
-    Object mediate(Object source, DataType sourceDataType, DataType targetDataType, Map<String, Object> context);
-    /**
-     * Mediate the source data into the target which is a sink to receive the data
-     * @param source The data to be mediated
-     * @param target The sink to receive data
-     * @param sourceDataType Data type for the source data
-     * @param targetDataType Data type for the target data
-     */
-    void mediate(
-            Object source,
-            Object target,
-            DataType sourceDataType,
-            DataType targetDataType,
-            Map<String, Object> context);
-    
-    /**
-     * Get the DataBindings used by this mediator.
-     * @return
-     */
-    DataBindingExtensionPoint getDataBindings();
-    
-    /**
-     * Get the Transformers used by this mediator.
-     * @return
-     */
-    TransformerExtensionPoint getTransformers();    
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
deleted file mode 100644
index 81264923eb..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.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.databinding;
-
-/**
- * PullTransformer transforms data from one binding format to the other one which can be directly consumed
- * 
- * @param <S> The source data type
- * @param <R> the target data type
- *
- * @version $Rev$ $Date$
- */
-public interface PullTransformer<S, R> extends Transformer {
-    /**
-     * Transform source data into the result type.
-     * 
-     * @param source The source data
-     * @param context The context for the transformation
-     * @return The transformed result
-     */
-    R transform(S source, TransformationContext context);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
deleted file mode 100644
index 600a6477f6..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.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.databinding;
-
-/**
- * A transformer that pushes data from its source into the sink
- * 
- * @param <S>
- * @param <R>
- *
- * @version $Rev$ $Date$
- */
-public interface PushTransformer<S, R> extends Transformer {
-    /**
-     * @param source The source data
-     * @param sink The sink to receive the data 
-     * @param context
-     */
-    void transform(S source, R sink, TransformationContext context);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
deleted file mode 100644
index 4e6d130aa9..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.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.databinding;
-
-import javax.xml.namespace.QName;
-
-/**
- * Type Mapper between XML schema simple data types and java objects
- *
- * @version $Rev$ $Date$
- */
-public interface SimpleTypeMapper {
-    /**
-     * Parse the XML lexical representation into a java object 
-     * @param simpleType The XSD simple type
-     * @param value the XML lexical representation
-     * @param context The context of the transformation
-     * @return A java object for the XML value
-     */
-    Object toJavaObject(QName simpleType, String value, TransformationContext context);
-    /**
-     * Create the XML lexical representation for a java object
-     * @param simpleType The XSD simple type
-     * @param obj The java object
-     * @param context The context of the transformation
-     * @return The XML lexical representation
-     */
-    String toXMLLiteral(QName simpleType, Object obj, TransformationContext context);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
deleted file mode 100644
index 9ffadd1eae..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.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.databinding;
-
-import java.util.Map;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * Context for data transformation
- *
- * @version $Rev$ $Date$
- */
-public interface TransformationContext {
-
-    /**
-     * @return
-     */
-    Operation getSourceOperation();
-
-    /**
-     * @param sourceOperation
-     */
-    void setSourceOperation(Operation sourceOperation);
-
-    /**
-     * @return
-     */
-    Operation getTargetOperation();
-
-    /**
-     * @param targetOperation
-     */
-    void setTargetOperation(Operation targetOperation);
-
-    /**
-     * Get the source data type
-     * 
-     * @return
-     */
-    DataType getSourceDataType();
-
-    /**
-     * Get the target data type
-     * 
-     * @return
-     */
-    DataType getTargetDataType();
-
-    /**
-     * Set the source data type
-     * 
-     * @param sourceDataType
-     */
-    void setSourceDataType(DataType sourceDataType);
-
-    /**
-     * Set the target data type
-     * 
-     * @param targetDataType
-     */
-    void setTargetDataType(DataType targetDataType);
-
-    /**
-     * Get the ClassLoader
-     * 
-     * @return Returns the ClassLoader
-     */
-    ClassLoader getClassLoader();
-
-    /**
-     * Get a map of metadata
-     * 
-     * @return Returns a map of the metadata
-     */
-    Map<String, Object> getMetadata();
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
deleted file mode 100644
index 4f949f7dff..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.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;
-
-
-/**
- * Reports problems during data transformation
- *
- * @version $Rev$ $Date$
- */
-public class TransformationException extends RuntimeException {
-
-    private static final long serialVersionUID = 7662385613693006428L;
-    private String sourceDataBinding;
-    private String targetDataBinding;
-
-    public TransformationException() {
-        super();
-    }
-
-    public TransformationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public TransformationException(String message) {
-        super(message);
-    }
-
-    public TransformationException(Throwable cause) {
-        super(cause);
-    }
-
-    public String getSourceDataBinding() {
-        return sourceDataBinding;
-    }
-
-    public void setSourceDataBinding(String sourceDataBinding) {
-        this.sourceDataBinding = sourceDataBinding;
-    }
-
-    public String getTargetDataBinding() {
-        return targetDataBinding;
-    }
-
-    public void setTargetDataBinding(String targetDataBinding) {
-        this.targetDataBinding = targetDataBinding;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
deleted file mode 100644
index 2aa0ad7c15..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.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.databinding;
-
-/**
- * A transformer provides the data transformation from source type to target type. The cost of the transformation is
- * modelled as weight.
- *
- * @version $Rev$ $Date$
- */
-public interface Transformer {
-    /**
-     * Get the source type that this transformer transforms data from. The type is used as the key when the transformer
-     * is registered with TransformerRegistry.
-     * 
-     * @return A key identifying the source type
-     */
-    String getSourceDataBinding();
-
-    /**
-     * Get the target type that this transformer transforms data into. The type is used as the key when the transformer
-     * is registered with TransformerRegistry.
-     * 
-     * @return A key identifying the target type
-     */
-    String getTargetDataBinding();
-
-    /**
-     * Get the cost of the transformation. The weight can be used to choose the most efficient path if there are more
-     * than one available from the source to the target.
-     * 
-     * @return An integer representing the cost of the transformation
-     */
-    int getWeight();
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
deleted file mode 100644
index ee7efe4860..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.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.databinding;
-
-import java.util.List;
-
-/**
- * An extension point for data transformer extensions.
- *
- * @version $Rev$ $Date$
- */
-public interface TransformerExtensionPoint {
-
-    /**
-     * Register a transformer
-     * 
-     * @param sourceDataBinding
-     * @param targetDataBinding
-     * @param weight
-     * @param transformer
-     * @param publicTransformer TODO
-     */
-    void addTransformer(String sourceDataBinding,
-                        String targetDataBinding,
-                        int weight,
-                        Transformer transformer,
-                        boolean publicTransformer);
-
-    /**
-     * Register a transformer
-     * 
-     * @param transformer
-     * @param publicTransformer TODO
-     */
-    void addTransformer(Transformer transformer, boolean publicTransformer);
-
-    /**
-     * Unregister a transformer
-     * 
-     * @param sourceDataBinding
-     * @param targetDataBinding
-     * @return
-     */
-    boolean removeTransformer(String sourceDataBinding, String targetDataBinding);
-
-    /**
-     * Get the direct Transformer which can transform data from source type to
-     * result type
-     * 
-     * @param sourceDataBinding
-     * @param targetDataBinding
-     * @return
-     */
-    Transformer getTransformer(String sourceDataBinding, String targetDataBinding);
-
-    /**
-     * Get the a chain of Transformers which can transform data from source type
-     * to result type
-     * 
-     * @param sourceDataBinding
-     * @param targetDataBinding
-     * @return
-     */
-    List<Transformer> getTransformerChain(String sourceDataBinding, String targetDataBinding);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
deleted file mode 100644
index a91410ed71..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.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;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * A contract for transformers to deal with wrapping/unwrapping for WSDL wrapper style operations
- *
- * @version $Rev$ $Date$
- */
-public interface WrapperHandler<T> {
-    /**
-     * Create a wrapper element
-     * @param operation The operation
-     * @param input Is it for input or output
-     * @return An object representing the wrapper element
-     */
-    T create(Operation operation, boolean input);
-
-    /**
-     * Get the data type for the wrapper
-     * @param operation The operation
-     * @param input Is it for input or output?
-     * @return The data type of the wrapper, null if it's not a wrapper type
-     */
-    DataType getWrapperType(Operation operation, boolean input);
-
-    /**
-     * Check if the given data is an instance of the wrapper
-     * @param wrapper
-     * @param operation The operation
-     * @param input Input or output
-     * @return
-     */
-    boolean isInstance(Object wrapper, Operation operation, boolean input);
-
-    /**
-     * Populate the wrapper element with the child objects
-     * @param wrapper The wrapper object
-     * @param childObjects The child objects
-     * @param operation The operation
-     * @param input Is it for input or output
-     */
-    public void setChildren(T wrapper,
-                            Object[] childObjects,
-                            Operation operation,
-                            boolean input);
-
-    /**
-     * Get a list of child elements from the wrapper
-     * @param wrapper The wrapper object
-     * @param operation The operation
-     * @param input Is it for input or output
-     * @return child elements under the wrapper
-     */
-    List getChildren(T wrapper, Operation operation, boolean input);
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
deleted file mode 100644
index e940f8675f..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.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;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-
-/**
- * XML and schema helper for Java types
- */
-public interface XMLTypeHelper {
-
-    // FIXME: This method seems to require the XMLHelper instance to be stateful
-    /**
-     * Convert a Java type into XML type information 
-     * @param javaType the physical Java class
-     * @param logical the logical type information
-     * @return the XML type information
-     */
-    TypeInfo getTypeInfo(Class javaType, Object logical);
-
-    /**
-     * Get schema definitions for the Java types known to this helper
-     * @return A list of schema definitions
-     */
-    // List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver);
-    
-    /**
-     * Get a list of XML schemas for the given data types
-     * @param factory
-     * @param resolver
-     * @param dataTypes
-     * @return
-     */
-    List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, List<DataType> dataTypes);
-    /**
-     * Get a list of XML schemas for the given interface
-     * @param factory
-     * @param resolver
-     * @param intf
-     * @return
-     */
-    List<XSDefinition> getSchemaDefinitions(XSDFactory factory, ModelResolver resolver, Interface intf);
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
deleted file mode 100644
index 4405077e29..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.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.databinding.annotation;
-
-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;
-
-/**
- * Used to demarcate the mapping style for an interface or operation
- *
- * @version $Rev$ $Date$
- */
-// FIXME: [rfeng] We should consider to use javax.jws.soap.SOAPBinding
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-public @interface DataBinding {
-
-    /**
-     * Indicate the effective databinding that controls the WSDL/Java mapping of the 
-     * interface/operation
-     * 
-     * @return the data binding with the MIME media type syntax
-     */
-    String value();
-    
-    /**
-     * Indicate if the operation is mapped using WRAPPED or BARE style. Originated from
-     * javax.jws.soap.SOAPBinding.ParameterStyle: Determines whether method parameters 
-     * represent the entire message body, or whether the parameters are elements wrapped 
-     * inside a top-level element named after the operation
-     * 
-     * @return true if the parameter style is WRAPPED, false if BARE
-     */
-    boolean wrapped() default false;
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
deleted file mode 100644
index 650e909c61..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.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.databinding.annotation;
-
-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;
-
-/**
- * Used to demarcate expected data types for parameters and return type
- *
- * @version $Rev$ $Date$
- */
-@Target( {METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface DataType {
-
-    /**
-     * Returns the data binding configuration in MIME media type syntax
-     * @return the data binding
-     */
-    String value();
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
deleted file mode 100644
index 640a43f55d..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.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.databinding.externalizable;

-

-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;

-

-/**

- * DataNinding for Externalizable objects.

- *

- * @version $Rev$ $Date$

- */

-public class ExternalizableDataBinding extends BaseDataBinding {

-    

-    public static final String NAME = java.io.Externalizable.class.getName();

-    public static final String[] ALIASES = new String[] {"externalizable"};

-

-    public ExternalizableDataBinding() {

-        super(NAME, ALIASES, java.io.Externalizable.class);

-    }

-

-    

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
deleted file mode 100644
index 4bbcf7ddef..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.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.databinding.impl;
-
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.XMLTypeHelper;
-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;
-
-/**
- * Base Implementation of DataBinding
- * 
- * @version $Rev$ $Date$
- */
-public abstract class BaseDataBinding implements DataBinding {
-
-    private Class<?> baseType;
-
-    private String name;
-    private String[] aliases;
-
-    /**
-     * Create a databinding with the base java type whose name will be used as
-     * the name of the databinding
-     * 
-     * @param baseType The base java class or interface representing the
-     *            databinding, for example, org.w3c.dom.Node
-     */
-    protected BaseDataBinding(Class<?> baseType) {
-        this(baseType.getName(), null, baseType);
-    }
-
-    /**
-     * Create a databinding with the name and base java type
-     * 
-     * @param name The name of the databinding
-     * @param baseType The base java class or interface representing the
-     *            databinding, for example, org.w3c.dom.Node
-     */
-    protected BaseDataBinding(String name, Class<?> baseType) {
-        this(name, null, baseType);
-    }
-
-    /**
-     * Create a databinding with the name and base java type
-     * 
-     * @param name The name of the databinding
-     * @param aliases The aliases of the databinding
-     * @param baseType The base java class or interface representing the
-     *            databinding, for example, org.w3c.dom.Node
-     */
-    protected BaseDataBinding(String name, String[] aliases, Class<?> baseType) {
-        this.name = name;
-        this.baseType = baseType;
-        this.aliases = aliases;
-    }
-
-    @SuppressWarnings("unchecked")
-    public boolean introspect(DataType type, Operation operation) {
-        assert type != null;
-        Class cls = type.getPhysical();
-        if (baseType != null && baseType.isAssignableFrom(cls)) {
-            type.setDataBinding(getName());
-            if (type.getLogical() == null) {
-                type.setLogical(XMLType.UNKNOWN);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public DataType introspect(Object value, Operation operation) {
-        if (value == null) {
-            return null;
-        } else {
-            DataType<Class> dataType = new DataTypeImpl<Class>(value.getClass(), value.getClass());
-            if (introspect(dataType, (Operation) null)) {
-                return dataType;
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public final String getName() {
-        return name;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.DataBinding#getWrapperHandler()
-     */
-    public WrapperHandler getWrapperHandler() {
-        return null;
-    }
-
-    public Object copy(Object object, DataType dataType, Operation operation) {
-        return object;
-    }
-
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SimpleTypeMapperImpl();
-    }
-
-    public XMLTypeHelper getXMLTypeHelper() {
-        return null;
-    }
-
-    public String[] getAliases() {
-        return aliases;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
deleted file mode 100644
index 94a2cdb0bb..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.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.databinding.impl;
-
-import org.apache.tuscany.sca.databinding.Transformer;
-
-/**
- * Base Implementation of Transformer which provides the registration to the
- * transformer registry
- * 
- * @version $Rev$ $Date$
- */
-public abstract class BaseTransformer<S, T> implements Transformer {
-
-    protected BaseTransformer() {
-        super();
-    }
-
-    protected abstract Class<S> getSourceType();
-
-    protected abstract Class<T> getTargetType();
-
-    public String getSourceDataBinding() {
-        return getSourceType().getName();
-    }
-
-    public String getTargetDataBinding() {
-        return getTargetType().getName();
-    }
-
-    public int getWeight() {
-        // default to 50
-        return 50;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
deleted file mode 100644
index 64b3d22c10..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.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.databinding.impl;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-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;
-    }
-
-    /**
-     * @param context
-     * @param element
-     */
-    public static Element adjustElementName(TransformationContext context, Element element) {
-        if (context != null) {
-            DataType dataType = context.getTargetDataType();
-            Object logical = dataType == null ? null : dataType.getLogical();
-            if (!(logical instanceof XMLType)) {
-                return element;
-            }
-            XMLType xmlType = (XMLType)logical;
-            QName name = new QName(element.getNamespaceURI(), element.getLocalName());
-            if (xmlType.isElement() && !xmlType.getElementName().equals(name)) {
-                QName newName = xmlType.getElementName();
-                String prefix = newName.getPrefix();
-                String qname = newName.getLocalPart();
-                if (prefix != null && !prefix.equals("")) {
-                    qname = prefix + ":" + qname;
-                }
-                Document doc = element.getOwnerDocument();
-                Element newElement = doc.createElementNS(newName.getNamespaceURI(), qname);
-                // Copy the attributes to the new element
-                NamedNodeMap attrs = element.getAttributes();
-                for (int i = 0; i < attrs.getLength(); i++) {
-                    Attr attr = (Attr)doc.importNode(attrs.item(i), true);
-                    newElement.getAttributes().setNamedItem(attr);
-                }
-
-                // Move all the children
-                while (element.hasChildNodes()) {
-                    newElement.appendChild(element.getFirstChild());
-                }
-
-                // Replace the old node with the new node
-                if (element.getParentNode() != null) {
-                    element.getParentNode().replaceChild(newElement, element);
-                }
-
-                return newElement;
-            }
-        }
-        return element;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
deleted file mode 100644
index 01916dfb96..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Directed, weighted graph
- * 
- * @param <V> The type of vertex object
- * @param <E> The type of edge object
- *
- * @version $Rev$ $Date$
- */
-public class DirectedGraph<V, E> implements Cloneable {
-    private final Map<V, Vertex> vertices = new HashMap<V, Vertex>();
-
-    /**
-     * Key for the shortest path cache
-     */
-    private final class VertexPair {
-        private Vertex source;
-
-        private Vertex target;
-
-        /**
-         * @param source
-         * @param target
-         */
-        private VertexPair(Vertex source, Vertex target) {
-            super();
-            this.source = source;
-            this.target = target;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!VertexPair.class.isInstance(object)) {
-                return false;
-            }
-            VertexPair pair = (VertexPair)object;
-            return source == pair.source && target == pair.target;
-        }
-
-        @Override
-        public int hashCode() {
-            int x = source == null ? 0 : source.hashCode();
-            int y = target == null ? 0 : target.hashCode();
-            return x ^ y;
-        }
-
-    }
-
-    // Fix for TUSCANY-2069, making the map concurrent
-    private final Map<VertexPair, Path> paths = new ConcurrentHashMap<VertexPair, Path>();
-    private final Path NULL_PATH = new Path();
-
-    /**
-     * Vertex of a graph
-     */
-    public final class Vertex {
-        private V value;
-
-        // TODO: Do we want to support multiple edges for a vertex pair? If so,
-        // we should use a List instead of Map
-        private Map<Vertex, Edge> outEdges = new HashMap<Vertex, Edge>();
-        private Map<Vertex, Edge> inEdges = new HashMap<Vertex, Edge>();
-
-        private Vertex(V value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return "(" + value + ")";
-        }
-
-        public V getValue() {
-            return value;
-        }
-
-        public Map<Vertex, Edge> getOutEdges() {
-            return outEdges;
-        }
-
-        public Map<Vertex, Edge> getInEdges() {
-            return inEdges;
-        }
-
-    }
-
-    /**
-     * An Edge connects two vertices in one direction
-     */
-    public final class Edge {
-        private Vertex sourceVertex;
-
-        private Vertex targetVertex;
-
-        private E value;
-
-        private int weight;
-
-        private boolean pub = true;
-
-        public Edge(Vertex source, Vertex target, E value, int weight, boolean pub) {
-            this.sourceVertex = source;
-            this.targetVertex = target;
-            this.value = value;
-            this.weight = weight;
-            this.pub = pub;
-        }
-
-        @Override
-        public String toString() {
-            return sourceVertex + "->" + targetVertex + "[" + value + "," + weight + "]";
-        }
-
-        public E getValue() {
-            return value;
-        }
-
-        public void setValue(E value) {
-            this.value = value;
-        }
-
-        public Vertex getTargetVertex() {
-            return targetVertex;
-        }
-
-        public void setTargetVertex(Vertex vertex) {
-            this.targetVertex = vertex;
-        }
-
-        public int getWeight() {
-            return weight;
-        }
-
-        public void setWeight(int weight) {
-            this.weight = weight;
-        }
-
-        public Vertex getSourceVertex() {
-            return sourceVertex;
-        }
-
-        public void setSourceVertex(Vertex sourceVertex) {
-            this.sourceVertex = sourceVertex;
-        }
-
-        public boolean isPublic() {
-            return pub;
-        }
-
-        public void setPublic(boolean pub) {
-            this.pub = pub;
-        }
-    }
-
-    private final class Node implements Comparable<Node> {
-
-        private long distance = Integer.MAX_VALUE;
-
-        private Node previous; // NOPMD by rfeng on 9/26/06 9:17 PM
-
-        private Vertex vertex; // NOPMD by rfeng on 9/26/06 9:17 PM
-
-        private Node(Vertex vertex) {
-            this.vertex = vertex;
-        }
-
-        public int compareTo(Node o) {
-            return (distance > o.distance) ? 1 : ((distance == o.distance) ? 0 : -1);
-        }
-    }
-
-    public void addEdge(V source, V target, E edgeValue, int weight, boolean publicEdge) {
-        Vertex s = getVertex(source);
-        if (s == null) {
-            s = new Vertex(source);
-            vertices.put(source, s);
-        }
-        Vertex t = getVertex(target);
-        if (t == null) {
-            t = new Vertex(target);
-            vertices.put(target, t);
-        }
-        Edge edge = new Edge(s, t, edgeValue, weight, publicEdge);
-        s.outEdges.put(t, edge);
-        t.inEdges.put(s, edge);
-    }
-
-    public void addEdge(V soure, V target) {
-        addEdge(soure, target, null, 0, true);
-    }
-
-    public Vertex getVertex(V source) {
-        Vertex s = vertices.get(source);
-        return s;
-    }
-
-    public boolean removeEdge(V source, V target) {
-        Vertex s = getVertex(source);
-        if (s == null) {
-            return false;
-        }
-
-        Vertex t = getVertex(target);
-        if (t == null) {
-            return false;
-        }
-
-        return s.outEdges.remove(t) != null && t.inEdges.remove(s) != null;
-
-    }
-
-    public void removeEdge(Edge edge) {
-        edge.sourceVertex.outEdges.remove(edge.targetVertex);
-        edge.targetVertex.inEdges.remove(edge.sourceVertex);
-    }
-
-    public void removeVertex(Vertex vertex) {
-        vertices.remove(vertex.getValue());
-        for (Edge e : new ArrayList<Edge>(vertex.outEdges.values())) {
-            removeEdge(e);
-        }
-        for (Edge e : new ArrayList<Edge>(vertex.inEdges.values())) {
-            removeEdge(e);
-        }
-    }
-
-    public Edge getEdge(Vertex source, Vertex target) {
-        return source.outEdges.get(target);
-    }
-
-    public Edge getEdge(V source, V target) {
-        Vertex sv = getVertex(source);
-        if (sv == null) {
-            return null;
-        }
-        Vertex tv = getVertex(target);
-        if (tv == null) {
-            return null;
-        }
-        return getEdge(getVertex(source), getVertex(target));
-    }
-
-    /**
-     * Get the shortest path from the source vertex to the target vertex using
-     * Dijkstra's algorithm. If there's no path, null will be returned. If the
-     * source is the same as the target, it returns a path with empty edges with
-     * weight 0.
-     * 
-     * @param sourceValue The value identifies the source
-     * @param targetValue The value identifies the target
-     * @return The shortest path
-     */
-    public Path getShortestPath(V sourceValue, V targetValue) {
-        Vertex source = getVertex(sourceValue);
-        if (source == null) {
-            return null;
-        }
-        Vertex target = getVertex(targetValue);
-        if (target == null) {
-            return null;
-        }
-
-        VertexPair pair = new VertexPair(source, target);
-        Path path = null;
-        if (paths.containsKey(pair)) {
-            path = paths.get(pair);
-            return path == NULL_PATH? null: path;
-        }
-
-        // Check if there is a direct link, if yes, use it instead
-        Edge direct = getEdge(source, target);
-        path = new Path();
-        if (direct != null) {
-            path.addEdge(direct);
-            paths.put(pair, path);
-            return path;
-        }
-
-        Map<Vertex, Node> nodes = new HashMap<Vertex, Node>();
-        for (Vertex v : vertices.values()) {
-            Node node = new Node(v);
-            if (v == source) {
-                node.distance = 0;
-            }
-            nodes.put(v, node);
-        }
-
-        Set<Node> otherNodes = new HashSet<Node>(nodes.values());
-        Set<Node> nodesOnPath = new HashSet<Node>();
-        Node nextNode = null;
-        while (!otherNodes.isEmpty()) {
-            nextNode = extractMin(otherNodes);
-            if (nextNode.vertex == target) {
-                path = getPath(nextNode);
-                paths.put(pair, path); // Cache it
-                return path == NULL_PATH? null: path;
-            }
-            nodesOnPath.add(nextNode);
-            for (Edge edge : nextNode.vertex.outEdges.values()) {
-                Node adjacentNode = nodes.get(edge.targetVertex);
-                // The private edge can only be used if the edge connects to the target directly
-                if (edge.isPublic() || edge.getTargetVertex() == target) {
-                    if (nextNode.distance + edge.weight < adjacentNode.distance) {
-                        adjacentNode.distance = nextNode.distance + edge.weight;
-                        adjacentNode.previous = nextNode;
-                    }
-                }
-            }
-        }
-        paths.put(pair, NULL_PATH); // Cache it
-        return null;
-    }
-
-    /**
-     * Searches for the vertex u in the vertex set Q that has the least d[u]
-     * value. That vertex is removed from the set Q and returned to the user.
-     * 
-     * @param nodes
-     * @return
-     */
-    private Node extractMin(Set<Node> nodes) {
-        Node node = Collections.min(nodes);
-        nodes.remove(node);
-        return node;
-    }
-
-    /**
-     * The path between two vertices
-     */
-    public final class Path {
-        private List<Edge> edges = new LinkedList<Edge>();
-
-        private int weight;
-
-        public int getWeight() {
-            return weight;
-        }
-
-        public List<Edge> getEdges() {
-            return edges;
-        }
-
-        public void addEdge(Edge edge) {
-            edges.add(0, edge);
-            weight += edge.weight;
-        }
-
-        @Override
-        public String toString() {
-            return edges + ", " + weight;
-        }
-    }
-
-    private Path getPath(Node t) {
-        if (t.distance == Integer.MAX_VALUE) {
-            return NULL_PATH;
-        }
-        Path path = new Path();
-        Node u = t;
-        while (u.previous != null) {
-            Edge edge = getEdge(u.previous.vertex, u.vertex);
-            path.addEdge(edge);
-            u = u.previous;
-        }
-        return path;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        for (Vertex v : vertices.values()) {
-            sb.append(v.outEdges.values()).append("\n");
-        }
-        return sb.toString();
-    }
-
-    public Map<V, Vertex> getVertices() {
-        return vertices;
-    }
-
-    public void addGraph(DirectedGraph<V, E> otherGraph) {
-        for (Vertex v : otherGraph.vertices.values()) {
-            for (Edge e : v.outEdges.values()) {
-                addEdge(e.sourceVertex.value, e.targetVertex.value, e.value, e.weight, true);
-            }
-        }
-    }
-
-    private Vertex getFirst() {
-        for (Vertex v : vertices.values()) {
-            if (v.inEdges.isEmpty()) {
-                return v;
-            }
-        }
-        if (!vertices.isEmpty()) {
-            throw new IllegalArgumentException("Circular ordering has been detected: " + toString());
-        } else {
-            return null;
-        }
-    }
-
-    public List<V> topologicalSort(boolean readOnly) {
-        DirectedGraph<V, E> graph = (!readOnly) ? this : (DirectedGraph<V, E>)clone();
-        List<V> list = new ArrayList<V>();
-        while (true) {
-            Vertex v = graph.getFirst();
-            if (v == null) {
-                break;
-            }
-            list.add(v.getValue());
-            graph.removeVertex(v);
-        }
-
-        return list;
-    }
-
-    @Override
-    public Object clone() {
-        DirectedGraph<V, E> copy = new DirectedGraph<V, E>();
-        copy.addGraph(this);
-        return copy;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
deleted file mode 100644
index cc7b40d06b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.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.impl;
-
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-/**
- * This is a special transformer to transform the output from one IDL to the
- * other one
- *
- * @version $Rev$ $Date$
- */
-public class Group2GroupTransformer extends BaseTransformer<Object, Object> implements
-    PullTransformer<Object, Object> {
-
-    protected Mediator mediator;
-
-    /**
-     * @param wrapperHandler
-     */
-    public Group2GroupTransformer() {
-        super();
-    }
-
-    /**
-     * @param mediator the mediator to set
-     */
-    public void setMediator(Mediator mediator) {
-        this.mediator = mediator;
-    }
-
-    @Override
-    public String getSourceDataBinding() {
-        return GroupDataBinding.NAME;
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return GroupDataBinding.NAME;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getSourceType()
-     */
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.impl.BaseTransformer#getTargetType()
-     */
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 10;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object transform(Object source, TransformationContext context) {
-        DataType<DataType> sourceType = context.getSourceDataType();
-        DataType<DataType> targetType = context.getTargetDataType();
-
-        return mediator.mediate(source, sourceType.getLogical(), targetType.getLogical(), context.getMetadata());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
deleted file mode 100644
index 4a918488c5..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.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.databinding.impl;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * The base class for a special databinding which represents a group of other databindings
- * 
- * @version $Rev$ $Date$
- */
-public abstract class GroupDataBinding extends BaseDataBinding {
-    public static final String NAME = "databinding:group";
-
-    /**
-     * Marker type is a java class or interface representing the data format. 
-     */
-    protected Class[] markerTypes;
-
-    public GroupDataBinding(Class[] types) {
-        super(NAME, null, GroupDataBinding.class);
-        this.markerTypes = types;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (markerTypes == null) {
-            return false;
-        }
-        Type physical = type.getPhysical();
-        if (physical instanceof ParameterizedType) {
-            physical = ((ParameterizedType)physical).getRawType();
-        }
-        if (!(physical instanceof Class)) {
-            return false;
-        }
-        Class cls = (Class)physical;
-        for (Class<?> c : markerTypes) {
-            if (isTypeOf(c, cls)) {
-                type.setDataBinding(getDataBinding(c));
-                Object logical = getLogical(cls, null);
-                if (logical != null) {
-                    type.setLogical(getLogical(cls, null));
-                } else {
-                    type.setLogical(XMLType.UNKNOWN);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Test if the given type is a subtype of the base type
-     * @param markerType
-     * @param type
-     * @return
-     */
-    protected boolean isTypeOf(Class<?> markerType, Class<?> type) {
-        return markerType.isAssignableFrom(type);
-    }
-
-    /**
-     * Derive the databinding name from a base class
-     * @param baseType
-     * @return
-     */
-    protected String getDataBinding(Class<?> baseType) {
-        return baseType.getName();
-    }
-
-    /**
-     * Get the logical type
-     * @param type The java type
-     * @param operation TODO
-     * @return
-     */
-    protected abstract Object getLogical(Class<?> type, Operation operation);
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
deleted file mode 100644
index 45896ca6a1..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.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.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Transformer to convert data from a simple java object to a databinding's representation
- *
- * @version $Rev$ $Date$
- */
-public abstract class Java2SimpleTypeTransformer<T> extends BaseTransformer<Object, T> implements
-        PullTransformer<Object, T> {
-
-    protected SimpleTypeMapper mapper;
-
-    public Java2SimpleTypeTransformer() {
-        this.mapper = new SimpleTypeMapperImpl();
-    }
-    
-    public Java2SimpleTypeTransformer(SimpleTypeMapper mapper) {
-        this.mapper = (mapper != null) ? mapper : new SimpleTypeMapperImpl();
-    }
-
-    public T transform(Object source, TransformationContext context) {
-        XMLType xmlType = (XMLType) context.getTargetDataType().getLogical();
-        String text = mapper.toXMLLiteral(xmlType.getTypeName(), source, context);
-        return createElement(xmlType.getElementName(), text, context);
-    }
-
-    @Override
-    public Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 10000;
-    }
-
-    protected abstract T createElement(QName element, String literal, TransformationContext context);
-
-    @Override
-    public String getSourceDataBinding() {
-        return SimpleJavaDataBinding.NAME;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
deleted file mode 100644
index b7ddf87a41..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.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.databinding.impl;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-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.Transformer;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-
-/**
- * Default Mediator implementation
- *
- * @version $Rev$ $Date$
- */
-public class MediatorImpl implements Mediator {
-
-    private DataBindingExtensionPoint dataBindings;
-    private TransformerExtensionPoint transformers;
-
-    public MediatorImpl(DataBindingExtensionPoint dataBindings, TransformerExtensionPoint transformers) {
-        this.dataBindings = dataBindings;
-        this.transformers = transformers;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Object mediate(Object source, DataType sourceDataType, DataType targetDataType, Map<String, Object> metadata) {
-        if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
-            if (source != null) {
-                Operation operation = (Operation) metadata.get("source.operation");
-                sourceDataType = dataBindings.introspectType(source, operation);
-            }
-        }
-        if (sourceDataType == null || targetDataType == null) {
-            return source;
-        } else if (sourceDataType.equals(targetDataType)) {
-            return source;
-        }
-
-        List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
-
-        Object result = source;
-        int size = path.size();
-        int i = 0;
-        while (i < size) {
-            Transformer transformer = path.get(i);
-            TransformationContext context =
-                createTransformationContext(sourceDataType, targetDataType, size, i, transformer, metadata);
-            // the source and target type
-            if (transformer instanceof PullTransformer) {
-                // For intermediate node, set data type to null
-                result = ((PullTransformer)transformer).transform(result, context);
-            } else if (transformer instanceof PushTransformer) {
-                DataPipeTransformer dataPipeFactory = (i < size - 1) ? (DataPipeTransformer)path.get(++i) : null;
-                DataPipe dataPipe = dataPipeFactory == null ? null : dataPipeFactory.newInstance();
-                ((PushTransformer)transformer).transform(result, dataPipe.getSink(), context);
-                result = dataPipe.getResult();
-            }
-            i++;
-        }
-
-        return result;
-    }
-
-    private TransformationContext createTransformationContext(DataType sourceDataType,
-                                                              DataType targetDataType,
-                                                              int size,
-                                                              int index,
-                                                              Transformer transformer,
-                                                              Map<String, Object> metadata) {
-        DataType sourceType =
-            (index == 0) ? sourceDataType : new DataTypeImpl<Object>(transformer.getSourceDataBinding(), Object.class,
-                                                                     sourceDataType.getLogical());
-        DataType targetType =
-            (index == size - 1) ? targetDataType : new DataTypeImpl<Object>(transformer.getTargetDataBinding(),
-                                                                            Object.class, targetDataType.getLogical());
-        
-        //FIXME The ClassLoader should be passed in
-        // Allow privileged access to get ClassLoader. Requires RuntimePermission in security
-        // policy.
-        ClassLoader classLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-            public ClassLoader run() {
-                return Thread.currentThread().getContextClassLoader();
-            }
-        });           
-        
-        TransformationContext context = new TransformationContextImpl(sourceType, targetType, classLoader, metadata);
-        return context;
-    }
-
-    @SuppressWarnings("unchecked")
-    public void mediate(Object source,
-                        Object target,
-                        DataType sourceDataType,
-                        DataType targetDataType,
-                        Map<String, Object> metadata) {
-        if (source == null) {
-            // Shortcut for null value
-            return;
-        }
-        if (sourceDataType == null || sourceDataType.getDataBinding() == null) {
-            Operation operation = (Operation) metadata.get("source.operation");
-            sourceDataType = dataBindings.introspectType(source, operation);
-        }
-        if (sourceDataType == null) {
-            return;
-        } else if (sourceDataType.equals(targetDataType)) {
-            return;
-        }
-
-        List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
-        Object result = source;
-        int size = path.size();
-        for (int i = 0; i < size; i++) {
-            Transformer transformer = path.get(i);
-            TransformationContext context =
-                createTransformationContext(sourceDataType, targetDataType, size, i, transformer, metadata);
-
-            if (transformer instanceof PullTransformer) {
-                result = ((PullTransformer)transformer).transform(result, context);
-            } else if (transformer instanceof PushTransformer) {
-                DataPipeTransformer dataPipeFactory = (i < size - 1) ? (DataPipeTransformer)path.get(++i) : null;
-                DataPipe dataPipe = dataPipeFactory == null ? null : dataPipeFactory.newInstance();
-                Object sink = dataPipe != null ? dataPipe.getSink() : target;
-                ((PushTransformer)transformer).transform(result, sink, context);
-                result = (dataPipe != null) ? dataPipe.getResult() : null;
-            }
-        }
-    }
-
-    private List<Transformer> getTransformerChain(DataType sourceDataType, DataType targetDataType) {
-        String sourceId = sourceDataType.getDataBinding();
-        String targetId = targetDataType.getDataBinding();
-        List<Transformer> path = transformers.getTransformerChain(sourceId, targetId);
-        if (path == null) {
-            TransformationException ex =
-                new TransformationException("No path found for the transformation: " + sourceId + "->" + targetId);
-            ex.setSourceDataBinding(sourceId);
-            ex.setTargetDataBinding(targetId);
-            throw ex;
-        }
-        return path;
-    }
-
-    public DataBindingExtensionPoint getDataBindings() {
-        return dataBindings;
-    }
-
-    public TransformerExtensionPoint getTransformers() {
-        return transformers;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
deleted file mode 100644
index a1a89005b3..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.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.impl;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.PushTransformer;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-
-/**
- * A utility class to connect PushTransformer and DataPipe to create a
- * PullTransformer
- * 
- * @param <S> Source type
- * @param <I> Intermediate type
- * @param <R> Result type
- *
- * @version $Rev$ $Date$
- */
-public class PipedTransformer<S, I, R> implements PullTransformer<S, R> {
-    private PushTransformer<S, I> pusher;
-
-    private DataPipeTransformer<I, R> pipe;
-
-    /**
-     * @param pumper
-     * @param pipe
-     */
-    public PipedTransformer(PushTransformer<S, I> pumper, DataPipeTransformer<I, R> pipe) {
-        super();
-        this.pusher = pumper;
-        this.pipe = pipe;
-    }
-
-    public R transform(S source, TransformationContext context) {
-        DataPipe<I, R> dataPipe = pipe.newInstance();
-        pusher.transform(source, dataPipe.getSink(), context);
-        return dataPipe.getResult();
-    }
-
-    public String getSourceDataBinding() {
-        return pusher.getSourceDataBinding();
-    }
-
-    public String getTargetDataBinding() {
-        return pipe.getTargetDataBinding();
-    }
-
-    public int getWeight() {
-        return pusher.getWeight() + pipe.getWeight();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
deleted file mode 100644
index c91176fc2c..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.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.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.PullTransformer;
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Transformer to convert data from a databinding's representation of simple
- * types to Java Objects
- *
- * @version $Rev$ $Date$
- */
-public abstract class SimpleType2JavaTransformer<T> extends BaseTransformer<T, Object> implements
-    PullTransformer<T, Object> {
-
-    protected SimpleTypeMapper mapper;
-
-    public SimpleType2JavaTransformer() {
-        this.mapper = new SimpleTypeMapperImpl();
-    }
-
-    public SimpleType2JavaTransformer(SimpleTypeMapper mapper) {
-        this.mapper = (mapper != null) ? mapper : new SimpleTypeMapperImpl();
-    }
-
-    public Object transform(T source, TransformationContext context) {
-        XMLType xmlType = (XMLType)context.getSourceDataType().getLogical();
-        QName type = (xmlType != null) ? xmlType.getTypeName() : null;
-        if (type == null) {
-            xmlType = (XMLType)context.getTargetDataType().getLogical();
-            type = (xmlType != null) ? xmlType.getTypeName() : null;
-        }
-        Object result = mapper.toJavaObject(type, getText(source), context);
-        close(source);
-        return result;
-    }
-
-    @Override
-    protected Class<Object> getTargetType() {
-        return Object.class;
-    }
-
-    @Override
-    public int getWeight() {
-        // Cannot be used for intermediate
-        return 10000;
-    }
-
-    /**
-     * Get the string value from the source
-     * @param source
-     * @return A string
-     */
-    protected abstract String getText(T source);
-    
-    /**
-     * To be overrided by the subclass
-     * @param source
-     */
-    protected void close(T source) {
-    }
-
-    @Override
-    public String getTargetDataBinding() {
-        return SimpleJavaDataBinding.NAME;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
deleted file mode 100644
index 32a2313f59..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.impl;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-
-/**
- * Simple type mapper that maps from XSD types to Java Classes and Java Classes to XSD types.
- *
- * @version $Rev$ $Date$
- */
-public class SimpleTypeMapperImpl extends XSDDataTypeConverter implements SimpleTypeMapper {
-
-    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<String, Class> XML2JAVA = new HashMap<String, 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 Map<String, TypeInfo> XSD_SIMPLE_TYPES = new HashMap<String, TypeInfo>();
-
-    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");
-
-    private static final String[] XSD_TYPE_NAMES =
-    {"string", "boolean", "double", "float", "int", "integer", "long", "short", "byte", "decimal", "base64Binary",
-     "hexBinary", "anySimpleType", "anyType", "any", "QName", "dateTime", "date", "time", "normalizedString",
-     "token", "unsignedLong", "unsignedInt", "unsignedShort", "unsignedByte", "positiveInteger", "negativeInteger",
-     "nonNegativeInteger", "nonPositiveInteger", "gYearMonth", "gMonthDay", "gYear", "gMonth", "gDay", "duration",
-     "Name", "NCName", "NMTOKEN", "NMTOKENS", "NOTATION", "ENTITY", "ENTITIES", "IDREF", "IDREFS", "anyURI",
-     "language", "ID"};
-
-    static {
-        for (String type : XSD_TYPE_NAMES) {
-            TypeInfo simpleType = new TypeInfo(new QName(URI_2001_SCHEMA_XSD, type), true, null);
-            XSD_SIMPLE_TYPES.put(type, simpleType);
-        }
-    }
-
-    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("string", java.lang.String.class);
-        XML2JAVA.put("integer", java.math.BigInteger.class);
-        XML2JAVA.put("int", int.class);
-        XML2JAVA.put("long", long.class);
-        XML2JAVA.put("short", short.class);
-        XML2JAVA.put("decimal", java.math.BigDecimal.class);
-        XML2JAVA.put("float", float.class);
-        XML2JAVA.put("double", double.class);
-        XML2JAVA.put("boolean", boolean.class);
-        XML2JAVA.put("byte", byte.class);
-        XML2JAVA.put("QName", javax.xml.namespace.QName.class);
-        XML2JAVA.put("dateTime", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("base64Binary", byte[].class);
-        XML2JAVA.put("hexBinary", byte[].class);
-        XML2JAVA.put("unsignedInt", long.class);
-        XML2JAVA.put("unsignedShort", int.class);
-        XML2JAVA.put("unsignedByte", short.class);
-        XML2JAVA.put("time", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("date", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gDay", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gMonth", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gYear", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gYearMonth", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gMonthDay", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("anySimpleType", java.lang.Object.class); // For elements
-        // XML2JAVA.put("anySimpleType", java.lang.String.class); // For
-        // attributes
-        XML2JAVA.put("duration", javax.xml.datatype.Duration.class);
-        XML2JAVA.put("NOTATION", javax.xml.namespace.QName.class);
-    }
-
-    private DatatypeFactory factory;
-
-    public SimpleTypeMapperImpl() {
-        super();
-        try {
-            this.factory = DatatypeFactory.newInstance();
-        } catch (DatatypeConfigurationException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    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 TypeInfo getXMLType(Class javaType) {
-        return XSD_SIMPLE_TYPES.get(JAVA2XML.get(javaType));
-    }
-
-    public Object toJavaObject(QName simpleType, String literal, TransformationContext context) {
-        /**
-         * <ul>
-         * <li>xsd:string --- java.lang.String
-         * <li>xsd:integer --- java.math.BigInteger
-         * <li>xsd:int --- int
-         * <li>xsd:long --- long
-         * <li>xsd:short --- short
-         * <li>xsd:decimal --- java.math.BigDecimal
-         * <li>xsd:float --- float
-         * <li>xsd:double --- double
-         * <li>xsd:boolean --- boolean
-         * <li>xsd:byte --- byte
-         * <li>xsd:QName --- javax.xml.namespace.QName
-         * <li>xsd:dateTime --- javax.xml.datatype.XMLGregorianCalendar
-         * <li>xsd:base64Binary --- byte[]
-         * <li>xsd:hexBinary --- byte[]
-         * <li>xsd:unsignedInt --- long
-         * <li>xsd:unsignedShort --- int
-         * <li>xsd:unsignedByte --- short
-         * <li>xsd:time --- javax.xml.datatype.XMLGregorianCalendar
-         * <li>xsd:date --- javax.xml.datatype.XMLGregorianCalendar
-         * <li>xsd:g* --- javax.xml.datatype.XMLGregorianCalendar
-         * <li>xsd:anySimpleType (for xsd:element of this type)a
-         * java.lang.Object
-         * <li>xsd:anySimpleType (for xsd:attribute of this type)
-         * java.lang.String
-         * <li>xsd:duration javax.xml.datatype.Duration
-         * <li>xsd:NOTATION javax.xml.namespace.QName
-         * </ul>
-         */
-
-        if (literal == null) {
-            return null;
-        }
-        String value = literal.trim();
-
-        QName type = simpleType;
-        if (type.equals(XSD_STRING)) {
-            return parseString(value);
-        } else if (type.equals(XSD_INT)) {
-            return parseInt(value);
-        } else if (type.equals(XSD_INTEGER)) {
-            return parseInteger(value);
-        } else if (type.equals(XSD_INT)) {
-            return parseInt(value);
-        } else if (type.equals(XSD_FLOAT)) {
-            return parseFloat(value);
-        } else if (type.equals(XSD_DOUBLE)) {
-            return parseDouble(value);
-        } else if (type.equals(XSD_SHORT)) {
-            return parseShort(value);
-        } else if (type.equals(XSD_DECIMAL)) {
-            return parseDecimal(value);
-        } else if (type.equals(XSD_BOOLEAN)) {
-            return parseBoolean(value);
-        } else if (type.equals(XSD_BYTE)) {
-            return parseByte(value);
-        } else if (type.equals(XSD_LONG)) {
-            return parseLong(value);
-        } else if (type.equals(XSD_UNSIGNEDBYTE)) {
-            return parseUnsignedShort(value);
-        } else if (type.equals(XSD_UNSIGNEDSHORT)) {
-            return parseUnsignedShort(value);
-        } else if (type.equals(XSD_UNSIGNEDINT)) {
-            return parseUnsignedInt(value);
-        } else if (type.equals(XSD_UNSIGNEDLONG)) {
-            return parseUnsignedInt(value);
-        } else if (type.equals(XSD_DATETIME)) {
-            return parseDateTime(value);
-        } else if (type.equals(XSD_DATE)) {
-            return parseDate(value);
-        } else if (type.equals(XSD_TIME)) {
-            return parseTime(value);
-        } else if (type.equals(XSD_DURATION)) {
-            return parseDuration(value);
-        } else if (type.equals(XSD_HEXBIN)) {
-            return parseHexBinary(value);
-        } else if (type.equals(XSD_BASE64)) {
-            return parseBase64Binary(value);
-        } else if (type.equals(XSD_QNAME)) {
-            NamespaceContext namespaceContext =
-                (NamespaceContext)((context != null) ? context.getMetadata().get(NamespaceContext.class.getName()) : null);
-            return parseQName(value, namespaceContext);
-        } else if (type.equals(XSD_NOTATION)) {
-            NamespaceContext namespaceContext =
-                (NamespaceContext)((context != null) ? context.getMetadata().get(NamespaceContext.class.getName()) : null);
-            return parseQName(value, namespaceContext);
-        } else if (type.equals(XSD_YEAR)) {
-            return factory.newXMLGregorianCalendar(value);
-        } else if (type.equals(XSD_MONTH)) {
-            return factory.newXMLGregorianCalendar(value);
-        } else if (type.equals(XSD_DAY)) {
-            return factory.newXMLGregorianCalendar(value);
-        } else if (type.equals(XSD_YEARMONTH)) {
-            return factory.newXMLGregorianCalendar(value);
-        } else if (type.equals(XSD_MONTHDAY)) {
-            return factory.newXMLGregorianCalendar(value);
-        } else {
-            return value;
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private XMLGregorianCalendar toXMLGregorianCalendar(Date date) {
-        GregorianCalendar c =
-            new GregorianCalendar(date.getYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(),
-                                  date.getSeconds());
-        return factory.newXMLGregorianCalendar(c);
-    }
-
-    private XMLGregorianCalendar toXMLGregorianCalendar(GregorianCalendar calendar) {
-        return factory.newXMLGregorianCalendar(calendar);
-    }
-
-    public String toXMLLiteral(QName simpleType, Object obj, TransformationContext context) {
-        if(obj == null) {
-            // It could be null if nilable=true
-            return null;
-        }
-        if (obj instanceof Float || obj instanceof Double) {
-            if (obj instanceof Float) {
-                return printDouble(((Float)obj).floatValue());
-            } else {
-                return printDouble(((Double)obj).doubleValue());
-            }
-        } else if (obj instanceof GregorianCalendar) {
-            GregorianCalendar calendar = (GregorianCalendar)obj;
-            return toXMLGregorianCalendar(calendar).toXMLFormat();
-        } else if (obj instanceof Date) {
-            return toXMLGregorianCalendar((Date)obj).toXMLFormat();
-        } else if (obj instanceof XMLGregorianCalendar) {
-            return ((XMLGregorianCalendar)obj).toXMLFormat();
-        } else if (obj instanceof byte[]) {
-            if (simpleType != null) {
-                if (simpleType.equals(XSD_BASE64)) {
-                    return printBase64Binary((byte[])obj);
-                } else if (simpleType.equals(XSD_HEXBIN)) {
-                    return printHexBinary((byte[])obj);
-                }
-            }
-        } else if (obj instanceof QName) {
-            NamespaceContext namespaceContext =
-                (NamespaceContext)((context != null) ? context.getMetadata().get(NamespaceContext.class.getName()) : null);
-            return printQName((QName)obj, namespaceContext);
-        }
-        return obj.toString();
-    }
-
-    public static boolean isSimpleXSDType(QName typeName) {
-        if (typeName == null) {
-            return false;
-        }
-        return typeName.getNamespaceURI().equals(URI_2001_SCHEMA_XSD) 
-            && XSD_SIMPLE_TYPES.get(typeName.getLocalPart()) != null;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
deleted file mode 100644
index a6c0639411..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.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.databinding.impl;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-public class TransformationContextImpl implements TransformationContext {
-    private DataType sourceDataType;
-
-    private DataType targetDataType;
-
-    private final Map<String, Object> metadata = new HashMap<String, Object>();
-
-    private WeakReference<ClassLoader> classLoaderRef;
-
-    public TransformationContextImpl() {
-        super();
-        // This is used only for testing
-        setClassLoader(Thread.currentThread().getContextClassLoader());
-    }
-
-    public TransformationContextImpl(DataType sourceDataType,
-                                     DataType targetDataType,
-                                     ClassLoader classLoader,
-                                     Map<String, Object> metadata) {
-        super();
-        this.sourceDataType = sourceDataType;
-        this.targetDataType = targetDataType;
-        setClassLoader(classLoader);
-        if (metadata != null) {
-            this.metadata.putAll(metadata);
-        }
-    }
-
-    public DataType getSourceDataType() {
-        return sourceDataType;
-    }
-
-    public DataType getTargetDataType() {
-        return targetDataType;
-    }
-
-    public void setSourceDataType(DataType sourceDataType) {
-        this.sourceDataType = sourceDataType;
-    }
-
-    public void setTargetDataType(DataType targetDataType) {
-        this.targetDataType = targetDataType;
-    }
-
-    public final void setClassLoader(ClassLoader classLoader) {
-        this.classLoaderRef = new WeakReference<ClassLoader>(classLoader);
-    }
-
-    public ClassLoader getClassLoader() {
-        return classLoaderRef.get();
-    }
-
-    public Map<String, Object> getMetadata() {
-        return metadata;
-    }
-
-    /**
-     * @return the sourceOperation
-     */
-    public Operation getSourceOperation() {
-        return (Operation) metadata.get("source.operation");
-    }
-
-    /**
-     * @param sourceOperation the sourceOperation to set
-     */
-    public void setSourceOperation(Operation sourceOperation) {
-        this.metadata.put("source.operation", sourceOperation);
-    }
-
-    /**
-     * @return the targetOperation
-     */
-    public Operation getTargetOperation() {
-        return (Operation) metadata.get("target.operation");
-    }
-
-    /**
-     * @param targetOperation the targetOperation to set
-     */
-    public void setTargetOperation(Operation targetOperation) {
-        this.metadata.put("target.operation", targetOperation);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
deleted file mode 100644
index fb747864e7..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/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.databinding.impl;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
deleted file mode 100644
index 2f95c2a9c6..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.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.databinding.javabeans;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-import javax.xml.namespace.QName;

-

-import org.w3c.dom.Document;

-import org.w3c.dom.Node;

-import org.w3c.dom.NodeList;

-

-/**

- * Transformer to convert data from DOM Node to JavaBean

- *

- * @version $Rev$ $Date$

- */

-public class DOMNode2JavaBeanTransformer extends XML2JavaBeanTransformer<Node> {

-

-    @Override

-    public Node getRootElement(Node element) throws XML2JavaMapperException {

-        if (element instanceof Document) {

-            return ((Document)element).getDocumentElement();

-        } else {

-            return element;

-        }

-

-    }

-

-    @Override

-    public Iterator<Node> getChildElements(Node parent) throws XML2JavaMapperException {

-        NodeList nodeList = parent.getChildNodes();

-        List<Node> nodeArrayList = new ArrayList<Node>(nodeList.getLength());

-        for (int count = 0; count < nodeList.getLength(); ++count) {

-            nodeArrayList.add(nodeList.item(count));

-        }

-

-        return nodeArrayList.iterator();

-    }

-

-    @Override

-    public String getElementName(Node element) throws XML2JavaMapperException {

-        return element.getLocalName();

-    }

-

-    @Override

-    public String getText(Node element) throws XML2JavaMapperException {

-        if (element instanceof Document) {

-            element = ((Document)element).getDocumentElement();

-        }

-        return element.getTextContent();

-    }

-

-    @Override

-    public boolean isTextElement(Node element) throws XML2JavaMapperException {

-        return element.getNodeType() == Node.TEXT_NODE;

-    }

-

-    @Override

-    public boolean isTextOnly(Node element) throws XML2JavaMapperException {

-        NodeList childNodes = element.getChildNodes();

-        return childNodes.getLength() == 1 && isTextElement(childNodes.item(0));

-    }

-

-    @Override

-    public Node getFirstChildWithName(Node element, QName name) throws XML2JavaMapperException {

-        Node child;

-        for (child = element.getFirstChild();

-             child != null && !(child.getNodeName() == name.getLocalPart()

-                                && child.getNamespaceURI() == name.getNamespaceURI()) ;

-             child = child.getNextSibling()) {

-        }

-        return child;

-    }

-

-    @Override

-    public Class getSourceType() {

-        return Node.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
deleted file mode 100644
index 9615f43572..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.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.javabeans;

-

-import javax.xml.namespace.QName;

-

-/**

- * This exception is used to encapsulate and rethrow exceptions that arise out

- * of converting JavaBean objects to XML

- *

- * @version $Rev$ $Date$

- */

-public class Java2XMLMapperException extends RuntimeException {

-    private static final long serialVersionUID = 6811924384399578686L;

-

-    private QName xmlElementName;

-    private String javaFieldName;

-    private Class javaType;

-    

-    public Java2XMLMapperException(String message) {

-        super(message);

-    }

-

-    public Java2XMLMapperException(Throwable cause) {

-        super(cause);

-    }

-

-    public String getJavaFieldName() {

-        return javaFieldName;

-    }

-

-    public void setJavaFieldName(String javaFieldName) {

-        this.javaFieldName = javaFieldName;

-    }

-

-    public Class getJavaType() {

-        return javaType;

-    }

-

-    public void setJavaType(Class javaType) {

-        this.javaType = javaType;

-    }

-

-    public QName getXmlElementName() {

-        return xmlElementName;

-    }

-

-    public void setXmlElementName(QName xmlElementName) {

-        this.xmlElementName = xmlElementName;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
deleted file mode 100644
index 58f594751a..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.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.databinding.javabeans;

-

-import javax.xml.namespace.QName;

-import javax.xml.parsers.ParserConfigurationException;

-

-import org.apache.tuscany.sca.databinding.impl.DOMHelper;

-import org.w3c.dom.Attr;

-import org.w3c.dom.Document;

-import org.w3c.dom.Node;

-

-/**

- * Transformer to convert data from a JavaBean object to DOM Node

- *

- * @version $Rev$ $Date$

- */

-public class JavaBean2DOMNodeTransformer extends JavaBean2XMLTransformer<Node> {

-

-    public static final String COLON = ":";

-    private Document factory;

-    

-    public JavaBean2DOMNodeTransformer() {

-        super();

-        try {

-            factory = DOMHelper.newDocument(); 

-        } catch (ParserConfigurationException e) {

-            throw new Java2XMLMapperException(e);

-        }

-    }

-    

-    @Override

-    public void appendChild(Node parentElement, Node childElement) throws Java2XMLMapperException {

-        parentElement.appendChild(childElement);

-    }

-

-    @Override

-    public Node createElement(QName qName) throws Java2XMLMapperException {

-        String qualifedName =

-            (qName.getPrefix() == null || qName.getPrefix().length() <= 0) ? qName.getLocalPart()

-                : qName.getPrefix() + COLON + qName.getLocalPart();

-        return factory.createElementNS(qName.getNamespaceURI(), qualifedName);

-    }

-

-    @Override

-    public void appendText(Node parentElement, String textData) throws Java2XMLMapperException {

-        Node textNode;

-        if (textData != null) {

-            textNode = factory.createTextNode(textData);

-        } else {

-            Attr nil = factory.createAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "xsi:nil");

-            nil.setValue("true");

-            textNode = nil;

-        }

-        appendChild(parentElement, textNode);

-    }

-

-    @Override

-    public Class getTargetType() {

-        return Node.class;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
deleted file mode 100644
index 4942fef0da..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.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.javabeans;
-
-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.sca.databinding.xml.BeanXMLStreamReaderImpl;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Transformer to convert data from a JavaBean object to XMLStreamReader.
- *
- * @version $Rev$ $Date$
- */
-public class JavaBean2XMLStreamReaderTransformer extends BaseTransformer<Object, XMLStreamReader> implements
-    PullTransformer<Object, XMLStreamReader> {
-
-    public XMLStreamReader transform(Object source, TransformationContext context) {
-        try {
-            javax.xml.namespace.QName name = null;
-            if (context != null) {
-                Object logical = context.getSourceDataType().getLogical();
-                if (logical instanceof XMLType) {
-                    name = ((XMLType)logical).getElementName();
-                }
-            }
-            return new BeanXMLStreamReaderImpl(name, source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Object> getSourceType() {
-        return Object.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
deleted file mode 100644
index b96b394bb8..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

-

-import java.lang.reflect.Array;

-import java.lang.reflect.Field;

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.lang.reflect.Modifier;

-import java.util.Date;

-import java.util.GregorianCalendar;

-

-import javax.xml.datatype.XMLGregorianCalendar;

-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.impl.BaseTransformer;

-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;

-import org.apache.tuscany.sca.interfacedef.DataType;

-import org.apache.tuscany.sca.interfacedef.util.XMLType;

-

-/**

- * Transformer to convert data from a JavaBean object to xml

- *

- * @version $Rev$ $Date$

- */

-public abstract class JavaBean2XMLTransformer<T> extends BaseTransformer<Object, T> implements

-    PullTransformer<Object, T> {

-

-    public static final String GET = "get";

-    public static final String PREFIX = "n";

-    public static final String PERIOD = ".";

-    public static final String FWD_SLASH = "/";

-    public static final String HTTP = "http://";

-    private static int prefixCount = 1;

-

-    protected SimpleTypeMapperImpl mapper;

-

-    public JavaBean2XMLTransformer() {

-        this.mapper = new SimpleTypeMapperImpl();

-    }

-

-    public T transform(Object source, TransformationContext context) {

-        QName rootElement = null;

-        if (context != null) {

-            DataType<?> type = context.getTargetDataType();

-            if (type != null) {

-                Object logical = type.getLogical();

-                if (logical instanceof XMLType) {

-                    rootElement = ((XMLType)logical).getElementName();

-                }

-            }

-        }

-        //FIXME See how/if we still need to get the metadata here

-        //QName rootElementName = (QName)context.getTargetDataType().getMetadata("RootElementName");

-        //if (rootElementName == null) {

-        QName rootElementName = new QName(resolveRootElementName(source.getClass()));

-        //}

-

-        T root = createElement(rootElementName);

-        appendChildElements(root, resolveElementName(source.getClass()), source.getClass(), source, context);

-        return root;

-    }

-

-    private void appendChildElements(T parent,

-                                     QName elementName,

-                                     Class javaType,

-                                     Object javaObject,

-                                     TransformationContext context) {

-        T element = null;

-        if (javaObject != null) {

-            if (javaType.isPrimitive() || isSimpleJavaType(javaObject)) {

-                appendText(parent, mapper.toXMLLiteral(null, javaObject, context));

-            } else if (javaType.isArray()) {

-                int size = Array.getLength(javaObject);

-                for (int count = 0; count < size; ++count) {

-                    Object item = Array.get(javaObject, count);

-                    element = createElement(elementName);

-                    appendChild(parent, element);

-                    appendChildElements(element, elementName, javaType.getComponentType(), item, context);

-                }

-            } else {

-                Field[] javaFields = javaType.getFields();

-                for (Field aField : javaFields) {

-                    try {

-                        QName fieldElementName = new QName(aField.getName());

-                        if (!aField.getType().isArray()) {

-                            element = createElement(fieldElementName);

-                            appendChild(parent, element);

-                            appendChildElements(element,

-                                                fieldElementName,

-                                                aField.getType(),

-                                                aField.get(javaObject),

-                                                context);

-                        } else {

-                            appendChildElements(parent,

-                                                fieldElementName,

-                                                aField.getType(),

-                                                aField.get(javaObject),

-                                                context);

-                        }

-                    } catch (IllegalAccessException e) {

-                        Java2XMLMapperException java2xmlEx = new Java2XMLMapperException(e);

-                        java2xmlEx.setJavaFieldName(aField.getName());

-                        java2xmlEx.setJavaType(javaType);

-                        throw java2xmlEx;

-                    }

-                }

-

-                Method[] methods = javaType.getMethods();

-                String fieldName = null;

-                for (Method aMethod : methods) {

-                    try {

-                        if (Modifier.isPublic(aMethod.getModifiers()) && aMethod.getName().startsWith(GET)

-                            && aMethod.getParameterTypes().length == 0

-                            && isMappedGetter(aMethod.getName())) {

-                            fieldName = resolveFieldFromMethod(aMethod.getName());

-                            try {

-                                javaType.getField(fieldName);

-                            } catch (NoSuchFieldException e) {

-                                QName fieldElementName = new QName(fieldName);

-                                if (aMethod.getReturnType().isArray()) {

-                                    appendChildElements(parent, fieldElementName, aMethod.getReturnType(), aMethod

-                                        .invoke(javaObject, new Object[0]), context);

-                                } else {

-                                    element = createElement(fieldElementName);

-                                    appendChild(parent, element);

-                                    appendChildElements(element, fieldElementName, aMethod.getReturnType(), aMethod

-                                        .invoke(javaObject, new Object[0]), context);

-                                }

-                            }

-                        }

-                    } catch (IllegalAccessException e) {

-                        Java2XMLMapperException java2xmlEx = new Java2XMLMapperException(e);

-                        java2xmlEx.setJavaFieldName(fieldName);

-                        java2xmlEx.setJavaType(javaType);

-                        throw java2xmlEx;

-                    } catch (InvocationTargetException e) {

-                        Java2XMLMapperException java2xmlEx = new Java2XMLMapperException(e);

-                        java2xmlEx.setJavaFieldName(fieldName);

-                        java2xmlEx.setJavaType(javaType);

-                        throw java2xmlEx;

-                    }

-                }

-            }

-        }

-    }

-

-    /*

-     * Subclasses can override this method to prevent some getter methods

-     * from being mapped.  The default implementation provided by this class

-     * maps all getter methods.

-     */

-    protected boolean isMappedGetter(String methodName) {

-        return true;

-    }

-

-    @Override

-    public String getSourceDataBinding() {

-        return JavaBeansDataBinding.NAME;

-    }

-

-    @Override

-    public Class<Object> getSourceType() {

-        return Object.class;

-    }

-

-    private boolean isSimpleJavaType(Object javaObject) {

-        if (javaObject instanceof String) {

-            return true;

-        }

-        if (javaObject instanceof Byte || javaObject instanceof Character

-            || javaObject instanceof Short

-            || javaObject instanceof Integer

-            || javaObject instanceof Long

-            || javaObject instanceof Float

-            || javaObject instanceof Double

-            || javaObject instanceof Boolean) {

-            return true;

-        }

-        if (javaObject instanceof GregorianCalendar || javaObject instanceof Date

-            || javaObject instanceof XMLGregorianCalendar

-            || javaObject instanceof byte[]

-            || javaObject instanceof QName) {

-            return true;

-        }

-        return false;

-    }

-

-    private String resolveRootElementName(Class javaType) {

-        if (javaType.isArray()) {

-            return javaType.getComponentType().getSimpleName() + "_collection";

-        } else {

-            return javaType.getSimpleName() + "_instance";

-        }

-    }

-

-    private QName resolveElementName(Class javaType) {

-        if (javaType.isArray()) {

-            return new QName(javaType.getComponentType().getSimpleName());

-        } else {

-            return new QName(javaType.getSimpleName());

-        }

-    }

-

-    private String resolveFieldFromMethod(String methodName) {

-        StringBuffer fieldName = new StringBuffer();

-        fieldName.append(Character.toLowerCase(methodName.charAt(GET.length())));

-        fieldName.append(methodName.substring(GET.length() + 1));

-        return fieldName.toString();

-    }

-

-    public String getNexPrefix() {

-        return PREFIX + prefixCount++;

-    }

-

-    @Override

-    public int getWeight() {

-        return JavaBeansDataBinding.HEAVY_WEIGHT;

-    }

-

-    /**

-     * Create an element with the given name

-     * @param qName

-     * @return

-     * @throws Java2XMLMapperException

-     */

-    public abstract T createElement(QName qName) throws Java2XMLMapperException;

-

-    /**

-     * Create a text node and add it to the parent

-     * @param parentElement

-     * @param textData

-     * @throws Java2XMLMapperException

-     */

-    public abstract void appendText(T parentElement, String textData) throws Java2XMLMapperException;

-

-    /**

-     * Add the child element to the parent

-     * @param parentElement

-     * @param childElement

-     * @throws Java2XMLMapperException

-     */

-    public abstract void appendChild(T parentElement, T childElement) throws Java2XMLMapperException;

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
deleted file mode 100644
index fb04014051..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.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.javabeans;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.ObjectInputStream;

-import java.io.ObjectOutputStream;

-import java.io.ObjectStreamClass;

-import java.io.OutputStream;

-import java.io.Serializable;

-

-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;

-import org.apache.tuscany.sca.interfacedef.DataType;

-import org.apache.tuscany.sca.interfacedef.Operation;

-

-/**

- * DataBinding for JavaBeans

- *

- * @version $Rev$ $Date$

- */

-public class JavaBeansDataBinding extends BaseDataBinding {

-    /**

-     * Defining a weight to a very high number so that the transformer won't be picked

-     * up by other paths unless it's the only available path

-     */

-    public static final int HEAVY_WEIGHT = 10000;

-    public static final String NAME = "java:complexType";

-

-    public JavaBeansDataBinding() {

-        super(NAME, Object.class);

-    }

-

-    protected JavaBeansDataBinding(String name, Class<?> baseType) {

-        super(name, baseType);

-    }

-    

-    @Override

-    public Object copy(Object arg, DataType dataType, Operation operation) {

-        if (arg == null) {

-            return null;

-        }

-        final Class clazz = arg.getClass();

-        if (String.class == clazz || clazz.isPrimitive()

-            || Number.class.isAssignableFrom(clazz)

-            || Boolean.class.isAssignableFrom(clazz)

-            || Character.class.isAssignableFrom(clazz)

-            || Byte.class.isAssignableFrom(clazz)) {

-            // Immutable classes

-            return arg;

-        }

-        try {

-            if (arg instanceof Serializable) {

-                ByteArrayOutputStream bos = new ByteArrayOutputStream();

-                ObjectOutputStream oos = getObjectOutputStream(bos);

-                oos.writeObject(arg);

-                oos.close();

-                bos.close();

-

-                // Work out which ClassLoader to use for deserializing arg

-                // We want to use:

-                //   * The ClassLoader of arg if it is not the System ClassLoader

-                //   * The ThreadContext ClassLoader if the ClassLoader of arg is the System ClassLoader

-                //     because Collection classes are loaded by the System ClassLoader but their contents

-                //     may be loaded from another ClassLoader

-                // 

-                ClassLoader classLoaderToUse = clazz.getClassLoader();

-                if (classLoaderToUse == null)

-                {

-                    // ClassLoader of arg is the System ClassLoader so we will use the ThreadContext ClassLoader

-                    // instead

-                    classLoaderToUse = Thread.currentThread().getContextClassLoader();

-                }

-                

-                ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());

-                ObjectInputStream ois = getObjectInputStream(bis, classLoaderToUse);

-                Object objectCopy = ois.readObject();

-                ois.close();

-                bis.close();

-                return objectCopy;

-            } else {

-                // return arg;

-                throw new IllegalArgumentException("Argument type '" + arg.getClass().getCanonicalName() + "' is not Serializable. " + 

-                                                   " Pass-by-value cannot be performed on this argument");

-            }

-        } catch (Exception e) {

-            throw new IllegalArgumentException("Pass-by-value is not supported for the given object", e);

-        }

-    }

-

-    protected ObjectOutputStream getObjectOutputStream(OutputStream os) throws IOException {

-        return new ObjectOutputStream(os);

-    }

-

-    protected ObjectInputStream getObjectInputStream(InputStream is, final ClassLoader cl) throws IOException {

-        ObjectInputStream ois = new ObjectInputStream(is) {

-            @Override

-            protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {

-                try {

-                    return Class.forName(desc.getName(), false, cl);

-                } catch (ClassNotFoundException e) {

-                    try {

-                        // For OSGi, use context ClassLoader if the bundle ClassLoader cannot load the class

-                        if (cl != Thread.currentThread().getContextClassLoader()) {

-                            return Class.forName(desc.getName(), false, Thread.currentThread().getContextClassLoader());

-                        }

-                    } catch (ClassNotFoundException e1) {

-                        // ignore

-                    } catch (NoClassDefFoundError e1) {

-                        // ignore

-                    }

-                    return super.resolveClass(desc);

-                }

-            }

-

-        };

-        return ois;

-    }

-    

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
deleted file mode 100644
index 7ae64c6a27..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.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.databinding.javabeans;

-

-

-/**

- * DataBinding for Java Exceptions

- *

- * @version $Rev$ $Date$

- */

-public class JavaExceptionDataBinding extends JavaBeansDataBinding {

-

-    public static final String NAME = "java:exception";

-

-    public JavaExceptionDataBinding() {

-        super(NAME, null);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
deleted file mode 100644
index 11c82e062c..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.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.databinding.javabeans;
-
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * DataBinding for Java simple types
- *
- * @version $Rev$ $Date$
- */
-public class SimpleJavaDataBinding extends BaseDataBinding {
-    public static final String NAME = "java:simpleType";
-
-    public SimpleJavaDataBinding() {
-        super(NAME, Object.class);
-    }
-
-    @Override
-    public Object copy(Object arg, DataType dataType, Operation operation) {
-        if (arg instanceof byte[]) {
-            return ((byte[])arg).clone();
-        }
-        return arg;
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        Class<?> cls = type.getPhysical();
-        if (cls == Object.class) {
-            return false;
-        }
-        // HACK: [rfeng] By pass the one know to XMLString
-        String db = type.getDataBinding();
-        if (db != null && (XMLStringDataBinding.NAME.equals(db) || XMLStringDataBinding.ALIASES[0].equals(db))) {
-            return false;
-        }
-        if (SimpleTypeMapperImpl.JAVA2XML.keySet().contains(cls)) {
-            type.setDataBinding(NAME);
-            QName elementName = null;
-            Object logical = type.getLogical();
-            if (logical instanceof XMLType) {
-                elementName = ((XMLType)logical).getElementName();
-            }
-            TypeInfo typeInfo = SimpleTypeMapperImpl.getXMLType(cls);
-            type.setLogical(new XMLType(elementName, typeInfo == null ? null : typeInfo.getQName()));
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
deleted file mode 100644
index 06feeffabd..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

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

-

-import java.lang.reflect.Array;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.Field;

-import java.lang.reflect.InvocationTargetException;

-import java.lang.reflect.Method;

-import java.util.ArrayList;

-import java.util.Hashtable;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-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.impl.BaseTransformer;

-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;

-import org.apache.tuscany.sca.interfacedef.util.XMLType;

-

-/**

- * Transformer to convert data from XML to JavaBean

- *

- * @version $Rev$ $Date$

- */

-public abstract class XML2JavaBeanTransformer<T> extends BaseTransformer<T, Object> implements

-        PullTransformer<T, Object> {

-

-    public static final String SET = "set";

-    public static final QName QNAME_MESSAGE = new QName("message");

-

-    protected SimpleTypeMapperImpl mapper;

-

-    public XML2JavaBeanTransformer() {

-        this.mapper = new SimpleTypeMapperImpl();

-    }

-

-    @Override

-    public int getWeight() {

-        return JavaBeansDataBinding.HEAVY_WEIGHT;

-    }

-    

-    public Object transform(T source, TransformationContext context) {

-        //FIXME why is the logical type sometimes a Class instead of an XMLType?

-        if (context.getSourceDataType().getLogical() instanceof XMLType) {

-            XMLType xmlType = (XMLType) context.getSourceDataType().getLogical();

-            return toJavaObject(xmlType.getTypeName(), getRootElement(source), context);

-        } else {

-            return toJavaObject(null, getRootElement(source), context);

-        }

-    }

-

-    public Object toJavaObject(QName xmlType, T xmlElement, TransformationContext context) {

-        if (xmlType != null && SimpleTypeMapperImpl.isSimpleXSDType(xmlType)) {

-            return mapper.toJavaObject(xmlType, getText(xmlElement), context);

-        } else {

-            Class<?> javaType = (Class<?>)context.getTargetDataType().getPhysical();

-            return createJavaObject(xmlElement, javaType, context);

-        }

-    }

-    

-    @SuppressWarnings("unchecked")

-    private <L> L createJavaObject(T element, Class<L> javaType, TransformationContext context) 

-        throws XML2JavaMapperException {

-        if (isTextOnly(element)) {

-            return (L) mapper.toJavaObject(SimpleTypeMapperImpl.getXMLType(javaType).getQName(),

-                                                 getText(element),

-                                                 context);

-        } else {

-            String fieldName = null;

-            try {

-                L javaInstance;

-                T detailMsg = null;

-                if (Throwable.class.isAssignableFrom(javaType)) {

-                    T msgElement = getFirstChildWithName(element, QNAME_MESSAGE);

-                    if (msgElement != null && isTextOnly(msgElement)) {

-                        detailMsg = msgElement;  // skip this when handling child elements

-                        Constructor constructor = javaType.getConstructor(new Class[] {String.class});

-                        javaInstance = (L)constructor.newInstance(new Object[] {getText(detailMsg)});

-                    } else {

-                        javaInstance = javaType.newInstance();

-                    }

-                } else {

-                    javaInstance = javaType.newInstance();

-                }

-                Map<Field, List<Object>> arrayFields = new Hashtable<Field, List<Object>>();

-                Map<Method, List<Object>> arraySetters = new Hashtable<Method, List<Object>>();

-                

-                for (Iterator<T> childElements = getChildElements(element); childElements.hasNext(); ) {

-                    T childElement = childElements.next();

-                    if (!isTextElement(childElement) && childElement != detailMsg) {

-                        fieldName = getElementName(childElement);

-                        try {

-                            Field javaField = javaType.getField(fieldName);

-                            setFieldValue(javaInstance,

-                                          javaField,

-                                          childElement,

-                                          arrayFields,

-                                          context);

-

-                        } catch (NoSuchFieldException e1) {

-                            setFieldValueUsingSetter(javaType,

-                                                     javaInstance,

-                                                     fieldName,

-                                                     childElement,

-                                                     arraySetters,

-                                                     context);

-                        }

-                    }

-                }

-

-                setArrayValues(javaInstance, arrayFields, arraySetters);

-                return javaInstance;

-            } catch (Exception e2) {

-                XML2JavaMapperException xml2JavaEx = new XML2JavaMapperException(e2);

-                xml2JavaEx.setJavaType(javaType);

-                xml2JavaEx.setJavaFieldName(fieldName);

-                throw xml2JavaEx;

-            }

-        }

-    }

-

-    private void setFieldValue(Object javaInstance,

-                               Field javaField,

-                               T fieldValue,

-                               Map<Field, List<Object>> arrayFields,

-                               TransformationContext context) throws IllegalAccessException {

-        Class<?> javaFieldType = (Class<?>) javaField.getType();

-

-        if (javaFieldType.isArray()) {

-            Class<?> componentType = javaFieldType.getComponentType();

-            List<Object> fldValueArray = arrayFields.get(javaField);

-            if (fldValueArray == null) {

-                fldValueArray = new ArrayList<Object>();

-                arrayFields.put(javaField, fldValueArray);

-            }

-            fldValueArray.add(createJavaObject(fieldValue, componentType, context));

-        } else {

-            javaField.setAccessible(true);

-            javaField.set(javaInstance, createJavaObject(fieldValue, javaFieldType, context));

-        }

-    }

-

-    private void setFieldValueUsingSetter(Class javaType,

-                                          Object javaInstance,

-                                          String fieldName,

-                                          T fieldValue,

-                                          Map<Method, List<Object>> arraySetters,

-                                          TransformationContext context) throws IllegalAccessException,

-                                                                        InvocationTargetException {

-        char firstChar = Character.toUpperCase(fieldName.charAt(0));

-        StringBuilder methodName = new StringBuilder(SET + fieldName);

-        methodName.setCharAt(SET.length(), firstChar);

-        boolean methodNotFound = true;

-

-        for (int methodCount = 0; methodNotFound && methodCount < javaType.getMethods().length; ++methodCount) {

-            Method aMethod = javaType.getMethods()[methodCount];

-            if (aMethod.getName().equals(methodName.toString())

-                    && aMethod.getParameterTypes().length == 1) {

-                Class<?> paramType = aMethod.getParameterTypes()[0];

-

-                if (paramType.isArray()) {

-                    Class<?> componentType = paramType.getComponentType();

-                    List<Object> setterValueArray = arraySetters.get(aMethod);

-                    if (setterValueArray == null) {

-                        setterValueArray = new ArrayList<Object>();

-                        arraySetters.put(aMethod, setterValueArray);

-                    }

-                    setterValueArray.add(createJavaObject(fieldValue, componentType, context));

-                } else {

-                    aMethod.invoke(javaInstance, new Object[] {createJavaObject(fieldValue,

-                                                                                 paramType,

-                                                                                 context)});

-                }

-                methodNotFound = false;

-            }

-        }

-

-        if (methodNotFound) {

-            XML2JavaMapperException xml2JavaEx =

-                    new XML2JavaMapperException("No field or setter method to configure xml data");

-            xml2JavaEx.setJavaFieldName(fieldName);

-            xml2JavaEx.setJavaType(javaType);

-            throw xml2JavaEx;

-        }

-    }

-

-    private void setArrayValues(Object javaInstance,

-                                Map<Field, List<Object>> arrayFields,

-                                Map<Method, List<Object>> arraySetters) throws IllegalAccessException,

-                                                                       InvocationTargetException {

-        if (arrayFields.size() > 0) {

-            for (Field javaField : arrayFields.keySet()) {

-                javaField.setAccessible(true);

-

-                if (javaField.getType().getComponentType().isPrimitive()) {

-                    javaField.set(javaInstance, createPrimitiveArray(javaField.getType()

-                                                                              .getComponentType(),

-                                                                     arrayFields.get(javaField)));

-                } else {

-                    javaField.set(javaInstance,

-                                  createNonPrimitiveArray(javaField.getType().getComponentType(),

-                                                          arrayFields.get(javaField)));

-                }

-            }

-        }

-

-        if (arraySetters.size() > 0) {

-            for (Method aMethod : arraySetters.keySet()) {

-                Class paramType = aMethod.getParameterTypes()[0];

-                if (paramType.getComponentType().isPrimitive()) {

-                    aMethod.invoke(javaInstance,

-                                   new Object[] {createPrimitiveArray(paramType.getComponentType(),

-                                                                       arraySetters.get(aMethod))});

-                } else {

-                    aMethod.invoke(javaInstance,

-                                   new Object[] {createNonPrimitiveArray(paramType.getComponentType(),

-                                                                          arraySetters.get(aMethod))});

-                }

-            }

-        }

-    }

-

-    private Object createNonPrimitiveArray(Class fieldType, List values) {

-        Object objectArray = Array.newInstance(fieldType, values.size());

-        for (int count = 0; count < values.size(); ++count) {

-            Array.set(objectArray, count, values.get(count));

-        }

-        return objectArray;

-    }

-

-    private Object createPrimitiveArray(Class fieldType, List values) {

-        if (fieldType.isPrimitive()) {

-            if (fieldType.getName().equals("int")) {

-                int[] primitiveValues = new int[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Integer) values.get(count)).intValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("float")) {

-                float[] primitiveValues = new float[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Float) values.get(count)).floatValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("boolean")) {

-                boolean[] primitiveValues = new boolean[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Boolean) values.get(count)).booleanValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("char")) {

-                char[] primitiveValues = new char[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Character) values.get(count)).charValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("byte")) {

-                byte[] primitiveValues = new byte[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Byte) values.get(count)).byteValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("short")) {

-                short[] primitiveValues = new short[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Short) values.get(count)).shortValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("long")) {

-                long[] primitiveValues = new long[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Long) values.get(count)).longValue();

-                }

-                return primitiveValues;

-            } else if (fieldType.getName().equals("double")) {

-                double[] primitiveValues = new double[values.size()];

-                for (int count = 0; count < values.size(); ++count) {

-                    primitiveValues[count] = ((Double) values.get(count)).doubleValue();

-                }

-                return primitiveValues;

-            }

-        }

-        return values;

-    }

-

-    public abstract String getText(T source) throws XML2JavaMapperException;

-

-    public abstract Iterator<T> getChildElements(T parent) throws XML2JavaMapperException;

-

-    public abstract String getElementName(T element) throws XML2JavaMapperException;

-

-    public abstract boolean isTextElement(T element) throws XML2JavaMapperException;

-    

-    public abstract boolean isTextOnly(T element) throws XML2JavaMapperException;

-

-    public abstract T getFirstChildWithName(T element, QName name) throws XML2JavaMapperException;

-

-    public abstract T getRootElement(T element) throws XML2JavaMapperException;

-

-    @Override

-    public Class<Object> getTargetType() {

-        return Object.class;

-    }

-

-    @Override

-    public String getTargetDataBinding() {

-        return JavaBeansDataBinding.NAME;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
deleted file mode 100644
index a723fd445c..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.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.javabeans;

-

-import javax.xml.namespace.QName;

-

-/**

- * This exception is used to encapsulate and rethrow exceptions that arise out

- * of converting XML Data to Java Objects.

- *

- * @version $Rev$ $Date$

- */

-public class XML2JavaMapperException extends RuntimeException {

-    private static final long serialVersionUID = 6596530102591630642L;

-    

-    private QName xmlElementName;

-    private String javaFieldName;

-    private Class javaType;

-

-    public XML2JavaMapperException(String message) {

-        super(message);

-    }

-

-    public XML2JavaMapperException(Throwable cause) {

-        super(cause);

-    }

-

-    public QName getXmlElementName() {

-        return xmlElementName;

-    }

-

-    public void setXmlElementName(QName xmlElementName) {

-        this.xmlElementName = xmlElementName;

-    }

-

-    public String getJavaFieldName() {

-        return javaFieldName;

-    }

-

-    public void setJavaFieldName(String javaFieldName) {

-        this.javaFieldName = javaFieldName;

-    }

-

-    public Class getJavaType() {

-        return javaType;

-    }

-

-    public void setJavaType(Class javaType) {

-        this.javaType = javaType;

-    }

-

-    @Override

-    public String getMessage() {

-        return super.getMessage() + " <" + getJavaFieldName() + "> " + " in <" + getJavaType() + ">";

-    }

-    

-    

-

-}

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
deleted file mode 100644
index 1e39150f4a..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.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.databinding.util;
-
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataTypeHelper {
-    private DataTypeHelper() {
-    }
-
-    /**
-     * Find all classes referenced by this data type though java generics
-     * @param d
-     * @return
-     */
-    public static Set<Class<?>> findClasses(DataType d) {
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        Set<Type> visited = new HashSet<Type>();
-        findClasses(d, classes, visited);
-        return classes;
-    }
-
-    private static void findClasses(DataType d, Set<Class<?>> classes, Set<Type> visited) {
-        if (d == null) {
-            return;
-        }
-        classes.add(d.getPhysical());
-        if (d.getPhysical() != d.getGenericType()) {
-            findClasses(d.getGenericType(), classes, visited);
-        }
-    }
-
-    /**
-     * Find referenced classes in the generic type
-     * @param type
-     * @param classSet
-     * @param visited
-     */
-    private static void findClasses(Type type, Set<Class<?>> classSet, Set<Type> visited) {
-        if (visited.contains(type) || type == null) {
-            return;
-        }
-        visited.add(type);
-        if (type instanceof Class) {
-            Class<?> cls = (Class<?>)type;
-            if (!cls.isInterface()) {
-                classSet.add(cls);
-            }
-            return;
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType pType = (ParameterizedType)type;
-            findClasses(pType.getRawType(), classSet, visited);
-            for (Type t : pType.getActualTypeArguments()) {
-                findClasses(t, classSet, visited);
-            }
-        } else if (type instanceof TypeVariable) {
-            TypeVariable<?> tv = (TypeVariable<?>)type;
-            for (Type t : tv.getBounds()) {
-                findClasses(t, classSet, visited);
-            }
-        } else if (type instanceof GenericArrayType) {
-            GenericArrayType gType = (GenericArrayType)type;
-            findClasses(gType, classSet, visited);
-        } else if (type instanceof WildcardType) {
-            WildcardType wType = (WildcardType)type;
-            for (Type t : wType.getLowerBounds()) {
-                findClasses(t, classSet, visited);
-            }
-            for (Type t : wType.getUpperBounds()) {
-                findClasses(t, classSet, visited);
-            }
-        }
-    }
-
-    /**
-     * Get all the data types in the interface
-     * @param intf The interface
-     * @param useWrapper Use wrapper classes?
-     * @return A list of DataTypes
-     */
-    public static List<DataType> getDataTypes(Interface intf, boolean useWrapper) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        for (Operation op : intf.getOperations()) {
-            getDataTypes(dataTypes, op, useWrapper);
-        }
-        return dataTypes;
-    }
-
-    /**
-     * Get all the data types in the operation
-     * @param op The operaiton
-     * @param useWrapper Use wrapper classes?
-     * @return A list of DataTypes
-     */
-    public static List<DataType> getDataTypes(Operation op, boolean useWrapper) {
-        List<DataType> dataTypes = new ArrayList<DataType>();
-        getDataTypes(dataTypes, op, useWrapper);
-        return dataTypes;
-    }
-
-    private static void getDataTypes(List<DataType> dataTypes, Operation op, boolean useWrapper) {
-        WrapperInfo wrapper = op.getWrapper();
-        if (useWrapper && wrapper != null) {
-            DataType dt1 = wrapper.getInputWrapperType();
-            if (dt1 != null) {
-                dataTypes.add(dt1);
-            }
-            DataType dt2 = wrapper.getOutputWrapperType();
-            if (dt2 != null) {
-                dataTypes.add(dt2);
-            }
-        }
-        // FIXME: [rfeng] We may need to find the referenced classes in the child types
-        // 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);
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
deleted file mode 100644
index 8e86977457..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.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.util;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * A Simple LRU Cache
- * 
- * @version $Revision$
- * @param <K>
- * @param <V>
- */
-
-public class LRUCache<K, V> extends LinkedHashMap<K, V> {
-    private static final long serialVersionUID = -342098639681884413L;
-    protected int maxCacheSize = 4096;
-
-    /**
-     * Default constructor for an LRU Cache The default capacity is 10000
-     */
-    public LRUCache() {
-        this(0, 4096, 0.75f, true);
-    }
-
-    /**
-     * Constructs a LRUCache with a maximum capacity
-     * 
-     * @param maximumCacheSize
-     */
-    public LRUCache(int maximumCacheSize) {
-        this(0, maximumCacheSize, 0.75f, true);
-    }
-
-    /**
-     * Constructs an empty <tt>LRUCache</tt> instance with the specified
-     * initial capacity, maximumCacheSize,load factor and ordering mode.
-     * 
-     * @param initialCapacity the initial capacity.
-     * @param maximumCacheSize
-     * @param loadFactor the load factor.
-     * @param accessOrder the ordering mode - <tt>true</tt> for access-order,
-     *                <tt>false</tt> for insertion-order.
-     * @throws IllegalArgumentException if the initial capacity is negative or
-     *                 the load factor is non-positive.
-     */
-
-    public LRUCache(int initialCapacity, int maximumCacheSize, float loadFactor, boolean accessOrder) {
-        super(initialCapacity, loadFactor, accessOrder);
-        this.maxCacheSize = maximumCacheSize;
-    }
-
-    /**
-     * @return Returns the maxCacheSize.
-     */
-    public int getMaxCacheSize() {
-        return maxCacheSize;
-    }
-
-    /**
-     * @param maxCacheSize The maxCacheSize to set.
-     */
-    public void setMaxCacheSize(int maxCacheSize) {
-        this.maxCacheSize = maxCacheSize;
-    }
-
-    protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
-        return size() > maxCacheSize;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
deleted file mode 100644
index b97abda2b0..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.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.databinding.xml;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BeanXMLStreamReaderImpl extends XmlTreeStreamReaderImpl {
-    private static final Comparator<Accessor> COMPARATOR = new Comparator<Accessor>() {
-        public int compare(Accessor o1, Accessor o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    };
-
-    public static class BeanXmlNodeImpl extends SimpleXmlNodeImpl implements XmlNode {
-        private static final Object[] NULL = null;
-        private static final SimpleTypeMapperImpl MAPPER = new SimpleTypeMapperImpl();
-
-        public BeanXmlNodeImpl(Object bean) {
-            super(getName(bean == null ? null : bean.getClass()), bean);
-        }
-
-        public BeanXmlNodeImpl(QName name, Object bean) {
-            super(name, bean);
-        }
-
-        private static boolean isSimpleType(Class<?> javaType) {
-            return SimpleTypeMapperImpl.getXMLType(javaType) != 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);
-            }
-        }
-
-        public Iterator<XmlNode> children() {
-            if (name == null) {
-                return null;
-            }
-            if (value == null) {
-                return super.children();
-            }
-            if (isSimpleType(value.getClass())) {
-                XmlNode textNode = new BeanXmlNodeImpl(null, value);
-                return Arrays.asList(textNode).iterator();
-            }
-            if (Map.class.isAssignableFrom(value.getClass())) {
-                List<XmlNode> entries = new ArrayList<XmlNode>();
-                QName entryName = new QName(name.getNamespaceURI(), "entry");
-                Map map = (Map)value;
-                if (map != null) {
-                    for (Object e : map.entrySet()) {
-                        Map.Entry entry = (Map.Entry)e;
-                        entries.add(new BeanXmlNodeImpl(entryName, entry));
-                    }
-                }
-                return entries.iterator();
-            }
-            try {
-                Map<String, Accessor> accessorMap = getAccessors(value);
-                List<Accessor> accessorList = new ArrayList<Accessor>(accessorMap.values());
-                Collections.sort(accessorList, COMPARATOR);
-
-                List<XmlNode> props = new ArrayList<XmlNode>();
-                for (Accessor accessor : accessorList) {
-                    Class<?> pType = accessor.getType();
-
-                    QName pName = new QName(name.getNamespaceURI(), accessor.getName());
-                    Object pValue = accessor.getValue();
-                    if (pType.isArray()) {
-                        if (pValue != null) {
-                            int i1 = Array.getLength(pValue);
-                            for (int j = 0; j < i1; j++) {
-                                Object o = Array.get(pValue, j);
-                                props.add(new BeanXmlNodeImpl(pName, o));
-                            }
-                        } else {
-                            // TODO: How to handle null?
-                        }
-                    } else if (Collection.class.isAssignableFrom(pType)) {
-                        Collection objList = (Collection)pValue;
-                        if (objList != null && objList.size() > 0) {
-                            for (Iterator j = objList.iterator(); j.hasNext();) {
-                                Object o = j.next();
-                                props.add(new BeanXmlNodeImpl(pName, o));
-                            }
-
-                        } else {
-                            // How to handle null
-                        }
-                    } else {
-                        props.add(new BeanXmlNodeImpl(pName, pValue));
-                    }
-                }
-                return props.iterator();
-            } catch (Exception e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-
-        public QName getName() {
-            return name;
-        }
-
-        public String getValue() {
-            return getStringValue(value);
-        }
-        
-        private static String getPackageName(Class<?> cls) {
-            String name = cls.getName();
-            int index = name.lastIndexOf('.');
-            return index == -1 ? "" : name.substring(0, index);
-        }
-
-        public static QName getName(Class<?> cls) {
-            if (cls == null) {
-                return null;
-            }
-
-            String packageName = getPackageName(cls);
-
-            if ("".equals(packageName)) {
-                return new QName("", cls.getSimpleName());
-            }
-            StringBuffer ns = new StringBuffer("http://");
-            String[] names = packageName.split("\\.");
-            for (int i = names.length - 1; i >= 0; i--) {
-                ns.append(names[i]);
-                if (i != 0) {
-                    ns.append('.');
-                }
-            }
-            ns.append('/');
-            return new QName(ns.toString(), cls.getSimpleName());
-        }
-
-    }
-
-    public BeanXMLStreamReaderImpl(QName name, Object bean) {
-        super(getXmlNode(name, bean));
-    }
-
-    private static BeanXmlNodeImpl getXmlNode(QName name, Object bean) {
-        BeanXmlNodeImpl root = null;
-        if (name != null) {
-            root = new BeanXmlNodeImpl(name, bean);
-        } else {
-            root = new BeanXmlNodeImpl(bean);
-        }
-        return root;
-    }
-
-    public static interface Accessor {
-        String getName();
-
-        Class<?> getType();
-
-        Object getValue() throws Exception;
-
-        void setValue(Object value) throws Exception;
-    }
-
-    private static class FieldAccessor implements Accessor {
-        private Object target;
-        private Field field;
-
-        public FieldAccessor(Object target, Field field) {
-            super();
-            this.target = target;
-            this.field = field;
-            this.field.setAccessible(true);
-        }
-
-        public String getName() {
-            return field.getName();
-        }
-
-        public Object getValue() throws Exception {
-            return field.get(target);
-        }
-
-        public void setValue(Object value) throws Exception {
-            field.set(target, value);
-        }
-
-        public Class<?> getType() {
-            return field.getType();
-        }
-
-    }
-
-    private static class PropertyAccessor implements Accessor {
-        private Object target;
-        private PropertyDescriptor prop;
-
-        public PropertyAccessor(Object target, PropertyDescriptor prop) {
-            super();
-            this.target = target;
-            this.prop = prop;
-        }
-
-        public String getName() {
-            return prop.getName();
-        }
-
-        public Class<?> getType() {
-            return prop.getPropertyType();
-        }
-
-        public Object getValue() throws Exception {
-            Method getter = prop.getReadMethod();
-            if (getter != null) {
-                getter.setAccessible(true);
-                return getter.invoke(target);
-            }
-            throw new IllegalAccessException("The property cannot be read: " + getName());
-        }
-
-        public void setValue(Object value) throws Exception {
-            Method setter = prop.getWriteMethod();
-            if (setter != null) {
-                setter.setAccessible(true);
-                setter.invoke(target);
-            }
-            throw new IllegalAccessException("The property cannot be written: " + getName());
-        }
-
-    }
-
-    private static Map<String, Accessor> getAccessors(Object target) throws Exception {
-        if (target == null) {
-            return Collections.emptyMap();
-        }
-        Map<String, Accessor> map = new HashMap<String, Accessor>();
-        Class<?> type = target.getClass();
-        for (Field f : type.getFields()) {
-            map.put(f.getName(), new FieldAccessor(target, f));
-        }
-        BeanInfo info = Introspector.getBeanInfo(type, Object.class);
-        for (PropertyDescriptor p : info.getPropertyDescriptors()) {
-            // if (p.getReadMethod() != null && p.getWriteMethod() != null) {
-                map.put(p.getName(), new PropertyAccessor(target, p));
-            // }
-        }
-        return map;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
deleted file mode 100644
index 92058d769f..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.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.xml;
-
-
-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.w3c.dom.Node;
-
-/**
- * DOM DataBinding
- *
- * @version $Rev$ $Date$
- */
-public class DOMDataBinding extends BaseDataBinding {
-    public static final String NAME = Node.class.getName();
-    public static final String[] ALIASES = new String[] {"dom"};
-
-    public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/dom/1.0";
-    public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
-
-    public DOMDataBinding() {
-        super(NAME, ALIASES, Node.class);
-    }
-
-    @Override
-    public WrapperHandler getWrapperHandler() {
-        return new DOMWrapperHandler();
-    }
-
-    @Override
-    public Object copy(Object source, DataType dataType, Operation operation) {
-        if (Node.class.isAssignableFrom(source.getClass())) {
-            Node nodeSource = (Node)source;
-            return nodeSource.cloneNode(true);
-        }
-        return super.copy(source, dataType, operation);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (Node.class.isAssignableFrom(type.getPhysical())) {
-            if (type.getLogical() == null) {
-                type.setLogical(new XMLType(ROOT_ELEMENT, null));
-            }
-            type.setDataBinding(NAME);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
deleted file mode 100644
index 9e1ebb3522..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.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.databinding.xml;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.databinding.TransformationException;
-import org.apache.tuscany.sca.databinding.WrapperHandler;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-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.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class DOMWrapperHandler implements WrapperHandler<Node> {
-
-    public DOMWrapperHandler() {
-        super();
-    }
-
-    public Node create(Operation operation, boolean input) {
-        try {
-            WrapperInfo wrapperInfo = operation.getWrapper();
-            ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-            // Class<?> wrapperClass = input ? wrapperInfo.getInputWrapperClass() : wrapperInfo.getOutputWrapperClass();
-            Document document = DOMHelper.newDocument();
-            QName name = element.getQName();
-            return DOMHelper.createElement(document, name);
-        } catch (ParserConfigurationException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    public void setChildren(Node 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]);
-        }
-
-    }
-    public void setChild(Node wrapper, int i, ElementInfo childElement, Object value) {
-        Node node = (Node)value;
-        if (node.getNodeType() == Node.DOCUMENT_NODE) {
-            node = ((Document)node).getDocumentElement();
-        }
-        wrapper.appendChild(wrapper.getOwnerDocument().importNode(node, true));
-    }
-
-    public List getChildren(Node wrapper, Operation operation, boolean input) {
-        assert wrapper != null;
-        List<ElementInfo> childElements = input? operation.getWrapper().getInputChildElements():
-            operation.getWrapper().getOutputChildElements();
-        if (wrapper.getNodeType() == Node.DOCUMENT_NODE) {
-            wrapper = ((Document)wrapper).getDocumentElement();
-        }
-        List<Node> elements = new ArrayList<Node>();
-        NodeList nodes = wrapper.getChildNodes();
-        for (int j = 0; j < nodes.getLength(); j++) {
-            Node node = nodes.item(j);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
-                elements.add(node);
-            }
-        }
-        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();
-        DataType<XMLType> wrapperType =
-            new DataTypeImpl<XMLType>(DOMDataBinding.NAME, Node.class, new XMLType(element));
-        return wrapperType;
-    }
-
-    public boolean isInstance(Object wrapperObj,
-                              Operation operation,
-                              boolean input) {
-        WrapperInfo wrapperInfo = operation.getWrapper();
-        ElementInfo element = input ? wrapperInfo.getInputWrapperElement() : wrapperInfo.getOutputWrapperElement();
-        List<ElementInfo> childElements =
-            input ? wrapperInfo.getInputChildElements() : wrapperInfo.getOutputChildElements();
-        Node wrapper = (Node)wrapperObj;
-        if (wrapper.getNodeType() == Node.DOCUMENT_NODE) {
-            wrapper = ((Document)wrapper).getDocumentElement();
-        }
-        QName elementName = new QName(wrapper.getNamespaceURI(), wrapper.getLocalName());
-        if (!element.getQName().equals(elementName)) {
-            return false;
-        }
-        Set<QName> names = new HashSet<QName>();
-        for (ElementInfo e : childElements) {
-            names.add(e.getQName());
-        }
-        NodeList nodes = wrapper.getChildNodes();
-        for (int j = 0; j < nodes.getLength(); j++) {
-            Node node = nodes.item(j);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
-                elementName = new QName(wrapper.getNamespaceURI(), wrapper.getLocalName());
-                if (!names.contains(elementName)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
deleted file mode 100644
index 8c7a742cdd..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
deleted file mode 100644
index 507c141c33..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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.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.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.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.databinding.xml.XmlNode#getValue()
-     */
-    public String getValue() {
-        return node.getNodeValue();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
deleted file mode 100644
index 7f49a50e1e..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
deleted file mode 100644
index 5f583da283..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.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.xml;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamSource;
-
-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;
-import org.xml.sax.InputSource;
-
-/**
- * Push DOM InputSource to Node
- *
- * @version $Rev$ $Date$
- */
-public class InputSource2Node extends BaseTransformer<InputSource, Node> implements
-    PullTransformer<InputSource, Node> {
-    private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
-
-    public Node transform(InputSource source, TransformationContext context) {
-        try {
-            Source streamSource = new StreamSource(source.getCharacterStream());
-            DOMResult result = new DOMResult();
-            TRANSFORMER.transform(streamSource, result, context);
-            return result.getNode();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<InputSource> getSourceType() {
-        return InputSource.class;
-    }
-
-    @Override
-    public Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
deleted file mode 100644
index 39116ba4a1..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.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.xml;
-
-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 org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Push InputSource to SAX
- *
- * @version $Rev$ $Date$
- */
-public class InputSource2SAX extends BaseTransformer<InputSource, ContentHandler> implements
-    PushTransformer<InputSource, ContentHandler> {
-
-    public void transform(InputSource source, ContentHandler target, TransformationContext context) {
-        try {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            reader.setFeature("http://xml.org/sax/features/namespaces", true);
-            reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
-            reader.setContentHandler(target);
-            reader.parse(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<InputSource> getSourceType() {
-        return InputSource.class;
-    }
-
-    @Override
-    public Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
deleted file mode 100644
index e40c3006fb..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.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.xml;
-
-import java.io.InputStream;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXSource;
-
-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;
-import org.xml.sax.InputSource;
-
-/**
- * Push DOM InputSource to Node
- *
- * @version $Rev$ $Date$
- */
-public class InputStream2Node extends BaseTransformer<InputStream, Node> implements
-    PullTransformer<InputStream, Node> {
-    private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
-
-    public Node transform(InputStream source, TransformationContext context) {
-        try {
-            Source streamSource = new SAXSource(new InputSource(source));
-            DOMResult result = new DOMResult();
-            TRANSFORMER.transform(streamSource, result, context);
-            return result.getNode();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    public Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
deleted file mode 100644
index 3b7bd3088a..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.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.xml;
-
-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 org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-/**
- * Push InputStream to SAX
- *
- * @version $Rev$ $Date$
- */
-public class InputStream2SAX extends BaseTransformer<InputStream, ContentHandler> implements
-    PushTransformer<InputStream, ContentHandler> {
-    public void transform(InputStream source, ContentHandler target, TransformationContext context) {
-        try {
-            XMLReader reader = XMLReaderFactory.createXMLReader();
-            reader.setContentHandler(target);
-            reader.parse(new InputSource(source));
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<InputStream> getSourceType() {
-        return InputStream.class;
-    }
-
-    @Override
-    public Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
deleted file mode 100644
index 5a31d9db91..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
deleted file mode 100644
index fdc3c4139b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
deleted file mode 100644
index 04d7d65a0d..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
deleted file mode 100644
index abc4bf3785..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
deleted file mode 100644
index 5500d0bcca..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.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.xml;
-
-import java.io.OutputStream;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-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;
-
-/**
- * Push DOM Node to OutputStream
- *
- * @version $Rev$ $Date$
- */
-public class Node2OutputStream extends BaseTransformer<Node, OutputStream> implements
-    PushTransformer<Node, OutputStream> {
-    private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
-
-    public void transform(Node source, OutputStream writer, TransformationContext context) {
-        try {
-            Source domSource = new DOMSource(source);
-            Result result = new StreamResult(writer);
-            TRANSFORMER.transform(domSource, result, context);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<OutputStream> getTargetType() {
-        return OutputStream.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
deleted file mode 100644
index d5bf7e76b5..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.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.databinding.xml;
-
-import org.apache.tuscany.sca.databinding.impl.SimpleType2JavaTransformer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Transformer to convert data from a simple java Object to OMElement.
- *
- * @version $Rev$ $Date$
- */
-public class Node2SimpleJavaType extends SimpleType2JavaTransformer<Node> {
-
-    @Override
-    protected String getText(Node source) {
-        if (source instanceof Document) {
-            source = ((Document)source).getDocumentElement();
-        }
-        return source.getTextContent();
-
-    }
-
-    @Override
-    public Class getSourceType() {
-        return Node.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
deleted file mode 100644
index 3c9022bc3c..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.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.xml;
-
-import javax.xml.transform.Source;
-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.w3c.dom.Node;
-
-/**
- * Transform TrAX Node to Source
- *
- * @version $Rev$ $Date$
- */
-public class Node2SourceTransformer extends BaseTransformer<Node, Source> implements
-    PullTransformer<Node, Source> {
-
-    public Source transform(Node source, TransformationContext context) {
-        try {
-            return new DOMSource(source);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<Source> getTargetType() {
-        return Source.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
deleted file mode 100644
index 1b54b1fd1e..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.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.xml;
-
-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 org.w3c.dom.Node;
-
-/**
- * Transform DOM Node to XML String
- *
- * @version $Rev$ $Date$
- */
-public class Node2String extends BaseTransformer<Node, String> implements PullTransformer<Node, String> {
-    private static final Node2Writer TRANSFORMER = new Node2Writer();
-
-    public String transform(Node source, TransformationContext context) {
-        try {
-            StringWriter writer = new StringWriter();
-            TRANSFORMER.transform(source, writer, context);
-            return writer.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    public Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    public Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
deleted file mode 100644
index c9631595dc..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.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.xml;
-
-import java.io.Writer;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-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;
-
-/**
- * Push DOM Node to Writer
- *
- * @version $Rev$ $Date$
- */
-public class Node2Writer extends BaseTransformer<Node, Writer> implements PushTransformer<Node, Writer> {
-    private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
-
-    public void transform(Node source, Writer writer, TransformationContext context) {
-        try {
-            Source domSource = new DOMSource(source);
-            Result result = new StreamResult(writer);
-            TRANSFORMER.transform(domSource, result, context);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<Writer> getTargetType() {
-        return Writer.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
deleted file mode 100644
index 1e8d14a151..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.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.xml;
-
-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.w3c.dom.Node;
-
-/**
- * Transform DOM Node to XML XMLStreamReader
- *
- * @version $Rev$ $Date$
- */
-public class Node2XMLStreamReader extends BaseTransformer<Node, XMLStreamReader> implements
-    PullTransformer<Node, XMLStreamReader> {
-
-    public XMLStreamReader transform(Node source, TransformationContext context) {
-        if (source == null) {
-            return null;
-        }
-        try {
-            DOMXMLStreamReader reader = new DOMXMLStreamReader(source);
-            return reader;
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Node> getSourceType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
deleted file mode 100644
index 70387fa862..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.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.xml;
-
-import java.io.Reader;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamSource;
-
-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;
-
-/**
- * Push DOM Reader to Node
- *
- * @version $Rev$ $Date$
- */
-public class Reader2Node extends BaseTransformer<Reader, Node> implements PullTransformer<Reader, Node> {
-    private static final Source2ResultTransformer TRANSFORMER = new Source2ResultTransformer();
-
-    public Node transform(Reader source, TransformationContext context) {
-        try {
-            Source streamSource = new StreamSource(source);
-            DOMResult result = new DOMResult();
-            TRANSFORMER.transform(streamSource, result, context);
-            return result.getNode();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Reader> getSourceType() {
-        return Reader.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
deleted file mode 100644
index 188ecaffa3..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.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.xml;
-
-import java.io.Reader;
-
-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 org.xml.sax.InputSource;
-
-/**
- * Transform XML string to SAX
- *
- * @version $Rev$ $Date$
- */
-public class Reader2SAX extends BaseTransformer<Reader, ContentHandler> implements
-    PushTransformer<Reader, ContentHandler> {
-    public void transform(Reader source, ContentHandler target, TransformationContext context) {
-        try {
-            new InputSource2SAX().transform(new InputSource(source), target, context);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Reader> getSourceType() {
-        return Reader.class;
-    }
-
-    @Override
-    protected Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
deleted file mode 100644
index 38c61d64c8..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ /dev/null
@@ -1,246 +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.databinding.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-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 SAX2DOM 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 SAX2DOM() throws ParserConfigurationException {
-        this.document = DOMHelper.newDocument();
-        this.root = document;
-    }
-
-    public SAX2DOM(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 SAX2DOM(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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
deleted file mode 100644
index cb9d538389..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.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.databinding.xml;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-
-public class SAX2DOMPipe extends BaseTransformer<ContentHandler, Node> implements DataPipeTransformer<ContentHandler, Node> {
-
-    /**
-     * 
-     */
-    public SAX2DOMPipe() {
-        super();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.DataPipeTransformer#newInstance()
-     */
-    public DataPipe<ContentHandler, Node> newInstance() {
-        return new Pipe();
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    protected Class<ContentHandler> getSourceType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 30;
-    }
-
-    private static class Pipe implements DataPipe<ContentHandler, Node> {
-        private SAX2DOM pipe;
-
-        public Pipe() {
-            super();
-            try {
-                this.pipe = new SAX2DOM();
-            } catch (ParserConfigurationException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-
-        public Node getResult() {
-            return pipe.getDOM();
-        }
-
-        public ContentHandler getSink() {
-            return pipe;
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
deleted file mode 100644
index d2625fba11..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.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.xml;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.apache.tuscany.sca.databinding.impl.Java2SimpleTypeTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.Java2XMLMapperException;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Transformer to convert data from an simple OMElement to Java Object
- *
- * @version $Rev$ $Date$
- */
-public class SimpleJavaType2Node extends Java2SimpleTypeTransformer<Node> {
-
-    private Document factory;
-
-    public SimpleJavaType2Node() {
-        super();
-        try {
-            factory = DOMHelper.newDocument();
-        } catch (ParserConfigurationException e) {
-            throw new Java2XMLMapperException(e);
-        }
-    }
-
-    @Override
-    protected Node createElement(QName element, String text, TransformationContext context) {
-        if (element == null) {
-            element = DOMDataBinding.ROOT_ELEMENT;
-        }
-        Node root = DOMHelper.createElement(factory, element);
-        if (text != null) {
-            root.appendChild(factory.createTextNode(text));
-        } else {
-            Attr nil = factory.createAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "xsi:nil");
-            nil.setValue("true");
-            root.appendChild(nil);
-        }
-        return root;
-    }
-
-    @Override
-    public Class getTargetType() {
-        return Node.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
deleted file mode 100644
index e041f85214..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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.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.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.databinding.xml.XmlNode#getName()
-     */
-    public QName getName() {
-        return name;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.xml.XmlNode#getValue()
-     */
-    public String getValue() {
-        return value == null ? null : String.valueOf(value);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
deleted file mode 100644
index ee9aa1bb76..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.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.xml;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-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;
-
-/**
- * Transform TrAX Source to Node
- *
- * @version $Rev$ $Date$
- */
-public class Source2NodeTransformer extends BaseTransformer<Source, Node> implements
-    PullTransformer<Source, Node> {
-    private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
-
-    public Node transform(Source source, TransformationContext context) {
-        try {
-            javax.xml.transform.Transformer transformer = FACTORY.newTransformer();
-            DOMResult result = new DOMResult();
-            transformer.transform(source, result);
-            Document doc = (Document) result.getNode();
-            return DOMHelper.adjustElementName(context, doc.getDocumentElement());
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Source> getSourceType() {
-        return Source.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
deleted file mode 100644
index 8a2b6b39aa..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.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.xml;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-
-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;
-
-/**
- * Transform TrAX Source to Result
- *
- * @version $Rev$ $Date$
- */
-public class Source2ResultTransformer extends BaseTransformer<Source, Result> implements
-    PushTransformer<Source, Result> {
-    private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
-
-    public void transform(Source source, Result result, TransformationContext context) {
-        try {
-            javax.xml.transform.Transformer transformer = FACTORY.newTransformer();
-            transformer.transform(source, result);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Source> getSourceType() {
-        return Source.class;
-    }
-
-    @Override
-    protected Class<Result> getTargetType() {
-        return Result.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
deleted file mode 100644
index 2ed548ad76..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.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.xml;
-
-import java.io.StringWriter;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-
-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;
-
-/**
- * Transform TrAX Source to String
- *
- * @version $Rev$ $Date$
- */
-public class Source2StringTransformer extends BaseTransformer<Source, String> implements
-    PullTransformer<Source, String> {
-    private static final TransformerFactory FACTORY = TransformerFactory.newInstance();
-
-    public String transform(Source source, TransformationContext context) {
-        try {
-            javax.xml.transform.Transformer transformer = FACTORY.newTransformer();
-            StringWriter sw = new StringWriter();
-            StreamResult result = new StreamResult(sw);
-            transformer.transform(source, result);
-            return sw.toString();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<Source> getSourceType() {
-        return Source.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
deleted file mode 100644
index 6257681091..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
deleted file mode 100644
index 52a1d02631..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.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.xml;
-
-
-import javax.xml.stream.XMLStreamReader;
-
-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;
-
-/**
- * A DataBinding for the StAX
- * 
- * @version $Rev$ $Date$
- */
-public class StAXDataBinding extends BaseDataBinding {
-    public static final String NAME = XMLStreamReader.class.getName();
-    public static final String[] ALIASES = new String[] {"stax"};
-
-    public StAXDataBinding() {
-        super(NAME, ALIASES, XMLStreamReader.class);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (super.introspect(type, operation)) {
-            type.setLogical(XMLType.UNKNOWN);
-            type.setDataBinding(NAME);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
deleted file mode 100644
index 103ecbd7d1..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.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.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
deleted file mode 100644
index f8967e35b6..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.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.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-public class StreamDataPipe extends BaseTransformer<OutputStream, InputStream> implements
-    DataPipeTransformer<OutputStream, InputStream> {
-
-    public DataPipe<OutputStream, InputStream> newInstance() {
-        return new Pipe();
-    }
-
-    @Override
-    protected Class<InputStream> getTargetType() {
-        return InputStream.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-    @Override
-    protected Class<OutputStream> getSourceType() {
-        return OutputStream.class;
-    }
-
-    public static class Pipe implements DataPipe<OutputStream, InputStream> {
-        private ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        public InputStream getResult() {
-            return new ByteArrayInputStream(outputStream.toByteArray());
-        }
-
-        public OutputStream getSink() {
-            return outputStream;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
deleted file mode 100644
index 062e10cc45..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.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.xml;
-
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-
-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;
-import org.xml.sax.InputSource;
-
-public class String2Node extends BaseTransformer<String, Node> implements PullTransformer<String, Node> {
-
-    public Node transform(String source, TransformationContext context) {
-        try {
-            DocumentBuilder builder = DOMHelper.newDocumentBuilder();
-            InputSource inputSource = new InputSource(new StringReader(source));
-            return builder.parse(inputSource);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
deleted file mode 100644
index c56dba1843..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.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.xml;
-
-import java.io.StringReader;
-
-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 org.xml.sax.InputSource;
-
-/**
- * Transform XML string to SAX
- *
- * @version $Rev$ $Date$
- */
-public class String2SAX extends BaseTransformer<String, ContentHandler> implements
-    PushTransformer<String, ContentHandler> {
-
-    public void transform(String source, ContentHandler target, TransformationContext context) {
-        try {
-            new InputSource2SAX().transform(new InputSource(new StringReader(source)), target, context);
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
deleted file mode 100644
index c2de202a9b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.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.xml;
-
-import java.io.StringReader;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-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;
-
-/**
- * Transform XML String to Source
- *
- * @version $Rev$ $Date$
- */
-public class String2SourceTransformer extends BaseTransformer<String, Source> implements
-    PullTransformer<String, Source> {
-
-    public Source transform(String source, TransformationContext context) {
-        try {
-            return new StreamSource(new StringReader(source));
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<Source> getTargetType() {
-        return Source.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
deleted file mode 100644
index a7364006d0..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.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.xml;
-
-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;
-
-public class String2XMLStreamReader extends BaseTransformer<String, XMLStreamReader> implements
-    PullTransformer<String, XMLStreamReader> {
-
-    public XMLStreamReader transform(String source, TransformationContext context) {
-        try {
-            return StAXHelper.createXMLStreamReader(source);
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<String> getSourceType() {
-        return String.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getTargetType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
deleted file mode 100644
index b08a374df8..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.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.databinding.xml;
-
-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;
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        return !done && super.hasNext();
-    }
-
-    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;
-    }
-
-    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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
deleted file mode 100644
index 5ab7272d58..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.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.xml;
-
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-
-public class Writer2ReaderDataPipe extends BaseTransformer<Writer, Reader> implements DataPipeTransformer<Writer, Reader> {
-
-    public DataPipe<Writer, Reader> newInstance() {
-        return new Pipe();
-    }
-
-    @Override
-    protected Class<Reader> getTargetType() {
-        return Reader.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 50;
-    }
-
-    @Override
-    protected Class<Writer> getSourceType() {
-        return Writer.class;
-    }
-
-    private static class Pipe implements DataPipe<Writer, Reader> {
-        private StringWriter writer = new StringWriter();
-
-        public Reader getResult() {
-            return new StringReader(writer.toString());
-        }
-
-        public Writer getSink() {
-            return writer;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
deleted file mode 100644
index cd33e64176..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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 = 0;
-
-    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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
deleted file mode 100644
index a42d6acc9a..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
deleted file mode 100644
index f1084cf2a3..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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
-            childReader = new WrappingXMLStreamReader(new BeanXMLStreamReaderImpl(propertyQName, propertyValue));
-            // 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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
deleted file mode 100644
index f7c895db1e..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.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.xml;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.databinding.impl.GroupDataBinding;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-
-/**
- * A Group DataBinding
- * 
- * @version $Rev$ $Date$
- */
-public class XMLGroupDataBinding extends GroupDataBinding {
-
-    public XMLGroupDataBinding() {
-        super(new Class[] {InputStream.class, OutputStream.class, Reader.class, Writer.class, 
-                           // Source.class, Result.class, 
-                           InputSource.class, ContentHandler.class, XMLStreamReader.class,
-                           XMLStreamWriter.class, XMLEventReader.class, XMLEventWriter.class});
-    }
-
-    @Override
-    protected Object getLogical(Class<?> markerType, Operation operation) {
-        return XMLType.UNKNOWN;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
deleted file mode 100644
index e2d0416aec..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.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.xml;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-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 org.xml.sax.ContentHandler;
-
-/**
- * Transform DOM Node to XML XMLStreamReader
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2Node extends BaseTransformer<XMLStreamReader, Node> implements
-    PullTransformer<XMLStreamReader, Node> {
-
-    private XMLStreamReader2SAX stax2sax = new XMLStreamReader2SAX();
-
-    public Node transform(XMLStreamReader source, TransformationContext context) {
-        try {
-            DataPipe<ContentHandler, Node> pipe = new SAX2DOMPipe().newInstance();
-            stax2sax.transform(source, pipe.getSink(), context);
-            Node node = pipe.getResult();
-            source.close();
-            if (node instanceof Document) {
-                Document doc = (Document)node;
-                return DOMHelper.adjustElementName(context, doc.getDocumentElement());
-            } else {
-                return node;
-            }
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    protected Class<Node> getTargetType() {
-        return Node.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
deleted file mode 100644
index 9b39f039b1..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.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.xml;
-
-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.xml.sax.ContentHandler;
-
-/**
- * XMLStreamReader to SAX events
- *
- * @version $Rev$ $Date$
- */
-public class XMLStreamReader2SAX extends BaseTransformer<XMLStreamReader, ContentHandler> implements
-    PushTransformer<XMLStreamReader, ContentHandler> {
-
-    @Override
-    protected Class<ContentHandler> getTargetType() {
-        return ContentHandler.class;
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.databinding.PushTransformer#getWeight()
-     */
-    @Override
-    public int getWeight() {
-        return 20;
-    }
-
-    /**
-     * @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, ContentHandler sink, TransformationContext context) {
-        StAX2SAXAdapter adapter = new StAX2SAXAdapter(false);
-        try {
-            adapter.parse(source, sink);
-            source.close();
-        } catch (Exception e) {
-            throw new TransformationException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
deleted file mode 100644
index 6db731bc9f..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.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.xml;
-
-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;
-
-public class XMLStreamReader2String extends BaseTransformer<XMLStreamReader, String> implements
-    PullTransformer<XMLStreamReader, String> {
-
-    public String transform(XMLStreamReader source, TransformationContext context) {
-        try {
-            String str = StAXHelper.save(source);
-            source.close();
-            return str;
-        } catch (XMLStreamException e) {
-            throw new TransformationException(e);
-        }
-    }
-
-    @Override
-    protected Class<XMLStreamReader> getSourceType() {
-        return XMLStreamReader.class;
-    }
-
-    @Override
-    protected Class<String> getTargetType() {
-        return String.class;
-    }
-
-    @Override
-    public int getWeight() {
-        return 40;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
deleted file mode 100644
index 920ebb511c..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
deleted file mode 100644
index f32f93d098..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
deleted file mode 100644
index 36cf5e9c9b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.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.databinding.xml;
-
-
-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;
-
-/**
- * A DataBinding for the XML string
- * 
- * @version $Rev$ $Date$
- */
-public class XMLStringDataBinding extends BaseDataBinding {
-    public static final String NAME = String.class.getName();
-    public static final String[] ALIASES = new String[] {"xml.string"};
-
-    public XMLStringDataBinding() {
-        super(NAME, ALIASES, String.class);
-    }
-
-    @Override
-    public boolean introspect(DataType type, Operation operation) {
-        if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
-            type.setDataBinding(NAME);
-            type.setLogical(XMLType.UNKNOWN);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
deleted file mode 100644
index 86ebd627f7..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
deleted file mode 100644
index 53a9b4fcc6..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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 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();
-        }
-    }
-
-    /**
-     * 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/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
deleted file mode 100644
index f4bc357c7d..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/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.databinding.xml;
-
-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/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
deleted file mode 100644
index 10e6082b34..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ /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 classes for the databindings

-org.apache.tuscany.sca.databinding.xml.DOMDataBinding;type=org.w3c.dom.Node,name=dom

-org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;type=java.lang.String,name=xml.string

-org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;type=databinding:group

-org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;type=java:complexType

-org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;type=java:simpleType

-org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;type=java:exception

-org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;type=java.io.Externalizable,name=externalizable

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
deleted file mode 100644
index 568e04f9de..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ /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.DefaultDataBindingExtensionPoint
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
deleted file mode 100644
index 96115be404..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ /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.

-

-# Implementation classes for the transformers

-org.apache.tuscany.sca.databinding.xml.InputSource2Node;source=org.xml.sax.InputSource,target=org.w3c.dom.Node,weight=80

-org.apache.tuscany.sca.databinding.xml.InputStream2Node;source=java.io.InputStream,target=org.w3c.dom.Node,weight=80

-# org.apache.tuscany.sca.databinding.javabeans.DOMNode2JavaBeanTransformer;source=org.w3c.dom.Node,target=java:complexType,weight=80000

-org.apache.tuscany.sca.databinding.xml.Node2String;source=org.w3c.dom.Node,target=java.lang.String,weight=80

-org.apache.tuscany.sca.databinding.xml.Node2XMLStreamReader;source=org.w3c.dom.Node,target=javax.xml.stream.XMLStreamReader,weight=80

-# org.apache.tuscany.sca.databinding.javabeans.JavaBean2DOMNodeTransformer;source=java:complexType,target=org.w3c.dom.Node,weight=80000

-# org.apache.tuscany.sca.databinding.javabeans.JavaBean2XMLStreamReaderTransformer;source=java:complexType,target=javax.xml.stream.XMLStreamReader,weight=79000

-org.apache.tuscany.sca.databinding.xml.Reader2Node;source=java.io.Reader,target=org.w3c.dom.Node,weight=80

-org.apache.tuscany.sca.databinding.xml.SAX2DOMPipe;source=org.xml.sax.ContentHandler,target=org.w3c.dom.Node,weight=70

-org.apache.tuscany.sca.databinding.xml.StreamDataPipe;source=java.io.OutputStream,target=java.io.InputStream,weight=90

-org.apache.tuscany.sca.databinding.xml.String2Node;source=java.lang.String,target=org.w3c.dom.Node,weight=90

-org.apache.tuscany.sca.databinding.xml.String2XMLStreamReader;source=java.lang.String,target=javax.xml.stream.XMLStreamReader,weight=90

-org.apache.tuscany.sca.databinding.xml.Writer2ReaderDataPipe;source=java.io.Writer,target=java.io.Reader,weight=90

-org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node;source=javax.xml.stream.XMLStreamReader,target=org.w3c.dom.Node,weight=80

-org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;source=javax.xml.stream.XMLStreamReader,target=java.lang.String,weight=80

-# org.apache.tuscany.sca.databinding.xml.Node2SimpleJavaType;source=org.w3c.dom.Node,target=java:simpleType,weight=80000

-# org.apache.tuscany.sca.databinding.xml.SimpleJavaType2Node;source=java:simpleType,target=org.w3c.dom.Node,weight=80000

-org.apache.tuscany.sca.databinding.xml.Source2NodeTransformer;source=javax.xml.transform.Source,target=org.w3c.dom.Node,weight=80

-org.apache.tuscany.sca.databinding.xml.Source2StringTransformer;source=javax.xml.transform.Source,target=java.lang.String,weight=80

-

-org.apache.tuscany.sca.databinding.xml.Node2SourceTransformer;source=org.w3c.dom.Node,target=javax.xml.transform.Source,weight=80

-org.apache.tuscany.sca.databinding.xml.String2SourceTransformer;source=java.lang.String,target=javax.xml.transform.Source,weight=80

diff --git a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
deleted file mode 100644
index e02cd5c934..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ /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.
-
-# Implementation classes for the transformers
-org.apache.tuscany.sca.databinding.xml.InputSource2SAX;source=org.xml.sax.InputSource,target=org.xml.sax.ContentHandler,weight=80
-org.apache.tuscany.sca.databinding.xml.InputStream2SAX;source=java.io.InputStream,target=org.xml.sax.ContentHandler,weight=80
-org.apache.tuscany.sca.databinding.xml.Node2OutputStream;source=org.w3c.dom.Node,target=java.io.OutputStream,weight=80
-org.apache.tuscany.sca.databinding.xml.Node2Writer;source=org.w3c.dom.Node,target=java.io.Writer,weight=80
-org.apache.tuscany.sca.databinding.xml.Reader2SAX;source=java.io.Reader,target=org.xml.sax.ContentHandler,weight=80
-org.apache.tuscany.sca.databinding.xml.Source2ResultTransformer;source=javax.xml.transform.Source,target=javax.xml.transform.Result,weight=80
-org.apache.tuscany.sca.databinding.xml.String2SAX;source=java.lang.String,target=org.xml.sax.ContentHandler,weight=80
-org.apache.tuscany.sca.databinding.xml.XMLStreamReader2SAX;source=javax.xml.stream.XMLStreamReader,target=org.xml.sax.ContentHandler,weight=70
diff --git a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
deleted file mode 100644
index 7d8642fb1e..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ /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.DefaultTransformerExtensionPoint
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
deleted file mode 100644
index 8c710062ad..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.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.databinding.extension;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DOMHelperTestCase extends TestCase {
-    private static final QName FOO_NAME = new QName("http://foo", "foo");
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testDOM() throws Exception {
-        DocumentBuilder builder = DOMHelper.newDocumentBuilder();
-        assertNotNull(builder);
-        Document document = DOMHelper.newDocument();
-        assertNotNull(document);
-        Element element = DOMHelper.createElement(document, FOO_NAME);
-        document.appendChild(element);
-        QName name = DOMHelper.getQName(element);
-        assertEquals(FOO_NAME, name);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
deleted file mode 100644
index f9e331fbf3..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.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.extension;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.easymock.EasyMock;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataBindingExtensionTestCase extends TestCase {
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testExtension() {
-        DataBinding1 binding1 = new DataBinding1(Node.class);
-        assertEquals(Node.class.getName(), binding1.getName());
-        DataType dt1 = new DataTypeImpl<Class>(Element.class, null);
-        assertTrue(binding1.introspect(dt1, null));
-        DataType dt2 = new DataTypeImpl<Class>(String.class, null);
-        assertFalse(binding1.introspect(dt2, null));
-        assertNull(binding1.getWrapperHandler());
-        
-        DataBindingExtensionPoint registry = EasyMock.createMock(DataBindingExtensionPoint.class);
-        registry.addDataBinding(binding1);
-        EasyMock.expect(registry.getDataBinding(Node.class.getName())).andReturn(binding1);
-        EasyMock.replay(registry);
-        
-        assertNotNull(registry.getDataBinding(Node.class.getName()));
-
-        DataBinding1 binding2 = new DataBinding1("dom", Node.class);
-        assertEquals("dom", binding2.getName());
-    }
-
-    private static class DataBinding1 extends BaseDataBinding {
-
-        /**
-         * @param baseType
-         */
-        public DataBinding1(Class<?> baseType) {
-            super(baseType);
-        }
-
-        /**
-         * @param name
-         * @param baseType
-         */
-        public DataBinding1(String name, Class<?> baseType) {
-            super(name, baseType);
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
deleted file mode 100644
index e4b443e2fb..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.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.databinding.extension;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.interfacedef.util.TypeInfo;
-import org.easymock.EasyMock;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class SimpleTypeMapperExtensionTestCase extends TestCase {
-
-    private static final Map<String, Object> SAMPLE_VALUES = new HashMap<String, Object>();
-
-    static {
-        SAMPLE_VALUES.put("anyURI", "http://www.w3.com");
-        SAMPLE_VALUES.put("boolean", new String[] {"true", "false", "1", "0"});
-        SAMPLE_VALUES.put("byte", new String[] {"-128", "127"});
-        SAMPLE_VALUES.put("date", new String[] {"2004-03-15", "2002-09-24-06:00"});
-        SAMPLE_VALUES.put("dateTime", "2003-12-25T08:30:00");
-        SAMPLE_VALUES.put("decimal", "3.1415292");
-        SAMPLE_VALUES.put("double", new String[] {"3.1415292", "INF", "NaN"});
-        SAMPLE_VALUES.put("duration", new String[] {"P8M3DT7H33M2S", "P5Y2M10DT15H"});
-        SAMPLE_VALUES.put("float", new String[] {"3.1415292", "INF", "NaN"});
-        SAMPLE_VALUES.put("gDay", "---11");
-        if (System.getProperty("java.vendor").toUpperCase().contains("SUN") && System.getProperty("java.version")
-                .contains("1.5.0")) {
-            // Work around a bug in SUN JDK
-            SAMPLE_VALUES.put("gMonth", "--02--");
-        } else {
-            SAMPLE_VALUES.put("gMonth", "--02");
-        }
-        SAMPLE_VALUES.put("gMonthDay", "--02-14");
-        SAMPLE_VALUES.put("gYear", "1999");
-        SAMPLE_VALUES.put("gYearMonth", "1972-08");
-        SAMPLE_VALUES.put("ID", "id-102");
-        SAMPLE_VALUES.put("IDREF", "id-102");
-        SAMPLE_VALUES.put("IDREFS", "id-102 id-103 id-100");
-        SAMPLE_VALUES.put("int", "77");
-        SAMPLE_VALUES.put("integer", "77");
-        SAMPLE_VALUES.put("long", "214");
-        SAMPLE_VALUES.put("negativeInteger", "-123");
-        SAMPLE_VALUES.put("nonNegativeInteger", "2");
-        SAMPLE_VALUES.put("nonPositiveInteger", "0");
-        SAMPLE_VALUES.put("positiveInteger", "500");
-        SAMPLE_VALUES.put("short", "476");
-        SAMPLE_VALUES.put("string", "Joeseph");
-        SAMPLE_VALUES.put("time", "13:02:00");
-        SAMPLE_VALUES.put("base64Binary", "TWFu");
-        SAMPLE_VALUES.put("hexBinary", "2CDB5F");
-        SAMPLE_VALUES.put("QName", "f:foo");
-        SAMPLE_VALUES.put("NOTATION", "f:bar");
-    }
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testMap() throws Exception {
-        SimpleTypeMapperImpl extension = new SimpleTypeMapperImpl();
-        TransformationContext context = EasyMock.createMock(TransformationContext.class);
-        Map<String, Object> metaData = new HashMap<String, Object>();
-        EasyMock.expect(context.getMetadata()).andReturn(metaData).anyTimes();
-        EasyMock.replay(context);
-
-        NamespaceContext namespaceContext = EasyMock.createMock(NamespaceContext.class);
-        EasyMock.expect(namespaceContext.getNamespaceURI(EasyMock.eq("f"))).andReturn("http://foo").anyTimes();
-        EasyMock.expect(namespaceContext.getPrefix(EasyMock.eq("http://foo"))).andReturn("f").anyTimes();
-        EasyMock.replay(namespaceContext);
-        context.getMetadata().put(NamespaceContext.class.getName(), namespaceContext);
-        for (TypeInfo simpleType : SimpleTypeMapperImpl.XSD_SIMPLE_TYPES.values()) {
-            String name = simpleType.getQName().getLocalPart();
-            Object value = SAMPLE_VALUES.get(name);
-            if (value instanceof String[]) {
-                for (String s : (String[])value) {
-                    Object obj = extension.toJavaObject(simpleType.getQName(), s, context);
-                    String str = extension.toXMLLiteral(simpleType.getQName(), obj, context);
-                    assertNotNull(str);
-                    // assertTrue("[" + name + "] " + s + " " + str,
-                    // str.contains((String) s));
-                }
-            } else if (value instanceof String) {
-                Object obj = extension.toJavaObject(simpleType.getQName(), (String)value, context);
-                String str = extension.toXMLLiteral(simpleType.getQName(), obj, context);
-                assertNotNull(str);
-                // assertTrue("[" + name + "] " + value + " " + str,
-                // str.contains((String) value));
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
deleted file mode 100644
index 243ac71201..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.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.extension;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.Transformer;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.easymock.EasyMock;
-import org.w3c.dom.Node;
-
-/**
- * Test case for TransformerExtension
- *
- * @version $Rev$ $Date$
- */
-public class TransformerExtensionTestCase extends TestCase {
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testExtension() {
-        MyTransformer transformer = new MyTransformer();
-        assertEquals(Node.class.getName(), transformer.getSourceDataBinding());
-        assertEquals(XMLStreamReader.class.getName(), transformer.getTargetDataBinding());
-        assertEquals(50, transformer.getWeight());
-        TransformerExtensionPoint registry = EasyMock.createMock(TransformerExtensionPoint.class);
-        registry.addTransformer(EasyMock.isA(Transformer.class), EasyMock.eq(true));
-        EasyMock
-                .expect(registry.getTransformer(transformer.getSourceDataBinding(), transformer.getTargetDataBinding()))
-                .andReturn(transformer);
-        EasyMock.replay(registry);
-        registry.addTransformer(transformer, true);
-        assertSame(transformer, registry.getTransformer(transformer.getSourceDataBinding(), transformer
-                .getTargetDataBinding()));
-    }
-
-    private static class MyTransformer extends BaseTransformer<Node, XMLStreamReader> {
-
-        @Override
-        protected Class<Node> getSourceType() {
-            return Node.class;
-        }
-
-        @Override
-        protected Class<XMLStreamReader> getTargetType() {
-            return XMLStreamReader.class;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
deleted file mode 100644
index 07ee0b0ca4..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.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.extension;
-
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class XSDDataTypeConverterTestCase extends TestCase {
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testConvert() throws Exception {
-        XSDDataTypeConverter c = new XSDDataTypeConverter();
-        assertEquals("123", c.parseAnySimpleType(c.printAnySimpleType("123")));
-        assertEquals(true, c.parseBoolean(c.printBoolean(true)));
-        assertEquals(false, c.parseBoolean(c.printBoolean(false)));
-        assertEquals(123.0, c.parseDouble(c.printDouble(123.0)));
-        assertEquals(123.0f, c.parseFloat(c.printFloat(123.0f)));
-        assertEquals(64, c.parseByte(c.printByte((byte)64)));
-        assertEquals(123, c.parseInt(c.printInt(123)));
-        assertEquals(new BigInteger("123456"), c.parseInteger(c.printInteger(new BigInteger("123456"))));
-        assertEquals(123456L, c.parseLong(c.printLong(123456L)));
-        assertEquals((short)123, c.parseShort(c.printShort((short)123)));
-
-        Calendar calendar = new GregorianCalendar();
-        String s = c.printDate(calendar);
-        calendar = c.parseDate(s);
-        assertEquals(s, c.printDate(calendar));
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
deleted file mode 100644
index db210683dd..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.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.databinding.impl;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.easymock.EasyMock;
-import org.xml.sax.ContentHandler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataBindingRegistryImplTestCase extends TestCase {
-    private DataBindingExtensionPoint registry;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        registry = new DefaultDataBindingExtensionPoint();
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testRegistry() {
-        DataBinding db1 = createMock(DataBinding.class);
-        expect(db1.getAliases()).andReturn(new String[] {"db1"}).anyTimes();
-        expect(db1.getName()).andReturn(ContentHandler.class.getName()).anyTimes();
-        DataType<Class> dataType1 = new DataTypeImpl<Class>(ContentHandler.class, ContentHandler.class);
-        expect(db1.introspect(dataType1, null)).andReturn(true);
-        expect(db1.introspect(EasyMock.not(EasyMock.same(dataType1)), (Operation) EasyMock.isNull()))
-            .andReturn(false).anyTimes();
-        replay(db1);
-
-        registry.addDataBinding(db1);
-
-        DataBinding db2 = createMock(DataBinding.class);
-        expect(db2.getAliases()).andReturn(new String[] {"db2"}).anyTimes();
-        expect(db2.getName()).andReturn(XMLStreamReader.class.getName()).anyTimes();
-        DataType<Class> dataType2 = new DataTypeImpl<Class>(XMLStreamReader.class, XMLStreamReader.class);
-        expect(db2.introspect(dataType2, null)).andReturn(true);
-        expect(db2.introspect(EasyMock.not(EasyMock.same(dataType2)), (Operation) EasyMock.isNull()))
-            .andReturn(false).anyTimes();
-        replay(db2);
-
-        registry.addDataBinding(db2);
-
-        // Lookup by name
-        String name = db1.getName();
-        DataBinding db3 = registry.getDataBinding(name);
-        assertSame(db1, db3);
-
-        // Look up by alias
-        DataBinding db5 = registry.getDataBinding("db1");
-        assertSame(db1, db5);
-        
-        DataType dt = new DataTypeImpl<Class>(ContentHandler.class, null);
-        registry.introspectType(dt, null);
-        assertEquals(dataType1.getLogical(), ContentHandler.class);
-        //FIXME does not match with dynamically loaded databindings
-        //assertTrue(dt.getDataBinding().equalsIgnoreCase("java.lang.Object"));
-
-        registry.removeDataBinding(name);
-        DataBinding db4 = registry.getDataBinding(name);
-        assertNull(db4);
-
-        dt = new DataTypeImpl<Class>(null, String.class, null);
-        registry.introspectType(dt, null);
-        //FIXME does not match with dynamically loaded databindings
-        //assertEquals("java.lang.Object", dt.getDataBinding());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
deleted file mode 100644
index 7c882c0285..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.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.databinding.impl;
-
-import java.lang.reflect.Method;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DataBindingTestCase extends TestCase {
-    @SuppressWarnings("unused")
-    public void testDataType() throws Exception {
-        Class<Test> testClass = Test.class;
-        DataBinding d = testClass.getAnnotation(DataBinding.class);
-        Assert.assertEquals(d.value(), "sdo");
-
-        Method method = testClass.getMethod("test", new Class[] {Object.class});
-        DataBinding d2 = method.getAnnotation(DataBinding.class);
-        Assert.assertEquals(d2.value(), "jaxb");
-    }
-
-    @DataBinding("sdo")
-    private static interface Test {
-        @DataBinding("jaxb")
-        Object test(Object object);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
deleted file mode 100644
index 053e4f2a59..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.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.databinding.impl;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.impl.DirectedGraph.Edge;
-import org.apache.tuscany.sca.databinding.impl.DirectedGraph.Vertex;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DirectedGraphTestCase extends TestCase {
-    private DirectedGraph<String, Object> graph;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        graph = new DirectedGraph<String, Object>();
-    }
-
-    public void testGraph() {
-        graph.addEdge("a", "b", null, 3, true);
-        graph.addEdge("b", "c", null, 1, true);
-        // graph.addEdge("a", "c", null, 8, true);
-        graph.addEdge("a", "d", null, 3, true);
-        graph.addEdge("b", "d", null, 2, true);
-        graph.addEdge("d", "c", null, 3, true);
-        graph.addEdge("c", "b", null, 1, true);
-        graph.addEdge("c", "d", null, 2, true);
-        graph.addEdge("d", "b", null, 1, true);
-        graph.addEdge("a", "e", null, 8, true);
-        graph.addEdge("c", "c", null, 2, true);
-        graph.addEdge("f", "g", null, 2, false);
-        graph.addEdge("f", "h", null, 8, true);
-        graph.addEdge("g", "j", null, 2, false);
-        graph.addEdge("j", "i", null, 2, true);
-        graph.addEdge("h", "i", null, 8, true);
-
-        Vertex vertex = graph.getVertex("a");
-        Assert.assertNotNull(vertex);
-        Assert.assertEquals(vertex.getValue(), "a");
-
-        Assert.assertNull(graph.getVertex("1"));
-
-        Edge edge = graph.getEdge("a", "b");
-        Assert.assertNotNull(edge);
-        Assert.assertEquals(edge.getWeight(), 3);
-
-        edge = graph.getEdge("b", "a");
-        Assert.assertNull(edge);
-
-        DirectedGraph<String, Object>.Path path = graph.getShortestPath("a", "c");
-
-        List<DirectedGraph<String, Object>.Edge> edges = path.getEdges();
-        Assert.assertEquals(edges.size(), 2);
-        Assert.assertEquals(edges.get(0), graph.getEdge("a", "b"));
-        Assert.assertEquals(edges.get(1), graph.getEdge("b", "c"));
-
-        Assert.assertEquals(path.getWeight(), 4);
-
-        DirectedGraph<String, Object>.Path path2 = graph.getShortestPath("b", "e");
-        Assert.assertNull(path2);
-
-        DirectedGraph<String, Object>.Path path3 = graph.getShortestPath("a", "a");
-        Assert.assertTrue(path3.getWeight() == 0 && path3.getEdges().isEmpty());
-
-        DirectedGraph<String, Object>.Path path4 = graph.getShortestPath("c", "c");
-        Assert.assertTrue(path4.getWeight() == 2 && path4.getEdges().size() == 1);
-
-        DirectedGraph<String, Object>.Path path5 = graph.getShortestPath("f", "i");
-        Assert.assertTrue(path5.getWeight() == 16 && path5.getEdges().size() == 2);
-
-    }
-
-    public void testSort() {
-        graph.addEdge("a", "b");
-        graph.addEdge("a", "c");
-        graph.addEdge("c", "d");
-        graph.addEdge("b", "c");
-        List<String> order = graph.topologicalSort(true);
-        assertEquals(Arrays.asList("a", "b", "c", "d"), order);
-        assertTrue(!graph.getVertices().isEmpty());
-
-        graph.addEdge("d", "a");
-        try {
-            order = graph.topologicalSort(true);
-            assertTrue("Should have failed", false);
-        } catch (IllegalArgumentException e) {
-            assertTrue(true);
-        }
-
-        graph.removeEdge("d", "a");
-        order = graph.topologicalSort(false);
-        assertEquals(Arrays.asList("a", "b", "c", "d"), order);
-        assertTrue(graph.getVertices().isEmpty());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
deleted file mode 100644
index 6cc8868397..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.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.databinding.impl;
-
-import java.io.StringWriter;
-import java.io.Writer;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultTransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.TransformationContext;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.xml.Node2String;
-import org.apache.tuscany.sca.databinding.xml.Node2Writer;
-import org.apache.tuscany.sca.databinding.xml.SAX2DOMPipe;
-import org.apache.tuscany.sca.databinding.xml.String2SAX;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Test case for MediatorImpl
- *
- * @version $Rev$ $Date$
- */
-public class MediatorImplTestCase 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 MediatorImpl mediator;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        DataBindingExtensionPoint dataBindingRegistry = new DefaultDataBindingExtensionPoint();
-        TransformerExtensionPoint registry = new DefaultTransformerExtensionPoint();
-
-        registry.addTransformer(new String2SAX(), true);
-        registry.addTransformer(new SAX2DOMPipe(), true);
-        registry.addTransformer(new Node2String(), true);
-        registry.addTransformer(new Node2Writer(), true);
-
-        mediator = new MediatorImpl(dataBindingRegistry, registry);
-    }
-
-    private TransformationContext createTransformationContext(Class sourceType, Class targetType) {
-        TransformationContext context = new TransformationContextImpl();
-        DataType sourceDataType = new DataTypeImpl<Class>(sourceType.getName(), sourceType, sourceType);
-        DataType targetDataType = new DataTypeImpl<Class>(targetType.getName(), targetType, targetType);
-        context.setSourceDataType(sourceDataType);
-        context.setTargetDataType(targetDataType);
-        return context;
-    }
-
-    public void testTransform1() {
-        TransformationContext context = createTransformationContext(String.class, Node.class);
-        Object node =
-            mediator.mediate(IPO_XML, context.getSourceDataType(), context.getTargetDataType(), null);
-        Assert.assertTrue(node instanceof Document);
-        Element root = ((Document)node).getDocumentElement();
-        Assert.assertEquals(root.getNamespaceURI(), "http://www.example.com/IPO");
-        Assert.assertEquals(root.getLocalName(), "purchaseOrder");
-    }
-
-    public void testTransform2() {
-        TransformationContext context = createTransformationContext(String.class, Writer.class);
-        Writer writer = new StringWriter();
-        mediator.mediate(IPO_XML, writer, context.getSourceDataType(), context.getTargetDataType(), null);
-        String str = writer.toString();
-        Assert.assertTrue(str != null && str.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
deleted file mode 100644
index 31c3fd4f00..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.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.databinding.impl;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DefaultTransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.Transformer;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TransformerRegistryImplTestCase extends TestCase {
-    private TransformerExtensionPoint registry;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        registry = new DefaultTransformerExtensionPoint();
-    }
-
-    public void testRegisterTransformer1() {
-        Transformer transformer = createMock(Transformer.class);
-        registry.addTransformer("a", "b", 10, transformer, true);
-        Transformer t = registry.getTransformer("a", "b");
-        Assert.assertSame(t, transformer);
-    }
-
-    public void testRegisterTransformerTransformer() {
-        Transformer transformer = createMock(Transformer.class);
-        expect(transformer.getSourceDataBinding()).andReturn("a");
-        expect(transformer.getTargetDataBinding()).andReturn("b");
-        expect(transformer.getWeight()).andReturn(10);
-        replay(transformer);
-        registry.addTransformer(transformer, true);
-        Transformer t = registry.getTransformer("a", "b");
-        Assert.assertSame(t, transformer);
-    }
-
-    public void testUnregisterTransformer() {
-        Transformer transformer = createMock(Transformer.class);
-        registry.addTransformer("a", "b", 10, transformer, true);
-        boolean result = registry.removeTransformer("a", "b");
-        Assert.assertTrue(result);
-        Transformer t = registry.getTransformer("a", "b");
-        Assert.assertNull(t);
-    }
-
-    public void testGetTransformerChain() {
-        Transformer t1 = createMock(Transformer.class);
-        expect(t1.getSourceDataBinding()).andReturn("a");
-        expect(t1.getTargetDataBinding()).andReturn("b");
-        expect(t1.getWeight()).andReturn(10);
-        replay(t1);
-        Transformer t2 = createMock(Transformer.class);
-        expect(t2.getSourceDataBinding()).andReturn("b");
-        expect(t2.getTargetDataBinding()).andReturn("c");
-        expect(t2.getWeight()).andReturn(20);
-        replay(t2);
-
-        Transformer t3 = createMock(Transformer.class);
-        expect(t3.getSourceDataBinding()).andReturn("a");
-        expect(t3.getTargetDataBinding()).andReturn("c");
-        expect(t3.getWeight()).andReturn(120);
-        replay(t3);
-
-        registry.addTransformer(t1, true);
-        registry.addTransformer(t2, true);
-        registry.addTransformer(t3, true);
-
-        List<Transformer> l1 = registry.getTransformerChain("a", "b");
-        Assert.assertTrue(l1.size() == 1 && l1.get(0) == t1);
-        List<Transformer> l2 = registry.getTransformerChain("a", "c");
-        Assert.assertTrue(l2.size() == 1 && l2.get(0) == t3);
-        List<Transformer> l3 = registry.getTransformerChain("a", "d");
-        Assert.assertNull(l3);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
deleted file mode 100644
index dd3d000798..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.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.impl;
-
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.databinding.xml.XMLDocumentStreamReader;
-import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLDocumentStreamReaderTestCase {
-    private static final String xml = "<e1><e2 a2=\"a2\"><e4>E4</e4></e2><e3 a3=\"a3\"/></e1>";
-
-    @org.junit.Test
-    public void testReader() throws Exception {
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        XMLStreamReader r1 = factory.createXMLStreamReader(new StringReader(xml));
-        XMLDocumentStreamReader r2 = new XMLDocumentStreamReader(r1);
-        XMLStreamReader2String t1 = new XMLStreamReader2String();
-        String result = t1.transform(r2, null);
-        System.out.println(result);
-        XMLStreamReader r3 = factory.createXMLStreamReader(new StringReader(xml));
-        r3.nextTag();
-        r3.nextTag();
-        Assert.assertEquals(XMLStreamConstants.START_ELEMENT, r3.getEventType());
-        Assert.assertEquals(new QName(null, "e2"), r3.getName());
-        XMLDocumentStreamReader r4 = new XMLDocumentStreamReader(r3);
-        result = t1.transform(r4, null);
-        System.out.println(result);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
deleted file mode 100644
index bdc9690285..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.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.databinding.xml;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.custommonkey.xmlunit.Diff;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class BeanXMLStreamReaderTestCase extends TestCase {
-    private static final String XML_RESULT =
-        "<?xml version='1.0' encoding='UTF-8'?>" + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
-            + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i>"
-            + "<list>Item1</list><list>Item2</list>"
-            + "<map><entry><key>key1</key><value>value1</value></entry>"
-            + "<entry><key>key2</key><value>value2</value></entry></map>"
-            + "<nil xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:nil=\"true\" />"
-            + "<str>ABC</str></MyBean>";
-
-    // The map entries can come in a different order
-    private static final String XML_RESULT1 =
-        "<?xml version='1.0' encoding='UTF-8'?>" + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
-            + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i>"
-            + "<list>Item1</list><list>Item2</list>"
-            + "<map><entry><key>key2</key><value>value2</value></entry>"
-            + "<entry><key>key1</key><value>value1</value></entry></map>"
-            + "<nil xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:nil=\"true\" />"
-            + "<str>ABC</str></MyBean>";
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testTransformation() throws Exception {
-        MyBean bean = new MyBean();
-        bean.str = "ABC";
-        bean.i = 1;
-        bean.arr = new long[] {1, 2, 3};
-        bean.bean = new AnotherBean();
-        bean.bean.setName("Name");
-        bean.list.add("Item1");
-        bean.list.add("Item2");
-        bean.map.put("key1", "value1");
-        bean.map.put("key2", "value2");
-        XMLStreamReader reader = new BeanXMLStreamReaderImpl(null, bean);
-        XMLStreamReader2String t3 = new XMLStreamReader2String();
-        String xml = t3.transform(reader, null);
-        Diff diff = new Diff(XML_RESULT, xml);
-        Diff diff1 = new Diff(XML_RESULT1, xml);
-        assertTrue(diff.similar() || diff1.similar());
-    }
-
-    private static class MyBean {
-        private long arr[];
-        private String str;
-        private int i;
-        private String nil;
-        private List<String> list = new ArrayList();
-        private AnotherBean bean;
-        private Map<String, String> map = new HashMap<String, String>();
-
-        /**
-         * @return the i
-         */
-        public int getI() {
-            return i;
-        }
-
-        /**
-         * @param i the i to set
-         */
-        public void setI(int i) {
-            this.i = i;
-        }
-
-        /**
-         * @return the arr
-         */
-        public long[] getArr() {
-            return arr;
-        }
-
-        /**
-         * @param arr the arr to set
-         */
-        public void setArr(long[] arr) {
-            this.arr = arr;
-        }
-
-        /**
-         * @return the str
-         */
-        public String getStr() {
-            return str;
-        }
-
-        /**
-         * @param str the str to set
-         */
-        public void setStr(String str) {
-            this.str = str;
-        }
-
-        /**
-         * @return the bean
-         */
-        public AnotherBean getBean() {
-            return bean;
-        }
-
-        /**
-         * @param bean the bean to set
-         */
-        public void setBean(AnotherBean bean) {
-            this.bean = bean;
-        }
-
-        public List<String> getList() {
-            return list;
-        }
-
-        public void setList(List<String> list) {
-            this.list = list;
-        }
-
-        public String getNil() {
-            return nil;
-        }
-
-        public void setNil(String nil) {
-            this.nil = nil;
-        }
-
-        public Map<String, String> getMap() {
-            return map;
-        }
-
-        public void setMap(Map<String, String> map) {
-            this.map = map;
-        }
-
-    }
-
-    private static class AnotherBean {
-        private String name;
-
-        /**
-         * @return the name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * @param name the name to set
-         */
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
deleted file mode 100644
index 9e9dabcea7..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.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.databinding.xml;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.w3c.dom.Node;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DOM2StAXTestCase 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 CRAZY_XML =
-        "<p:e1 xmlns=\"http://ns0\" xmlns:p=\"http://p1\">" + "<p:e2 xmlns:p=\"http://p2\"/><e3/><e4 xmlns=\"\">E4</e4></p:e1>";
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testTransformation() throws Exception {
-        String2Node t1 = new String2Node();
-        Node node = t1.transform(IPO_XML, null);
-        Node2XMLStreamReader t2 = new Node2XMLStreamReader();
-        XMLStreamReader reader = t2.transform(node, null);
-        XMLStreamReader2String t3 = new XMLStreamReader2String();
-        String xml = t3.transform(reader, null);
-        XMLAssert.assertXMLEqual(IPO_XML, xml);
-        // assertTrue(xml != null && xml.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
-    }
-
-    public void testTransformation2() throws Exception {
-        String2Node t1 = new String2Node();
-        Node node = t1.transform(CRAZY_XML, null);
-        Node2XMLStreamReader t2 = new Node2XMLStreamReader();
-        XMLStreamReader reader = t2.transform(node, null);
-        XMLStreamReader2String t3 = new XMLStreamReader2String();
-        String xml = t3.transform(reader, null);
-        // System.out.println(xml);
-        XMLAssert.assertXMLEqual(CRAZY_XML, xml);
-        assertTrue(xml.contains("<p:e2 xmlns:p=\"http://p2\""));
-    }
-
-    public void testTransformation3() throws Exception {
-        String2Node t1 = new String2Node();
-        Node node = t1.transform(IPO_XML, null);
-        DOMXmlNodeImpl element = new DOMXmlNodeImpl(node);
-        XmlTreeStreamReaderImpl reader = new XmlTreeStreamReaderImpl(element);
-        XMLStreamReader2String t3 = new XMLStreamReader2String();
-        String xml = t3.transform(reader, null);
-        XMLAssert.assertXMLEqual(IPO_XML, xml);
-        // assertTrue(xml != null && xml.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
deleted file mode 100644
index f3b37c86db..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.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.databinding.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.DataPipe;
-import org.apache.tuscany.sca.databinding.DataPipeTransformer;
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.apache.tuscany.sca.databinding.impl.PipedTransformer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Test case for DataPipe
- *
- * @version $Rev$ $Date$
- */
-public class DataPipeTestCase extends TestCase {
-
-    public final void testStreamPipe() throws IOException {
-        byte[] bytes = new byte[] {1, 2, 3};
-        DataPipeTransformer<OutputStream, InputStream> pipe = new StreamDataPipe();
-        DataPipe<OutputStream, InputStream> dataPipe = pipe.newInstance();
-        OutputStream os = dataPipe.getSink();
-        os.write(bytes);
-        byte[] newBytes = new byte[16];
-        int count = dataPipe.getResult().read(newBytes);
-        Assert.assertEquals(3, count);
-        for (int i = 0; i < bytes.length; i++) {
-            Assert.assertEquals(bytes[i], newBytes[i]);
-        }
-    }
-
-    public final void testWriter2ReaderPipe() throws IOException {
-        String str = "ABC";
-        Writer2ReaderDataPipe pipe = new Writer2ReaderDataPipe();
-        Assert.assertSame(Writer.class, pipe.getSourceType());
-        Assert.assertSame(Reader.class, pipe.getTargetType());
-        DataPipe<Writer, Reader> dataPipe = pipe.newInstance();
-        dataPipe.getSink().write(str);
-        char[] buf = new char[16];
-        int count = dataPipe.getResult().read(buf);
-        Assert.assertEquals(3, count);
-        for (int i = 0; i < str.length(); i++) {
-            Assert.assertEquals(str.charAt(i), buf[i]);
-        }
-    }
-
-    public final void testPiped() throws Exception {
-        Node2Writer node2Writer = new Node2Writer();
-        Writer2ReaderDataPipe pipe = new Writer2ReaderDataPipe();
-        PipedTransformer<Node, Writer, Reader> transformer =
-            new PipedTransformer<Node, Writer, Reader>(node2Writer, pipe);
-        Document document = DOMHelper.newDocument();
-        Element element = document.createElementNS("http://ns1", "root");
-        document.appendChild(element);
-        Reader reader = transformer.transform(document, null);
-        Assert.assertEquals(transformer.getWeight(), node2Writer.getWeight() + pipe.getWeight());
-        Assert.assertEquals(transformer.getSourceDataBinding(), node2Writer.getSourceDataBinding());
-        Assert.assertEquals(transformer.getTargetDataBinding(), pipe.getTargetDataBinding());
-        char[] buf = new char[120];
-        int count = reader.read(buf);
-        String xml = new String(buf, 0, count);
-        Assert.assertTrue(xml.contains("<root xmlns=\"http://ns1\"/>"));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
deleted file mode 100644
index 3a287a5bb7..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.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.databinding.xml;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.javabeans.JavaBean2XMLStreamReaderTransformer;
-import org.custommonkey.xmlunit.XMLAssert;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaBean2XMLStreamReaderTestCase extends TestCase {
-    private static final String XML_RESULT =
-        "<?xml version='1.0' encoding='UTF-8'?>" 
-            + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
-            + "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i><str>ABC</str>"
-            + "</MyBean>";
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testTransformation() throws Exception {
-        JavaBean2XMLStreamReaderTransformer t2 = new JavaBean2XMLStreamReaderTransformer();
-        MyBean bean = new MyBean();
-        bean.str = "ABC";
-        bean.i = 1;
-        bean.arr = new long[] {1, 2, 3};
-        bean.bean = new AnotherBean();
-        bean.bean.setName("Name");
-        XMLStreamReader reader = t2.transform(bean, null);
-        XMLStreamReader2String t3 = new XMLStreamReader2String();
-        String xml = t3.transform(reader, null);
-        XMLAssert.assertXMLEqual(XML_RESULT, xml);
-
-    }
-
-    private static class MyBean {
-        private String str;
-        private int i;
-        private long arr[];
-        private AnotherBean bean;
-
-        /**
-         * @return the arr
-         */
-        public long[] getArr() {
-            return arr;
-        }
-
-        /**
-         * @param arr the arr to set
-         */
-        public void setArr(long[] arr) {
-            this.arr = arr;
-        }
-
-        /**
-         * @return the i
-         */
-        public int getI() {
-            return i;
-        }
-
-        /**
-         * @param i the i to set
-         */
-        public void setI(int i) {
-            this.i = i;
-        }
-
-        /**
-         * @return the str
-         */
-        public String getStr() {
-            return str;
-        }
-
-        /**
-         * @param str the str to set
-         */
-        public void setStr(String str) {
-            this.str = str;
-        }
-
-        /**
-         * @return the bean
-         */
-        public AnotherBean getBean() {
-            return bean;
-        }
-
-        /**
-         * @param bean the bean to set
-         */
-        public void setBean(AnotherBean bean) {
-            this.bean = bean;
-        }
-
-    }
-
-    private static class AnotherBean {
-        private String name;
-
-        /**
-         * @return the name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * @param name the name to set
-         */
-        public void setName(String name) {
-            this.name = name;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
deleted file mode 100644
index cc1f9375c8..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.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.databinding.xml;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.impl.DOMHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Node2StringTestCase extends TestCase {
-    public void testTransformation() throws Exception {
-        Document document = DOMHelper.newDocument();
-        Element element = document.createElementNS("http://ns1", "test");
-        document.appendChild(element);
-
-        new Node2String().transform(document, null);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
deleted file mode 100644
index 5ae0616577..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.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.xml;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.impl.PipedTransformer;
-import org.w3c.dom.Node;
-import org.xml.sax.ContentHandler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class PushTransformationTestCase 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>";
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void testTransformation() {
-        String2XMLStreamReader t1 = new String2XMLStreamReader();
-        XMLStreamReader reader = t1.transform(IPO_XML, null);
-        XMLStreamReader2SAX t2 = new XMLStreamReader2SAX();
-        PipedTransformer<XMLStreamReader, ContentHandler, Node> t3 =
-            new PipedTransformer<XMLStreamReader, ContentHandler, Node>(t2, new SAX2DOMPipe());
-        Node node = t3.transform(reader, null);
-        Assert.assertNotNull(node);
-        Node2String t4 = new Node2String();
-        String xml = t4.transform(node, null);
-        Assert.assertTrue(xml != null && xml.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
deleted file mode 100644
index 9ca490f2d8..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.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.xml;
-
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.custommonkey.xmlunit.XMLAssert;
-
-/**
- * Test Case for StAXHelper
- *
- * @version $Rev$ $Date$
- */
-public class StAXHelperTestCase extends TestCase {
-    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>";
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    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/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
deleted file mode 100644
index ff6f8c1406..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.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 org.apache.tuscany.sca.databinding.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.w3c.dom.Node;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TraxTransformerTestCase extends TestCase {
-    private URL url;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        url = getClass().getResource("foo.xml");
-    }
-
-    public void testTransformDOM() throws IOException {
-        InputStream is = url.openStream();
-        InputStream2Node t1 = new InputStream2Node();
-        Node node = t1.transform(is, null);
-        is.close();
-        Writer writer = new StringWriter();
-        Node2Writer t2 = new Node2Writer();
-        t2.transform(node, writer, null);
-        String str = writer.toString();
-        StringReader reader = new StringReader(str);
-        Reader2Node t3 = new Reader2Node();
-        node = t3.transform(reader, null);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        Node2OutputStream t4 = new Node2OutputStream();
-        t4.transform(node, os, null);
-        InputSource inputSource = new InputSource(new ByteArrayInputStream(os.toByteArray()));
-        InputSource2Node t5 = new InputSource2Node();
-        node = t5.transform(inputSource, null);
-    }
-
-    public void testTransformSAX() throws IOException {
-        MyContentHandler handler = new MyContentHandler();
-        InputStream is = url.openStream();
-        InputStream2SAX t1 = new InputStream2SAX();
-        t1.transform(is, handler, null);
-        is.close();
-
-        String xml = "<foo xmlns=\"http://foo\">bar</foo>";
-
-        InputSource inputSource = new InputSource(new StringReader(xml));
-        InputSource2SAX t2 = new InputSource2SAX();
-        MyContentHandler handler2 = new MyContentHandler();
-        t2.transform(inputSource, handler2, null);
-
-    }
-
-    private static class MyContentHandler extends DefaultHandler {
-
-        @Override
-        public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
-            throws SAXException {
-            super.startElement(namespaceURI, localName, qName, atts);
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
deleted file mode 100644
index 8c1d45ff10..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.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.databinding.xml;
-
-import java.io.StringReader;
-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.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.custommonkey.xmlunit.XMLAssert;
-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);
-        XMLStreamReader2String t = new XMLStreamReader2String();
-        String xml = t.transform(reader, null);
-        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;
-        }
-
-        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/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
deleted file mode 100644
index 92a576fb98..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/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/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
deleted file mode 100644
index 100890e10b..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ /dev/null
@@ -1,76 +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/order.wsdl" xmlns:tns="http://example.com/order.wsdl"

-    xmlns:xsd1="http://example.com/order.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-    xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/order.xsd" xmlns="http://www.w3.org/2001/XMLSchema"

-            xmlns:ipo="http://www.example.com/IPO">

-            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>

-            <element name="checkOrderStatus">

-                <complexType>

-                    <sequence>

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

-                        <element name="order" type="ipo:PurchaseOrderType" />

-                        <element name="flag" type="int" />

-                    </sequence>

-                </complexType>

-            </element>

-            <element name="checkOrderStatusResponse">

-                <complexType>

-                    <sequence>

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

-                    </sequence>

-                </complexType>

-            </element>

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

-        </schema>

-    </types>

-

-    <message name="CheckOrderStatusInput1">

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

-    </message>

-

-    <message name="CheckOrderStatusOutput1">

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

-    </message>

-

-    <message name="CheckOrderStatusInput2">

-        <part name="p1" element="xsd1:checkOrderStatus" />

-        <part name="p2" element="xsd1:note" />

-    </message>

-

-    <message name="CheckOrderStatusOutput2">

-        <part name="p1" element="xsd1:checkOrderStatusResponse" />

-    </message>

-

-    <portType name="OrderPortType">

-        <operation name="checkOrderStatus">

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

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

-        </operation>

-        <operation name="checkOrderStatus2">

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

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

-        </operation>

-    </portType>

-

-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
deleted file mode 100644
index 0ba8ade1e0..0000000000
--- a/tags/java/sca/1.3/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.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.
--->
-<f:foo xmlns:f="http://foo" name="foo">
-    <b:bar xmlns:b="http://bar">bar</b:bar>
-</f:foo>    
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/definitions-xml/LICENSE b/tags/java/sca/1.3/modules/definitions-xml/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/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/tags/java/sca/1.3/modules/definitions-xml/NOTICE b/tags/java/sca/1.3/modules/definitions-xml/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/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/tags/java/sca/1.3/modules/definitions-xml/pom.xml b/tags/java/sca/1.3/modules/definitions-xml/pom.xml
deleted file mode 100644
index e6b2037fb7..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-definitions-xml</artifactId>

-    <name>Apache Tuscany SCA Definitions XML Model</name>

-    

-    <dependencies>

-    	<dependency>

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

-            <artifactId>tuscany-policy</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-policy-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-definitions</artifactId>

-            <version>1.3</version>

-        </dependency>

-    	

-        <dependency>

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

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.3</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.definitions.xml</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.definitions.xml*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
deleted file mode 100644
index 0b760ef712..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.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.definitions.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * A SCA Definitions Document processor.
- *
- * @version $Rev$ $Date$
- */
-public class SCADefinitionsDocumentProcessor  implements URLArtifactProcessor<SCADefinitions> {
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private XMLInputFactory inputFactory;
-    private static final String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    private static final String DEFINITIONS = "definitions";
-    private static final QName DEFINITIONS_QNAME = new QName(TUSCANY_NS, DEFINITIONS);
-    private Monitor monitor;
-
-    /**
-     * Construct a new SCADefinitions processor
-     * @param assemblyFactory
-     * @param policyFactory
-     * @param staxProcessor
-     */
-    public SCADefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
-                                           XMLInputFactory inputFactory,
-                                           Monitor monitor) {
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
-        this.inputFactory = inputFactory;
-        this.monitor = monitor;
-    }
-
-    /**
-     * Constructs a new SCADefinitions processor.
-     * 
-     * @param modelFactories
-     * @param staxProcessor
-     */
-    public SCADefinitionsDocumentProcessor(ModelFactoryExtensionPoint modelFactories, 
-    									   StAXArtifactProcessor<Object> staxProcessor,
-    									   Monitor monitor) {
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
-        this.inputFactory = modelFactories.getFactory(XMLInputFactory.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 = new ProblemImpl(this.getClass().getName(), "definitions-xml-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(), "definitions-xml-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-    
-
-    public SCADefinitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
-        InputStream urlStream = null; 
-        try {        	
-            // Allow privileged access to open URL stream. Add FilePermission to added to security
-            // policy file.
-            try {
-                urlStream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-                    public InputStream run() throws IOException {
-                        URLConnection connection = url.openConnection();
-                        connection.setUseCaches(false);
-                        return connection.getInputStream();
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-            	error("PrivilegedActionException", url, (IOException)e.getException());
-                throw (IOException)e.getException();
-            }
-            
-            //urlStream = createInputStream(url);
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
-            
-            SCADefinitions definitions = new SCADefinitionsImpl();
-            QName name = null;
-            int event;
-            while ( reader.hasNext() ) {
-                event = reader.next();
-                
-                if ( event == XMLStreamConstants.START_ELEMENT  ||
-                    event == XMLStreamConstants.END_ELEMENT ) {
-                    name = reader.getName();
-                    if ( name.equals(DEFINITIONS_QNAME) ) {
-                        if ( event == XMLStreamConstants.END_ELEMENT ) {
-                            return definitions;
-                        } 
-                    } else {
-                        SCADefinitions aDefn = (SCADefinitions)extensionProcessor.read(reader);
-                        SCADefinitionsUtil.aggregateSCADefinitions(aDefn, definitions);
-                    }
-                }
-            }
-            
-            return definitions;
-        } catch (XMLStreamException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } catch (IOException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", inputFactory, ce);
-            throw ce;
-        } finally {
-        
-            try {
-                if (urlStream != null) {
-                    urlStream.close();
-                    urlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(SCADefinitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
-        SCADefinitionsUtil.stripDuplicates(scaDefinitions);
-        extensionProcessor.resolve(scaDefinitions, resolver);
-    }
-    
-    public String getArtifactType() {
-        return "definitions.xml";
-    }
-    
-    public Class<SCADefinitions> getModelType() {
-        return SCADefinitions.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
deleted file mode 100644
index 6958501922..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.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.definitions.xml;
-
-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.XMLStreamConstants;
-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.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.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
-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.QualifiedIntent;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- * Processor for SCA Definitions
- *
- * @version $Rev$ $Date$
- */
-public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<SCADefinitions> {
-    
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private Monitor monitor;
-    
-    public static final String BINDING = "binding";
-    public static final String IMPLEMENTATION = "implementation";
-    public static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-    public static final String SCA_DEFINITIONS = "definitions";
-    public static final QName SCA_DEFINITIONS_QNAME = new QName(SCA10_NS, SCA_DEFINITIONS);
-    public static final String TARGET_NAMESPACE = "targetNamespace";
-    public static final String NAME = "name";
-    
-    /**
-     * Construct a new definitions processor
-     * @param extensionProcessor 
-     * @param modelResolver 
-     */
-    public SCADefinitionsProcessor(StAXArtifactProcessor<Object> extensionProcessor,
-                              ModelResolver modelResolver, Monitor monitor) {
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    public SCADefinitionsProcessor(ExtensionPointRegistry extensionPoints, 
-    		                       StAXArtifactProcessor<Object> extensionProcessor,
-    		                       Monitor monitor) {
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-
-    public SCADefinitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        QName name = null;
-        SCADefinitions definitions = null;
-        String targetNamespace = null;
-
-        while (reader.hasNext()) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT: {
-                    name = reader.getName();
-                    if ( SCA_DEFINITIONS_QNAME.equals(name)) {
-                        definitions = new SCADefinitionsImpl();
-                        targetNamespace = reader.getAttributeValue(null, TARGET_NAMESPACE);
-                        definitions.setTargetNamespace(targetNamespace);
-                    } else {
-                        Object extension = extensionProcessor.read(reader);
-                        if (extension != null) {
-                            if ( extension instanceof Intent ) {
-                                Intent intent = (Intent)extension;
-                                intent.setName(new QName(targetNamespace, 
-                                                                      intent.getName().getLocalPart()));
-                                if ( intent instanceof QualifiedIntent ) {
-                                    QualifiedIntent qualifiedIntent = (QualifiedIntent)intent;
-                                    qualifiedIntent.getQualifiableIntent().
-                                            setName(new QName(targetNamespace,
-                                                              qualifiedIntent.getQualifiableIntent().getName().getLocalPart()));
-                                }
-                                
-                                definitions.getPolicyIntents().add(intent);
-                            } else if ( extension instanceof PolicySet ) {
-                                PolicySet policySet = (PolicySet)extension;
-                                policySet.setName(new QName(targetNamespace, 
-                                                            policySet.getName().getLocalPart()));
-                                definitions.getPolicySets().add(policySet);
-                            } else if ( extension instanceof IntentAttachPointType ) {
-                                IntentAttachPointType type = (IntentAttachPointType)extension;
-                                if ( type.getName().getLocalPart().startsWith(BINDING)) {
-                                    definitions.getBindingTypes().add((IntentAttachPointType)extension);
-                                } else if ( type.getName().getLocalPart().startsWith(IMPLEMENTATION)) {
-                                    definitions.getImplementationTypes().add((IntentAttachPointType)extension);
-                                }
-                            } 
-                        }
-                        break;
-                    }
-                }
-
-                case XMLStreamConstants.CHARACTERS:
-                    break;
-
-                case END_ELEMENT:
-                    name = reader.getName();
-                    if ( SCA_DEFINITIONS_QNAME.equals(name)) {
-                        return definitions;
-                    }
-                    break;
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return definitions;
-    }
-    
-    public void write(SCADefinitions definitions, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        writeStartDocument(writer, SCA10_NS, SCA_DEFINITIONS, 
-                               new XAttr(TARGET_NAMESPACE, definitions.getTargetNamespace()));
-    
-        for (Intent policyIntent : definitions.getPolicyIntents()) {
-            extensionProcessor.write(policyIntent, writer);
-        }
-        
-        for (PolicySet policySet : definitions.getPolicySets()) {
-            extensionProcessor.write(policySet, writer);
-        }
-        
-        for (IntentAttachPointType bindingType : definitions.getBindingTypes()) {
-            extensionProcessor.write(bindingType, writer);
-        }
-        
-        for (IntentAttachPointType implType : definitions.getImplementationTypes()) {
-            extensionProcessor.write(implType, writer);
-        }
-
-        writeEndDocument(writer);
-    }
-    
-    public void resolve(SCADefinitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
-        // start by adding all of the top level artifacts into the resolver as there
-        // are many cross artifact references in a definitions file and we don't want
-        // to be dependent on the order things appear
-        
-        for (Intent policyIntent : scaDefns.getPolicyIntents()) {
-            resolver.addModel(policyIntent);
-        }
-        
-        for (PolicySet policySet : scaDefns.getPolicySets()) {
-            resolver.addModel(policySet);
-        }
-        
-        for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {
-            resolver.addModel(bindingType);
-        }
-        
-        for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {
-            resolver.addModel(implType);
-        }
-        
-        // now resolve everything to ensure that any references between
-        // artifacts are satisfied
-        
-        for (int count = 0, size = scaDefns.getPolicyIntents().size(); count < size; count++) {
-            Intent intent = scaDefns.getPolicyIntents().get(count);
-            extensionProcessor.resolve(intent, resolver);
-        }
-        
-        for (int count = 0, size = scaDefns.getPolicySets().size(); count < size; count++) {
-            PolicySet policySet = scaDefns.getPolicySets().get(count);
-            extensionProcessor.resolve(policySet, resolver);
-        }
-        
-        for (int count = 0, size = scaDefns.getBindingTypes().size(); count < size; count++) {
-            IntentAttachPointType bindingType = scaDefns.getBindingTypes().get(count);
-            extensionProcessor.resolve(bindingType, resolver);
-        }
-        
-        for (int count = 0, size = scaDefns.getImplementationTypes().size(); count < size; count++) {
-            IntentAttachPointType implType = scaDefns.getImplementationTypes().get(count);
-            extensionProcessor.resolve(implType, resolver);
-        }
-    }
-    
-    public QName getArtifactType() {
-        return SCA_DEFINITIONS_QNAME;
-    }
-    
-    public Class<SCADefinitions> getModelType() {
-        return SCADefinitions.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 38fe3c5225..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/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.definitions.xml.SCADefinitionsProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#definitions,model=org.apache.tuscany.sca.definitions.SCADefinitions
diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 4392461df1..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/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.definitions.xml.SCADefinitionsDocumentProcessor;type=definitions.xml,model=org.apache.tuscany.sca.definitions.SCADefinitions
diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
deleted file mode 100644
index 857887ec3f..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/main/resources/definitions-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 :
-PrivilegedActionException = Privileged Action Exception occured due to FilePermission in security policy file: 
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
deleted file mode 100644
index 187b7fa9f8..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/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.definitions;

-

-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/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
deleted file mode 100644
index ec4ead8b87..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.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.definitions;

-

-import java.net.URI;

-import java.net.URL;

-import java.util.Hashtable;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-import junit.framework.TestCase;

-

-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.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.ProfileIntent;

-import org.apache.tuscany.sca.policy.QualifiedIntent;

-

-/**

- * Test reading SCA XML assembly documents.

- * 

- * @version $Rev: 551296 $ $Date: 2007-06-28 01:18:35 +0530 (Thu, 28 Jun 2007) $

- */

-public class ReadDocumentTestCase extends TestCase {

-

-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor = null;

-    private SCADefinitions definitions;

-    Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();

-    Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();

-    Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();

-    Map<QName, IntentAttachPointType> implTypesTable = new Hashtable<QName, IntentAttachPointType>();

-    public static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";

-    public static final String namespace = "http://test";

-    

-    private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");

-    private static final QName confidentiality = new QName(namespace, "confidentiality");

-    private static final QName integrity = new QName(namespace, "integrity");

-    private static final QName messageProtection = new QName(namespace, "messageProtection");

-    private static final QName confidentiality_transport = new QName(namespace, "confidentiality.transport");   

-    private static final QName confidentiality_message = new QName(namespace, "confidentiality.message");

-    private static final QName secureReliablePolicy = new QName(namespace, "SecureReliablePolicy");

-    private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");

-    private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");

-    private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");

-    private static final QName wsBinding = new QName(scaNamespace, "binding.ws");

-    private static final QName javaImpl = new QName(scaNamespace, "implementation.java");

-    

-

-    @Override

-    public void setUp() throws Exception {

-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();

-        

-        // Create StAX processors

-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());

-        

-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);

-        policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class); 

-        

-        URL url = getClass().getResource("test_definitions.xml");

-        URI uri = URI.create("test_definitions.xml");

-        definitions = policyDefinitionsProcessor.read(null, uri, url);

-        

-        for ( Intent intent : definitions.getPolicyIntents() ) {

-            intentTable.put(intent.getName(), intent);

-        }

-        

-        for ( PolicySet policySet : definitions.getPolicySets() ) {

-            policySetTable.put(policySet.getName(), policySet);

-        }

-        

-        for ( IntentAttachPointType bindingType : definitions.getBindingTypes() ) {

-            bindingTypesTable.put(bindingType.getName(), bindingType);

-        }

-        

-        for ( IntentAttachPointType implType : definitions.getImplementationTypes() ) {

-            implTypesTable.put(implType.getName(), implType);

-        }

-    }

-

-    public void testReadSCADefinitions() throws Exception {

-        assertNotNull(definitions);

-        

-        assertNotNull(intentTable.get(confidentiality));

-        assertNotNull(intentTable.get(messageProtection));

-        assertNotNull(intentTable.get(confidentiality_transport));

-        assertTrue(intentTable.get(confidentiality).getDescription().length() > 0 );

-        

-        assertNotNull(policySetTable.get(secureReliablePolicy));

-        assertTrue(policySetTable.get(secureReliablePolicy).getProvidedIntents().size() == 2);

-        assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2);

-        

-        assertNotNull(policySetTable.get(secureMessagingPolicies));

-        assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);

-        //assertTrue(policySetTable.get(secureWsPolicy).getPolicies().get(0) instanceof org.apache.neethi.Policy);

-        

-        assertEquals(bindingTypesTable.size(), 1);

-        assertNotNull(bindingTypesTable.get(wsBinding));

-        assertEquals(implTypesTable.size(), 1);

-        assertNotNull(implTypesTable.get(javaImpl));

-    }

-    

-    public void testResolveSCADefinitions() throws Exception {

-        assertTrue(intentTable.get(messageProtection) instanceof ProfileIntent);

-        ProfileIntent profileIntent = (ProfileIntent)intentTable.get(new QName(namespace, "messageProtection"));

-        assertNull(profileIntent.getRequiredIntents().get(0).getDescription());

-        

-        QName confidentiality_transport = new QName(namespace, "confidentiality.transport"); 

-        assertTrue(intentTable.get(confidentiality_transport) instanceof QualifiedIntent);

-        QualifiedIntent qualifiedIntent = (QualifiedIntent)intentTable.get(new QName(namespace, "confidentiality.transport"));

-        assertNull(qualifiedIntent.getQualifiableIntent().getDescription());

-        

-        PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy);

-        PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies);

-        PolicySet securityPolicySet = policySetTable.get(securityPolicy);

-        

-        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);

-        assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());

-        assertTrue(secureMessagingPolicySet.isUnresolved());

-        assertEquals(securityPolicySet.getMappedPolicies().size(), 5);

-        

-        //testing to ensure that inclusion of referred policy sets has not happened

-        PolicySet basicAuthMsgProtSecurityPolicySet = policySetTable.get(basicAuthMsgProtSecurity);

-        assertTrue(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());

-        assertTrue(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());

-        

-        IntentAttachPointType wsBindingType = bindingTypesTable.get(wsBinding);

-        assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());

-        assertNull(wsBindingType.getMayProvideIntents().get(0).getDescription());

-        

-        IntentAttachPointType javaImplType = implTypesTable.get(javaImpl);

-        assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());

-        assertNull(javaImplType.getMayProvideIntents().get(0).getDescription());

-        

-        ModelResolver resolver = new DefaultModelResolver();

-        policyDefinitionsProcessor.resolve(definitions, resolver);

-        //builder.build(scaDefinitions);

-        

-        //testing if policy intents have been linked have property been linked up 

-        assertNotNull(profileIntent.getRequiredIntents().get(0).getDescription());

-        assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription());

-        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);

-        assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());

-        

-        //testing if policysets have been properly linked up with intents

-        assertFalse(secureMessagingPolicySet.isUnresolved());

-        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));

-        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));

-        

-        //testing if intent maps have been properly mapped to policies

-        assertFalse(securityPolicySet.isUnresolved());

-        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));

-        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_message)));

-        

-        //testing for inclusion of referred policysets

-        assertFalse(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());

-        assertFalse(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());

-        assertNotNull(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));

-        

-        assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());

-        assertNotNull(wsBindingType.getMayProvideIntents().get(0).getDescription());

-        

-        assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());

-        assertNotNull(javaImplType.getMayProvideIntents().get(0).getDescription());

-    }

-}

diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
deleted file mode 100644
index b4d7a8c584..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.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.definitions;

-

-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;

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

- * A PolicyProcessor used for testing.

- *

- * @version $Rev$ $Date$

- */

-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {

-

-    public QName getArtifactType() {

-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

-    }

-

-    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", "PolicyAttachment");

-        }

-

-        public boolean isUnresolved() {

-            return false;

-        }

-

-        public void setUnresolved(boolean unresolved) {

-        }

-        

-    }

-}

diff --git a/tags/java/sca/1.3/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/tags/java/sca/1.3/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
deleted file mode 100644
index e01a29863a..0000000000
--- a/tags/java/sca/1.3/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ /dev/null
@@ -1,254 +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="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="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"

-	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"

- bindings="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/tags/java/sca/1.3/modules/definitions/LICENSE b/tags/java/sca/1.3/modules/definitions/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/definitions/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/tags/java/sca/1.3/modules/definitions/NOTICE b/tags/java/sca/1.3/modules/definitions/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/definitions/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/tags/java/sca/1.3/modules/definitions/pom.xml b/tags/java/sca/1.3/modules/definitions/pom.xml
deleted file mode 100644
index 6984fe78c4..0000000000
--- a/tags/java/sca/1.3/modules/definitions/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.3</version>

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

-    </parent>

-    <artifactId>tuscany-definitions</artifactId>

-    <name>Apache Tuscany SCA Definitions</name>

-    

-    <dependencies>

-    	<dependency>

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

-            <artifactId>tuscany-extensibility</artifactId>

-            <version>1.3</version>

-        </dependency>

-    

-    	<dependency>

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

-            <artifactId>tuscany-policy</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>1.3</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.definitions</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.definitions*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
deleted file mode 100644
index 018b65de98..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.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.definitions;

-

-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;

-

-

-/**

- * Represents SCA Definitions.

- *

- * @version $Rev$ $Date$

- */

-public interface SCADefinitions {

-    /**

-     * Returns the target namespace for this SCA Definition

-     * @return the target namespace

-     */

-    String getTargetNamespace();

-    

-    /**

-     * Sets the target names for this SCA Definition.

-     * 

-     * @param ns the target namespace for this SCA Definition

-     */

-    void setTargetNamespace(String ns);

-

-    /**

-     * Returns a list of domain wide Policy Intents

-     * 

-     * @return a list of domain wide Policy Intents 

-     */

-    List<Intent> getPolicyIntents();

-    

-    /**

-     * Returns a list of domain wide PolicySets

-     * 

-     * @return a list of domain wide PolicySets 

-     */

-    List<PolicySet> getPolicySets();

-    

-    /**

-     * Returns a list of domain wide Binding Types

-     * 

-     * @return a list of domain wide Binding Types 

-     */

-    List<IntentAttachPointType> getBindingTypes();

-    

-    

-    /**

-     * Returns a list of domain wide Implementation Types

-     * 

-     * @return a list of domain wide Implementation Types 

-     */

-    List<IntentAttachPointType> getImplementationTypes();

-}

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
deleted file mode 100644
index a41d7a6717..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.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.definitions;

-

-

-/**

- * Interface to abstract building of SCA Definitions for a Domain

- *

- * @version $Rev$ $Date$

- */

-public interface SCADefinitionsBuilder {

-    /**

-     * Builds the SCA definitions 

-     * 

-     * @param scaDefns

-     */

-    void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException;

-}

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
deleted file mode 100644
index 85b9ad7f7d..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.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.definitions;

-

-/**

- * Builder Exception

- *

- * @version $Rev$ $Date$

- */

-public class SCADefinitionsBuilderException extends Exception {

-    private static final long serialVersionUID = 2513219325230252783L;

-

-    public SCADefinitionsBuilderException() {

-    }

-

-    public SCADefinitionsBuilderException(String message) {

-        super(message);

-    }

-

-    public SCADefinitionsBuilderException(Throwable cause) {

-        super(cause);

-    }

-

-    public SCADefinitionsBuilderException(String message, Throwable cause) {

-        super(message, cause);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
deleted file mode 100644
index 8b9ff3e1a9..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.definitions;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.Hashtable;

-import java.util.List;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-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.ProfileIntent;

-import org.apache.tuscany.sca.policy.QualifiedIntent;

-

-/**

- * Provides a concrete implementation for a SCADefinitionsBuilder

- *

- * @version $Rev$ $Date$

- */

-public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {

-

-    public void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException {

-        Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();

-        for (Intent intent : scaDefns.getPolicyIntents()) {

-            definedIntents.put(intent.getName(), intent);

-        }

-

-        Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            definedPolicySets.put(policySet.getName(), policySet);

-        }

-        

-        Map<QName, IntentAttachPointType> definedBindingTypes = new HashMap<QName, IntentAttachPointType>();

-        for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {

-            definedBindingTypes.put(bindingType.getName(), bindingType);

-        }

-        

-        Map<QName, IntentAttachPointType> definedImplTypes = new HashMap<QName, IntentAttachPointType>();

-        for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {

-            definedImplTypes.put(implType.getName(), implType);

-        }

-        

-        //filling up the maps removes all duplicate entries... so fill this unique lists

-        //into the scaDefns.

-        scaDefns.getPolicyIntents().clear();

-        scaDefns.getPolicySets().clear();

-        scaDefns.getBindingTypes().clear();

-        scaDefns.getImplementationTypes().clear();

-        

-        scaDefns.getPolicyIntents().addAll(definedIntents.values());

-        scaDefns.getPolicySets().addAll(definedPolicySets.values());

-        scaDefns.getBindingTypes().addAll(definedBindingTypes.values());

-        scaDefns.getImplementationTypes().addAll(definedImplTypes.values());

-        

-        buildPolicyIntents(scaDefns, definedIntents);

-        buildPolicySets(scaDefns, definedPolicySets, definedIntents);

-        buildBindingTypes(scaDefns, definedBindingTypes, definedIntents);

-        buildImplementationTypes(scaDefns, definedImplTypes, definedIntents);

-    }

-    

-    private void buildBindingTypes(SCADefinitions scaDefns, 

-                                   Map<QName, IntentAttachPointType> definedBindingTypes, 

-                                   Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

-        for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {

-            buildAlwaysProvidedIntents(bindingType, definedIntents);

-            buildMayProvideIntents(bindingType, definedIntents);

-        }

-

-    }

-    

-    private void buildImplementationTypes(SCADefinitions scaDefns, 

-                                   Map<QName, IntentAttachPointType> definedImplTypes, 

-                                   Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

-        for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {

-            buildAlwaysProvidedIntents(implType, definedIntents);

-            buildMayProvideIntents(implType, definedIntents);

-        }

-    }

-    

-

-    private void buildPolicyIntents(SCADefinitions scaDefns, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        for (Intent policyIntent : scaDefns.getPolicyIntents()) {

-            if (policyIntent instanceof ProfileIntent) {

-                buildProfileIntent((ProfileIntent)policyIntent, definedIntents);

-            }

-

-            if (policyIntent instanceof QualifiedIntent) {

-                buildQualifiedIntent((QualifiedIntent)policyIntent, definedIntents);

-            }

-        }

-    }

-

-    private void buildPolicySets(SCADefinitions scaDefns,

-                                 Map<QName, PolicySet> definedPolicySets,

-                                 Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

-

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            buildProvidedIntents(policySet, definedIntents);

-            buildIntentsInMappedPolicies(policySet, definedIntents);

-            buildReferredPolicySets(policySet, definedPolicySets);

-        }

-

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {

-                includeReferredPolicySets(policySet, referredPolicySet);

-            }

-        }

-    }

-    

-    private void buildProfileIntent(ProfileIntent policyIntent, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 

-        if (policyIntent != null) {

-            //resolve all required intents

-            List<Intent> requiredIntents = new ArrayList<Intent>();

-            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {

-                if (requiredIntent.isUnresolved()) {

-                    Intent resolvedRequiredIntent = definedIntents.get(requiredIntent.getName());

-                    if (resolvedRequiredIntent != null) {

-                        requiredIntents.add(resolvedRequiredIntent);

-                    } else {

-                        throw new SCADefinitionsBuilderException("Required Intent - " + requiredIntent

-                            + " not found for ProfileIntent "

-                            + policyIntent);

-

-                    }

-                } else {

-                    requiredIntents.add(requiredIntent);

-                }

-            }

-            policyIntent.getRequiredIntents().clear();

-            policyIntent.getRequiredIntents().addAll(requiredIntents);

-        }

-    }

-

-    private void buildQualifiedIntent(QualifiedIntent policyIntent, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        if (policyIntent != null) {

-            //resolve the qualifiable intent

-            Intent qualifiableIntent = policyIntent.getQualifiableIntent();

-            if (qualifiableIntent.isUnresolved()) {

-                Intent resolvedQualifiableIntent = definedIntents.get(qualifiableIntent.getName());

-

-                if (resolvedQualifiableIntent != null) {

-                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);

-                } else {

-                    throw new SCADefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent

-                        + " not found for QualifiedIntent "

-                        + policyIntent);

-                }

-

-            }

-        }

-    }

-    

-    

-    private void buildAlwaysProvidedIntents(IntentAttachPointType extensionType,

-                                            Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

-        if (extensionType != null) {

-            // resolve all provided intents

-            List<Intent> alwaysProvided = new ArrayList<Intent>();

-            for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        alwaysProvided.add(resolvedProvidedIntent);

-                    } else {

-                        throw new SCADefinitionsBuilderException(

-                                                                 "Always Provided Intent - " + providedIntent

-                                                                     + " not found for ExtensionType "

-                                                                     + extensionType);

-

-                    }

-                } else {

-                    alwaysProvided.add(providedIntent);

-                }

-            }

-            extensionType.getAlwaysProvidedIntents().clear();

-            extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided);

-        }

-    }

-    

-    private void buildMayProvideIntents(IntentAttachPointType extensionType,

-                                            Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

-        if (extensionType != null) {

-            // resolve all provided intents

-            List<Intent> mayProvide = new ArrayList<Intent>();

-            for (Intent providedIntent : extensionType.getMayProvideIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        mayProvide.add(resolvedProvidedIntent);

-                    } else {

-                        throw new SCADefinitionsBuilderException(

-                                                                 "May Provide Intent - " + providedIntent

-                                                                     + " not found for ExtensionType "

-                                                                     + extensionType);

-

-                    }

-                } else {

-                    mayProvide.add(providedIntent);

-                }

-            }

-            extensionType.getMayProvideIntents().clear();

-            extensionType.getMayProvideIntents().addAll(mayProvide);

-        }

-    }

-

-    private void buildProvidedIntents(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        if (policySet != null) {

-            //resolve all provided intents

-            List<Intent> providedIntents = new ArrayList<Intent>();

-            for (Intent providedIntent : policySet.getProvidedIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        providedIntents.add(resolvedProvidedIntent);

-                    } else {

-                        throw new SCADefinitionsBuilderException("Provided Intent - " + providedIntent

-                            + " not found for PolicySet "

-                            + policySet);

-

-                    }

-                } else {

-                    providedIntents.add(providedIntent);

-                }

-            }

-            policySet.getProvidedIntents().clear();

-            policySet.getProvidedIntents().addAll(providedIntents);

-        }

-    }

-

-    private void buildIntentsInMappedPolicies(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();

-        for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {

-            Intent mappedIntent = entry.getKey();

-            if (mappedIntent.isUnresolved()) {

-                Intent resolvedMappedIntent = definedIntents.get(mappedIntent.getName());

-

-                if (resolvedMappedIntent != null) {

-                    mappedPolicies.put(resolvedMappedIntent, entry.getValue());

-                } else {

-                    throw new SCADefinitionsBuilderException("Mapped Intent - " + mappedIntent

-                        + " not found for PolicySet "

-                        + policySet);

-

-                }

-            } else {

-                mappedPolicies.put(mappedIntent, entry.getValue());

-            }

-        }

-

-        policySet.getMappedPolicies().clear();

-        policySet.getMappedPolicies().putAll(mappedPolicies);

-    }

-

-    private void buildReferredPolicySets(PolicySet policySet, Map<QName, PolicySet> definedPolicySets)

-        throws SCADefinitionsBuilderException {

-

-        List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();

-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {

-            if (referredPolicySet.isUnresolved()) {

-                PolicySet resolvedReferredPolicySet = definedPolicySets.get(referredPolicySet.getName());

-                if (resolvedReferredPolicySet != null) {

-                    referredPolicySets.add(resolvedReferredPolicySet);

-                } else {

-                    throw new SCADefinitionsBuilderException("Referred PolicySet - " + referredPolicySet

-                        + "not found for PolicySet - "

-                        + policySet);

-                }

-            } else {

-                referredPolicySets.add(referredPolicySet);

-            }

-        }

-        policySet.getReferencedPolicySets().clear();

-        policySet.getReferencedPolicySets().addAll(referredPolicySets);

-    }

-

-    private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) {

-        for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) {

-            includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet);

-        }

-        policySet.getPolicies().addAll(referredPolicySet.getPolicies());

-        policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies());

-    }

-}

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
deleted file mode 100644
index baaf9d7a28..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.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.definitions.impl;

-

-import java.util.List;

-import java.util.concurrent.CopyOnWriteArrayList;

-

-import org.apache.tuscany.sca.definitions.SCADefinitions;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Provides a concrete implementation for SCADefinitions

- *

- * @version $Rev$ $Date$

- */

-public class SCADefinitionsImpl implements SCADefinitions {

-    private String targetNamespace = null;

-    private List<Intent> policyIntents = new CopyOnWriteArrayList<Intent>();

-    private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>();

-    private List<IntentAttachPointType> bindingTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

-    private List<IntentAttachPointType> implementationTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

-

-   

-    public List<IntentAttachPointType> getBindingTypes() {

-        return bindingTypes;

-    }

-

-    public List<IntentAttachPointType> getImplementationTypes() {

-        return implementationTypes;

-    }

-

-    public List<Intent> getPolicyIntents() {

-        return policyIntents;

-    }

-

-    public List<PolicySet> getPolicySets() {

-        return policySets;

-    }

-

-    public String getTargetNamespace() {

-        return targetNamespace;

-    }

-

-    public void setTargetNamespace(String ns) {

-       this.targetNamespace = ns;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
deleted file mode 100644
index 3ba3255ee7..0000000000
--- a/tags/java/sca/1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.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.definitions.util;

-

-import java.net.URI;

-import java.util.HashMap;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.definitions.SCADefinitions;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Some utility functions to deal with SCADefinitions

- *

- * @version $Rev$ $Date$

- */

-public class SCADefinitionsUtil {

-    

-    public static  void stripDuplicates(SCADefinitions scaDefns) {

-        Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();

-        for (Intent intent : scaDefns.getPolicyIntents()) {

-            definedIntents.put(intent.getName(), intent);

-        }

-

-        Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            definedPolicySets.put(policySet.getName(), policySet);

-        }

-        

-        Map<QName, IntentAttachPointType> definedBindingTypes = new HashMap<QName, IntentAttachPointType>();

-        for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {

-            definedBindingTypes.put(bindingType.getName(), bindingType);

-        }

-        

-        Map<QName, IntentAttachPointType> definedImplTypes = new HashMap<QName, IntentAttachPointType>();

-        for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {

-            definedImplTypes.put(implType.getName(), implType);

-        }

-        

-        scaDefns.getPolicyIntents().clear();

-        scaDefns.getPolicyIntents().addAll(definedIntents.values());

-        scaDefns.getPolicySets().clear();

-        scaDefns.getPolicySets().addAll(definedPolicySets.values());

-        scaDefns.getBindingTypes().clear();

-        scaDefns.getBindingTypes().addAll(definedBindingTypes.values());

-        scaDefns.getImplementationTypes().clear();

-        scaDefns.getImplementationTypes().addAll(definedImplTypes.values());

-    }

-    

-    public static void aggregateSCADefinitions(SCADefinitions source, SCADefinitions target) {

-        target.getPolicyIntents().addAll(source.getPolicyIntents());

-        target.getPolicySets().addAll(source.getPolicySets());

-        target.getBindingTypes().addAll(source.getBindingTypes());

-        target.getImplementationTypes().addAll(source.getImplementationTypes());

-    }

-    

-    public static boolean isSCADefnsFile(URI uri) {

-        int index = uri.toString().lastIndexOf("/");

-

-        index = (index != -1) ? index + 1 : 0;

-

-        return uri.toString().substring(index).equals("definitions.xml");

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/domain-manager/LICENSE b/tags/java/sca/1.3/modules/domain-manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/domain-manager/NOTICE b/tags/java/sca/1.3/modules/domain-manager/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/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/tags/java/sca/1.3/modules/domain-manager/pom.xml b/tags/java/sca/1.3/modules/domain-manager/pom.xml
deleted file mode 100644
index d6564e2a60..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</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>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</version>
-            <scope>runtime</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.domain.manager</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.domain.manager*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
deleted file mode 100644
index 0e25068f5f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
deleted file mode 100644
index 66780da53e..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl;
-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.ModelFactoryExtensionPoint;
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.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.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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 ModelFactoryExtensionPoint modelFactories;
-    private ModelResolverExtensionPoint modelResolvers;
-    private AssemblyFactory assemblyFactory;
-    private WorkspaceFactory workspaceFactory;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private StAXArtifactProcessor<Composite> compositeProcessor;
-    private XMLOutputFactory outputFactory;
-    private ContributionDependencyBuilder 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(ModelFactoryExtensionPoint.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
-        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);
-        
-        // Create contribution and composite builders
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, contractMapper, monitor);
-        compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor);
-        nodeConfigurationBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, contractMapper, null, monitor);
-    }
-    
-    @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);
-        
-        // Expect a key in the form
-        // composite:contributionURI;namespace;localName
-        // and return the corresponding resolved composite
-        
-        // Extract the composite qname from the key
-        QName qname = compositeQName(key);
-        
-        // Somewhere to store the composite we expect to write out at the end
-        Composite compositeConfiguration = 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);
-            } catch (CompositeBuilderException e) {
-                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            }
-            
-            // store away the composite we are generating the deployable XML for. 
-            if (qname.equals(deployable.getName())){
-                compositeConfiguration = deployable;
-            }
-        }
-        
-        // Composite not found
-        if (compositeConfiguration == 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);
-                } catch (CompositeBuilderException e) {
-                    throw new ServletException(e);
-                }
-            }
-        }
-        
-        // Build the domain composite
-        try {
-            compositeBuilder.build(domainComposite);
-        } catch (CompositeBuilderException e) {
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
-            return;
-        }        
-        
-        // 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(compositeConfiguration.getComponents());
-        compositeConfiguration.getComponents().clear();
-        for (Component inputComponent : tempComponentList){
-            for (Component deployComponent : domainComposite.getComponents()){
-                if (deployComponent.getName().equals(inputComponent.getName())){
-                    compositeConfiguration.getComponents().add(deployComponent);
-                }
-            }
-        }
-        
-        // Write the deployable composite
-        try {
-            response.setContentType("text/xml");
-            XMLStreamWriter writer = outputFactory.createXMLStreamWriter(response.getOutputStream());
-            compositeProcessor.write(compositeConfiguration, 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
-            contributionDependencyBuilder.buildContributionDependencies(contribution, workspace);
-            
-            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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
deleted file mode 100644
index 9e024d2d6b..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.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.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.ModelFactoryExtensionPoint;
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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 ModelFactoryExtensionPoint 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(ModelFactoryExtensionPoint.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);
-    }
-    
-    @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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
deleted file mode 100644
index 0b304a0854..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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.service.ContributionReadException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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;
-    
-    /**
-     * 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
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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();
-    }
-    
-    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));
-        }
-        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);
-            }
-        }
-        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
-                    ContributionDependencyBuilder analyzer = new ContributionDependencyBuilderImpl(monitor);
-                    List<Contribution> dependencies = analyzer.buildContributionDependencies(contribution, workspace);
-                    
-                    // 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));
-                    }
-                    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));
-                }
-            }
-            
-            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) {
-        Entry<String, Item> entry = new Entry<String, Item>();
-        entry.setKey(contribution.getURI());
-        entry.setData(item(workspace, contribution));
-        return entry;
-    }
-    
-    /**
-     * Returns an item representing a contribution.
-     * 
-     * @param contribution
-     * @return
-     */
-    private static Item item(Workspace workspace, Contribution contribution) {
-        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 monitor = new Monitor() {
-            public void problem(Problem problem) {
-                problems.add(problem.getMessageId() + " " + problem.getProblemObject().toString());
-            }
-            
-            public List<Problem> getProblems() {
-                return null;
-            }
-        };
-        
-        StringBuffer sb = new StringBuffer();
-        ContributionDependencyBuilderImpl analyzer = new ContributionDependencyBuilderImpl(monitor);
-        List<Contribution> dependencies = analyzer.buildContributionDependencies(contribution, workspace);
-        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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
deleted file mode 100644
index a4d7680cb0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
deleted file mode 100644
index e66a8b6684..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.ModelFactoryExtensionPoint;
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.ContributionDependencyBuilder;
-import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl;
-import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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 ModelFactoryExtensionPoint modelFactories;
-    private ModelResolverExtensionPoint modelResolvers;
-    private URLArtifactProcessor<Contribution> contributionProcessor;
-    private XMLOutputFactory outputFactory;
-    private ContributionDependencyBuilder 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(ModelFactoryExtensionPoint.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);
-        
-        // Create contribution and composite builders
-        contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor);
-    }
-    
-    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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
deleted file mode 100644
index 14ab9579f4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
deleted file mode 100644
index fd0b51fb4c..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-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 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.ModelFactoryExtensionPoint;
-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.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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-import org.w3c.dom.Document;
-
-/**
- * Implementation of a composite collection service. 
- *
- * @version $Rev$ $Date$
- */
-@Scope("COMPOSITE")
-@Service(interfaces={ItemCollection.class,LocalItemCollection.class, Servlet.class})
-public class DeployedCompositeCollectionImpl extends HttpServlet implements ItemCollection, LocalItemCollection {
-    private static final long serialVersionUID = -3477992129462720901L;
-
-    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 ModelFactoryExtensionPoint 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(ModelFactoryExtensionPoint.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);
-    }
-    
-    @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;
-        }
-
-        // Read the composite file and write to response
-        String uri = item.getAlternate();
-        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();
-    }
-
-    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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
deleted file mode 100644
index 1831728f07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
deleted file mode 100644
index a5ce6e12d6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
deleted file mode 100644
index bd330322e5..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.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.domain.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-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.osoa.sca.ServiceReference;
-import org.osoa.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 {
-        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();
-        }
-    }
-
-    /**
-     * 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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
deleted file mode 100644
index a53250515a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
deleted file mode 100644
index 2adb623876..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
deleted file mode 100644
index 06d28b0502..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
deleted file mode 100644
index d68cfa3786..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
deleted file mode 100644
index 23c506446f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
deleted file mode 100644
index 379f8b81cb..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.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.domain.manager.launcher;
-
-import org.apache.tuscany.sca.domain.manager.impl.DomainManagerConfiguration;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.node.SCANode2;
-
-/**
- * Bootstrap class for the SCA domain manager.
- *  
- * @version $Rev$ $Date$
- */
-public class DomainManagerLauncherBootstrap {
-    private SCANode2 node;
-
-    /**
-     * A node wrappering an instance of a domain manager.
-     */
-    public static class NodeFacade implements SCANode2 {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private SCADomain domainManager;
-        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);
-                domainManager = SCADomain.newInstance("DomainManager.composite");
-
-                // Set the domain manager's root directory
-                DomainManagerConfiguration domainManagerConfiguration = domainManager.getService(DomainManagerConfiguration.class, "DomainManagerConfigurationComponent");
-                domainManagerConfiguration.setRootDirectory(rootDirectory);
-                
-                started = true;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-        
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                domainManager.close();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-    }
-    
-    /**
-     * 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 SCANode2 getNode() {
-        return node;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/DomainManager.composite b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/DomainManager.composite
deleted file mode 100644
index fe1fdc2d80..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/DomainManager.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"
-	xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    name="DomainManager">
-
-    <component name="HomeUI">
-        <t:implementation.widget location="home.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/home"/>
-        </service>
-    </component>
-    
-    <component name="ContributionUI">
-        <t:implementation.widget location="workspace.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/workspace"/>
-        </service>
-		 <reference name="workspace" target="ContributionCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-    
-    <component name="FilesUI">
-        <t:implementation.widget location="files.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/files"/>
-        </service>
-		 <reference name="files" target="FileCollectionComponent">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-    
-    <component name="DomainCompositeUI">
-        <t:implementation.widget location="composite.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/composite"/>
-        </service>
-		 <reference name="domainComposite" target="DomainCompositeCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-		 <reference name="workspace" target="ContributionCollectionComponent/ItemCollection">
-		 	<t:binding.atom/>
-		 </reference>
-    </component>
-
-    <component name="CloudUI">
-        <t:implementation.widget location="cloud.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="http://localhost:9990/ui/cloud"/>
-        </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.launcher.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.launcher.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/tags/java/sca/1.3/modules/domain-manager/src/main/resources/cloud.html b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/cloud.html
deleted file mode 100644
index 2564322ec9..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/cloud.html
+++ /dev/null
@@ -1,362 +0,0 @@
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT 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.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var cloudComposite = new Reference("cloudComposite");
-	
-	//@Reference
-	var domainComposite = new Reference("domainComposite");
-	
-	//@Reference
-	var processCollection = new Reference("processCollection");
-	
-	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);
-	}
-	
-	var nodeNames;
-	
-	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><th>Status</th><th>Composite</th>' +
-			'<th>Contribution</th><th>Node Config</th></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>';
-					composites += '<td><span id="status_' + nodeName + '">unknown</span></td>';
-					composites += '<td>' + content + '</td>';
-					composites += '<td>' + uri + '</td>';
-				} else {
-					composites += '<td><input name="composites" type="checkbox" value="' + nodeId + '">' +
-											'<a href=\"' + nodeLink + '\">' + nodeName + '</a></td>';
-					composites += '<td><span id="status_' + nodeName + '">unknown</span></td>';
-					composites += '<td><a href=\"' + compositeLink + '\">' + qname + '</a></td>';
-					composites += '<td><a href="/contribution/' + uri + '">' + uri + '</a></td>';
-				}
-				composites += '<td><a href="/node-config/' + nodeName + '"><img src="icons/feed-icon.png" border="0"></a></td>';
-				composites += '</tr>';
-			}
-			composites += '</table>';
-			document.getElementById("composites").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';
-			}
-
-			for (var i = 0; i < nodeNames.length; i++) {
-				var element = document.getElementById('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(document.cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = composites[i].value;
-				cloudComposite.del(id, deleteNodeResponse);
-			}
-		}
-	}
-
-	function deleteNodeResponse() {
-	    getNodes();
-	}	
-
-	function addNode() {
-		var nodeName = document.newNodeForm.nodeName.value;
-		var nodeURI = document.newNodeForm.nodeURI.value;			
-		var compositeNamespace = document.newNodeForm.compositeNamespace.value;
-		var compositeName = document.newNodeForm.compositeName.value;
-		var contributionURI = document.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() {
-		document.newNodeForm.nodeName.value = "";
-		document.newNodeForm.nodeURI.value = "";
-		document.newNodeForm.compositeNamespace.value = "";
-		document.newNodeForm.compositeName.value = "";
-		document.newNodeForm.contributionURI.value = "";
-	    getNodes();
-	}	
-
-	function startNode() {
-		var composites  = array(document.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);
-			}
-		}
-	}
-
-	function startNodeResponse() {
-		processCollection.get("", getProcessesResponse);
-		
-		var composites  = array(document.cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			  composites[i].checked = false;
-			}
-		}
-	}	
-
-	function stopNode() {
-		var composites  = array(document.cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = nodeNames[i];
-				processCollection.del(id, stopNodeResponse);
-			}
-		}
-	}
-
-	function stopNodeResponse() {
-		processCollection.get("", getProcessesResponse);
-		
-		var composites  = array(document.cloudCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			  composites[i].checked = false;
-			}
-		}
-	}	
-
-	var deployedComposites = new Array();
-	
-	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 = document.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 = document.newNodeForm.compositeNamespace.value;
-		var inputname = document.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 init() {
-		toolbar();
-		getNodes();
-		getComposites();
-		suggest(document.newNodeForm.compositeNamespace, suggestCompositeNamespaces);
-		suggest(document.newNodeForm.compositeName, suggestCompositeNames);
-		suggest(document.newNodeForm.contributionURI, suggestContributionURIs);
-	}
-
-</script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body onload="init()">
-  <div id="toolbar"></div>
-
-  <div id="cloudComposite">
-  <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><br>
-  Here is the list of SCA nodes configured in your SCA domain cloud.
-  <br><br>
-
-  <form name="cloudCompositeForm">
-    <div id="composites" ></div>
-    <br>
-    <input type="button" onClick="startNode()"  value="Start" />
-    <input type="button" onClick="stopNode()"  value="Stop" />
-    &nbsp;&nbsp;
-    <input type="button" onClick="deleteNode()"  value="Delete" />
-  </form>
-
-  <br><br>
-  
-  <form name="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 type="button" onClick="addNode()" value="Add" />
-  </form>
-  
-  </div>
-</body>
-
-</html>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/composite.html b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/composite.html
deleted file mode 100644
index 9a873d42d2..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/composite.html
+++ /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.    
--->
-<html>
-<head>
-<title>SCA Domain - Domain Composite</title>
-
-<script type="text/javascript" src="composite.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var domainComposite = new Reference("domainComposite");
-	
-	//@Reference
-	var workspace = new Reference("workspace");
-	
-	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>' +
-			'<th>Contribution</th>' +
-			'<th>Components</th>' +
-			'</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>';
-				composites += '<td><a href="/contribution/' + uri + '">' + uri + '</a></td>';
-				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>';
-			document.getElementById("composites").innerHTML = composites;
-		}
-	}
-
-	function deleteComposite() {
-		var composites  = array(document.domainCompositeForm.composites);
-		for (var i = 0; i < composites.length; i++) {
-			if (composites[i].checked) {
-			    var id = composites[i].value;
-				domainComposite.del(id, deleteCompositeResponse);
-			}
-		}
-	}
-
-	function deleteCompositeResponse() {
-	    getComposites();
-	}	
-
-	function addComposite() {
-		var id  = 'composite:' +
-			document.newCompositeForm.contributionURI.value + ';' +
-			document.newCompositeForm.compositeNamespace.value + ';' +
-			document.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() {
-		document.newCompositeForm.compositeNamespace.value = "";
-		document.newCompositeForm.compositeName.value = "";
-		document.newCompositeForm.contributionURI.value = "";
-	    getComposites();
-	}
-	
-	var contributedComposites = new Array();
-	
-	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 = document.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 = document.newCompositeForm.compositeNamespace.value;
-		var inputname = document.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 init() {
-		toolbar();
-		getComposites();
-		getContributions();
-		suggest(document.newCompositeForm.compositeNamespace, suggestCompositeNamespaces);
-		suggest(document.newCompositeForm.compositeName, suggestCompositeNames);
-		suggest(document.newCompositeForm.contributionURI, suggestContributionURIs);
-	}
-		
-</script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body onload="init()">
-  <div id="toolbar"></div>
-
-  <div id="domainComposite">
-  <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><br>
-  Here is the list of SCA composites currently included as top-level composites in your SCA domain.
-  <br><br>
-  
-  <form name="domainCompositeForm">
-    <div id="composites" ></div>
-    <br>
-    <input type="button" onClick="deleteComposite()"  value="Delete" />
-  </form>
-  
-  <br><br>
-  
-  <form name="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 type="button" onClick="addComposite()" value="Add" />
-  </form>
-  
-  </div>
-</body>
-</html>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/files.html b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/files.html
deleted file mode 100644
index 1a7460df11..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/files.html
+++ /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.    
--->
-<html>
-<head>
-<title>SCA Domain - Contribution File Server</title>
-
-<script type="text/javascript" src="files.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var files = new Reference("files");
-	
-	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>";
-			document.getElementById("files").innerHTML = list;
-		}
-	}				
-
-	function deleteFile() {
-		var list = array(document.filesForm.files);
-		for (var i=0; i < list.length; i++) {
-			if (list[i].checked) {
-			    var id = list[i].value;
-				files.del(id, deleteFileResponse);
-			}
-		}
-	}
-
-	function deleteFileResponse() {
-	    getFiles();
-	}
-
-	function uploadFile() {
-		document.uploadFileForm.submit();
-	}
-
-	function init() {
-		toolbar();	
-		getFiles();
-	}
-
-</script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body onload="init()">
-  <div id="toolbar"></div>
-
-  <div id="fileServer">
-  <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><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>
-  
-  <form name="filesForm">
-    <div id="files" ></div>
-    <br/>
-    <input type="button" onClick="deleteFile()"  value="Delete" />
-  </form>
-
-  <br><br>
-  
-  <form method="post" name="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 type="button" onClick="uploadFile()" value="Upload" />
-  </form>    
-      
-  </div>
-</body>
-</html>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/home.html b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/home.html
deleted file mode 100644
index 88f190336d..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/home.html
+++ /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.    
--->
-<html>
-<head>
-<title>SCA Domain - Home</title>
-
-<script type="text/javascript" src="home.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<script language="JavaScript">
-
-	function init() {
-		toolbar();
-	}
-
-
-</script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body onload="init()">
-  <div id="toolbar"></div>
-  
-  <br>
-  <span class=hd1>
-  SCA Domain
-  </span>
-  
-  <br><br><br><br><br>
-  
-  <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>
-
-  <br><br><br><br><br><br><br>
-  <center>This page is under construction, searching the domain is not implemented yet.</center>
-  
-</body>
-</html>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/icons/feed-icon.png b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/icons/feed-icon.png
deleted file mode 100644
index a59728b2ad..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/icons/feed-icon.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/manager.css b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/manager.css
deleted file mode 100644
index 5f4166876d..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/manager.css
+++ /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.
- */
-
-body {
-	white-space: nowrap
-}
-
-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
-}
-
-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/tags/java/sca/1.3/modules/domain-manager/src/main/resources/utils.js b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/utils.js
deleted file mode 100644
index 32fbdb47ad..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/utils.js
+++ /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.    
- */
- 
-/**
- * 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)" ' +
-    		'onclick="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 + '">' + this.name + '</a>';
-	} else {
-		return '<span>' + this.name + '</span>';
-	}
-}
-
-/**
- * Initialize the toolbar
- */
-function toolbar() {
-	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>';
-
-	document.getElementById('toolbar').innerHTML = toolbar;
-}
-
-/**
- * Utility function returning 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;
-  	}
-}
-
-/**
- * Populate the default toolbar
- */
-var tools = new Array();
-tools[0] = new Tool("Contributions", "/ui/workspace");
-tools[1] = new Tool("Composites", "/ui/composite");
-tools[2] = new Tool("Cloud", "/ui/cloud");
-tools[3] = new Tool("Files", "/ui/files");
-
-var home = new Tool("Home", "/ui/home");
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/workspace.html b/tags/java/sca/1.3/modules/domain-manager/src/main/resources/workspace.html
deleted file mode 100644
index db3b4ac560..0000000000
--- a/tags/java/sca/1.3/modules/domain-manager/src/main/resources/workspace.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT 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.js"></script>
-<script type="text/javascript" src="utils.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var workspace = new Reference("workspace");
-	
-	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><th>Dependencies</td><th>Deployable Composites</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");
-				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);
-				}
-											
-				contributions += '<td class=tdw>' + dependencies + problems + ' </td>';
-				contributions += '<td class=tdw>' + deployables + '</td>';
-				contributions += '</tr>';
-			}
-			contributions += '</table>';
-			document.getElementById("contributions").innerHTML = contributions;
-		}
-	}				
-
-	var suggestedContributions = new Array();
-	
-	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(document.workspaceForm.contributions);
-		for (var i=0; i < contributions.length; i++) {
-			if (contributions[i].checked) {
-			    var id = contributions[i].value;
-				workspace.del(id, deleteContributionResponse);
-			}
-		}
-	}
-
-	function deleteContributionResponse() {
-	    getContributions();
-	}	
-
-	function addContribution() {
-		var id  = document.newContributionForm.contributionID.value;
-		var location  = document.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() {
-		document.newContributionForm.contributionID.value = "";
-		document.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 == document.newContributionForm.contributionID.value) {
-				var location = uri.substring(uri.indexOf(':') +1);
-				locations[location] = location;
-			}
-		}
-		return array(locations);
-	}
-
-	function init() {
-		toolbar();
-		getContributions();
-		getSuggestedContributions();
-		suggest(document.newContributionForm.contributionID, suggestContributionIDs);
-		suggest(document.newContributionForm.contributionLocation, suggestContributionLocations);
-	}
-	
-</script>
-
-<link rel="stylesheet" type="text/css" href="manager.css">
-</head>
-
-<body onload="init()">
-  <div id="toolbar"></div>
-
-  <div id="workspace">
-  <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><br>
-  Here is the list of SCA contributions currently available in your SCA domain.
-  <br><br>
-
-  <form name="workspaceForm">
-    <div id="contributions" ></div>
-    <br>
-    <input type="button" onClick="deleteContribution()"  value="Delete" />
-  </form>
-
-  <br><br>
-  
-  <form name="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 type="button" onClick="addContribution()" value="Add" />
-  </form>
-  
-  </div>
-</body>
-</html>
diff --git a/tags/java/sca/1.3/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/tags/java/sca/1.3/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
deleted file mode 100644
index 5e76556a14..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index 4eab6dd5e7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 48d4be2d6e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/domain-manager/src/test/resources/workspace.xml b/tags/java/sca/1.3/modules/domain-manager/src/test/resources/workspace.xml
deleted file mode 100644
index e6ac7d7701..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/endpoint/LICENSE b/tags/java/sca/1.3/modules/endpoint/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/NOTICE b/tags/java/sca/1.3/modules/endpoint/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/pom.xml b/tags/java/sca/1.3/modules/endpoint/pom.xml
deleted file mode 100644
index 9d2a58f7bc..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-endpoint</artifactId>
-    <name>Apache Tuscany SCA Default Endpoint Implementation</name>
-
-    <dependencies>
-      
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</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.endpoint</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.endpoint*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java b/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
deleted file mode 100644
index f0646e934e..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.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.endpoint.impl;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-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 EndpointResolverFactoryImpl implements EndpointResolverFactory<Endpoint> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public EndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;     
-    } 
-    
-    public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-              
-        return  new EndpointResolverImpl(extensionPoints, endpoint);
-    }
-
-    public Class<Endpoint> getModelType() {
-        return Endpoint.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java b/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
deleted file mode 100644
index 5a36b714c1..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.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.endpoint.impl;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint;
-
-
-/** 
- * 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 EndpointResolverImpl implements EndpointResolver {
-
-    private final static Logger logger = Logger.getLogger(EndpointResolverImpl.class.getName());
-
-    private Endpoint endpoint;
-    private List<EndpointResolver> endpointResolvers = new ArrayList<EndpointResolver>();    
-
-    public EndpointResolverImpl(ExtensionPointRegistry extensionPoints,
-                                Endpoint endpoint) {
-        this.endpoint = endpoint;
-        
-        EndpointResolverFactoryExtensionPoint resolverFactories = 
-            extensionPoints.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class);
-        
-        for (Binding binding : endpoint.getCandidateBindings()){
-            EndpointResolverFactory resolverFactory = resolverFactories.getEndpointResolverFactory(binding.getClass());
-            
-            // if the binding in question has a endpoint resolver factory they try and 
-            // create an endpoint resolver
-            if (resolverFactory != null){
-                EndpointResolver resolver = resolverFactory.createEndpointResolver(endpoint, binding);
-                
-                if (resolver != null){
-                    endpointResolvers.add(resolver);
-                }
-            }
-        }
-    }
-    
-    public void start(){
-        // do nothing
-    }
-    
-    public void stop(){
-        // do nothing
-    }    
-
-    public void resolve() {
-        if (endpoint.isUnresolved()){
-            // Resolve the endpoint binding here
-            
-            // first do any general resolution that's required
-            
-            // ask the bindings to resolve the endpoint one by one
-            for (EndpointResolver resolver : endpointResolvers){
-                resolver.resolve();
-                if (endpoint.isUnresolved() != true){
-                    break;
-                }
-            }
-            
-            if (endpoint.isUnresolved() != true){
-                // If we have to build the endpoint because we are matching
-                // intents and policies then we do that now. If the binding
-                // is just configured by setting its uri we can just do local binding
-                // configuration here
-                
-                // EndpointBuilderImpl.build(endpoint);
-            } else {
-                // raise an exception saying the endpoint can't be resolved
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.3/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index 50e0a930d2..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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

-org.apache.tuscany.sca.endpoint.impl.EndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.Endpoint

diff --git a/tags/java/sca/1.3/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/tags/java/sca/1.3/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
deleted file mode 100644
index 8bac9e01c9..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ /dev/null
@@ -1,26 +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:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
- </sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/AddService.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3d861f2018..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/DivideService.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/MultiplyService.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/SubtractService.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/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/tags/java/sca/1.3/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/tags/java/sca/1.3/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
deleted file mode 100644
index 5a2d9babf4..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apace.tuscany.sca.binding.sca;
-
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Endpoint;
-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.ModelResolver;
-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.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.endpoint.impl.EndpointResolverFactoryImpl;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-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.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * EndpointTestCase
- *
- * @version $Rev$ $Date$
- */
-public class EndpointTestCase {
-	
-    private static URLArtifactProcessor<Contribution> contributionProcessor;
-    private static ModelResolverExtensionPoint modelResolvers;
-    private static ModelFactoryExtensionPoint modelFactories;
-    private static AssemblyFactory assemblyFactory;
-    private static XMLOutputFactory outputFactory;
-    private static StAXArtifactProcessor<Object> xmlProcessor; 
-    private static CompositeBuilder compositeBuilder;
-    private static ModelResolver modelResolver;
-    private static CompositeActivator compositeActivator;
-    private static ExtensionPointRegistry extensionPoints;
-
-    @BeforeClass
-    public static void init() {
-        
-        // Create extension point registry 
-        extensionPoints = new DefaultExtensionPointRegistry();
-        
-        // Create a monitor
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        Monitor monitor = monitorFactory.createMonitor();        
-        
-        modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-                
-        // Initialize the Tuscany module activators
-        ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-        for (ModuleActivator activator: moduleActivators.getModuleActivators()) {
-            activator.start(extensionPoints);
-        }
-
-        // Get XML input/output factories
-
-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-        outputFactory = modelFactories.getFactory(XMLOutputFactory.class);
-        
-        // Get contribution workspace and assembly model factories
-        assemblyFactory = new RuntimeAssemblyFactory();
-        modelFactories.addFactory(assemblyFactory);
-        
-        // 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);
-        modelResolver = new ExtensibleModelResolver(null, modelResolvers, modelFactories);
-               
-        // Create a composite builder
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor);
-        
-        // Runtime Init ===================
-/*        
-        ContextFactoryExtensionPoint contextFactories = new DefaultContextFactoryExtensionPoint(extensionPoints);
-        extensionPoints.addExtensionPoint(contextFactories);
-        
-        // Create a wire post processor extension point
-        RuntimeWireProcessorExtensionPoint wireProcessors =
-            extensionPoints.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-        RuntimeWireProcessor wireProcessor = new ExtensibleWireProcessor(wireProcessors);
-
-        JavaInterfaceFactory javaInterfaceFactory =
-            extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class).getFactory(JavaInterfaceFactory.class);
-        RequestContextFactory requestContextFactory =
-            extensionPoints.getExtensionPoint(ContextFactoryExtensionPoint.class).getFactory(RequestContextFactory.class);
-
-        ConversationManager conversationManager = new ConversationManagerImpl();
-        extensionPoints.addExtensionPoint(conversationManager); 
-        
-        
-        ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
-        ScopeContainerFactory[] factories =
-            new ScopeContainerFactory[] {new CompositeScopeContainerFactory(), new StatelessScopeContainerFactory(),
-                                         new RequestScopeContainerFactory(),
-                                         new ConversationalScopeContainerFactory(null),
-            // new HttpSessionScopeContainer(monitor)
-            };
-        for (ScopeContainerFactory f : factories) {
-            scopeRegistry.register(f);
-        }        
-        
-        compositeActivator =new CompositeActivatorImpl(assemblyFactory, 
-                                                       messageFactory, 
-                                                       javaInterfaceFactory, 
-                                                       scaBindingFactory,
-                                                       mapper, 
-                                                       scopeRegistry, 
-                                                       extensionPoints.getExtensionPoint(WorkScheduler.class), 
-                                                       wireProcessor, 
-                                                       requestContextFactory,
-                                                       new DefaultProxyFactoryExtensionPoint(messageFactory, mapper), 
-                                                       extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class), 
-                                                       extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class), 
-                                                       conversationManager);
-                                                       
-*/                                                       
-
-        
-    }
-    
-    @Test
-    public void testProvider(){
-        try {
-            URI calculatorURI = URI.create("calcualtor");
-            URL calculatorURL = new File("./target/test-classes").toURI().toURL();
-            Contribution contribution = contributionProcessor.read(null, calculatorURI, calculatorURL);
-           
-            contributionProcessor.resolve(contribution, modelResolver);
-            
-            Composite composite = contribution.getDeployables().get(0);
-            
-            compositeBuilder.build(composite);
-            
-            ComponentReference ref = (composite.getComponents().get(0).getReferences().get(0));
-            
-            Assert.assertEquals(1, ref.getEndpoints().size());
-            
-            Endpoint endpoint = ref.getEndpoints().get(0);
-            
-            EndpointResolverFactory<Endpoint> factory = new EndpointResolverFactoryImpl(extensionPoints);
-            
-            EndpointResolver endpointResolver = factory.createEndpointResolver(endpoint, null);
-            
-            Assert.assertNotNull(endpointResolver);
-            
-    
-        } catch(Exception ex) {
-            ex.printStackTrace();
-            System.out.println(ex.toString());
-            Assert.fail();
-        }
-    }
-    
-  
-}
diff --git a/tags/java/sca/1.3/modules/endpoint/src/test/resources/Calculator.composite b/tags/java/sca/1.3/modules/endpoint/src/test/resources/Calculator.composite
deleted file mode 100644
index 3b743f6e26..0000000000
--- a/tags/java/sca/1.3/modules/endpoint/src/test/resources/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"
-    xmlns:calc="http://calc"
-    targetNamespace="http://calc"
-    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="AddServiceComponentOff">
-        <implementation.java class="calculator.AddServiceImpl"/>
-        <service name="AddServiceImpl">
-            <interface.java interface="calculator.AddService"/>
-        </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>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/extensibility/LICENSE b/tags/java/sca/1.3/modules/extensibility/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/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/tags/java/sca/1.3/modules/extensibility/NOTICE b/tags/java/sca/1.3/modules/extensibility/NOTICE
deleted file mode 100644
index b3e4797aaa..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-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/tags/java/sca/1.3/modules/extensibility/pom.xml b/tags/java/sca/1.3/modules/extensibility/pom.xml
deleted file mode 100644
index 9e83f90c9d..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-extensibility</artifactId>
-    <name>Apache Tuscany SCA Extensibility</name>
-
-
-    <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.extensibility</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
deleted file mode 100644
index 48f240559c..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.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.core;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of a registry to hold all the Tuscany core extension
- * points. As the point of contact for all extension artifacts this registry
- * allows loaded extensions to find all other parts of the system and register
- * themselves appropriately.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultExtensionPointRegistry implements ExtensionPointRegistry {
-    private Map<Class<?>, Object> extensionPoints = new HashMap<Class<?>, Object>();
-    
-    /**
-     * Constructs a new registry. 
-     */
-    public DefaultExtensionPointRegistry() {
-    }
-
-    /**
-     * Add an extension point to the registry. This default implementation
-     * stores extensions against the interfaces that they implement.
-     *
-     * @param extensionPoint The instance of the extension point
-     *
-     * @throws IllegalArgumentException if extensionPoint is null
-     */
-    public void addExtensionPoint(Object extensionPoint) {
-        if (extensionPoint == null) {
-            throw new IllegalArgumentException("Cannot register null as an ExtensionPoint");
-        }
-
-        Set<Class<?>> interfaces = getAllInterfaces(extensionPoint.getClass());
-        for (Class<?> i : interfaces) {
-            extensionPoints.put(i, extensionPoint);
-        }
-    }
-    
-    private Constructor<?> getConstructor(Constructor<?>[] constructors, Class<?>[] paramTypes) {
-        for (Constructor<?> c : constructors) {
-            Class<?>[] types = c.getParameterTypes();
-            if (c.getParameterTypes().length == paramTypes.length) {
-                boolean found = true;
-                for (int i = 0; i < types.length; i++) {
-                    if (types[i] != paramTypes[i]) {
-                        found = false;
-                        break;
-                    }
-                }
-                if (found) {
-                    return c;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the extension point by the interface that it implements
-     *
-     * @param extensionPointType The lookup key (extension point interface)
-     * @return The instance of the extension point
-     *
-     * @throws IllegalArgumentException if extensionPointType is null
-     */
-    public <T> T getExtensionPoint(Class<T> extensionPointType) {
-        if (extensionPointType == null) {
-            throw new IllegalArgumentException("Cannot lookup ExtensionPoint of type null");
-        }
-
-        Object extensionPoint = extensionPoints.get(extensionPointType);
-        if (extensionPoint == null) {
-            
-            // Dynamically load an extension point class declared under META-INF/services           
-            try {
-                Class<?> extensionPointClass = 
-                	ServiceDiscovery.getInstance().loadFirstServiceClass(extensionPointType);
-                if (extensionPointClass != null) {
-                    // Construct the extension point
-                    Constructor<?>[] constructors = extensionPointClass.getConstructors();
-                    Constructor<?> constructor = getConstructor(constructors, new Class<?>[] {ExtensionPointRegistry.class});
-                    if (constructor != null) {
-                        extensionPoint = constructor.newInstance(this);
-                    } else {
-                        constructor = getConstructor(constructors, new Class<?>[] {});
-                        if (constructor != null) {
-                            extensionPoint = constructor.newInstance();
-                        } else {
-                            throw new IllegalArgumentException(
-                                                               "No valid constructor is found for " + extensionPointClass);
-                        }
-                    }
-                   
-                    // Cache the loaded extension point
-                    addExtensionPoint(extensionPoint);
-                }
-            } catch (InvocationTargetException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IOException e) {
-                throw new IllegalArgumentException(e);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InstantiationException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-        return extensionPointType.cast(extensionPoint);
-    }
-
-    /**
-     * Remove an extension point based on the interface that it implements
-     *
-     * @param extensionPoint The extension point to remove
-     *
-     * @throws IllegalArgumentException if extensionPoint is null
-     */
-    public void removeExtensionPoint(Object extensionPoint) {
-        if (extensionPoint == null) {
-            throw new IllegalArgumentException("Cannot remove null as an ExtensionPoint");
-        }
-
-        Set<Class<?>> interfaces = getAllInterfaces(extensionPoint.getClass());
-        for (Class<?> i : interfaces) {
-            extensionPoints.remove(i);
-        }
-    }
-
-    /**
-     * Returns the set of interfaces implemented by the given class and its
-     * ancestors or a blank set if none
-     */
-    private static Set<Class<?>> getAllInterfaces(Class<?> clazz) {
-        Set<Class<?>> implemented = new HashSet<Class<?>>();
-        getAllInterfaces(clazz, implemented);
-        return implemented;
-    }
-
-    private static void getAllInterfaces(Class<?> clazz, Set<Class<?>> implemented) {
-        Class<?>[] interfaces = clazz.getInterfaces();
-        for (Class<?> interfaze : interfaces) {
-            if (Modifier.isPublic(interfaze.getModifiers())) {
-                implemented.add(interfaze);
-            }
-        }
-        Class<?> superClass = clazz.getSuperclass();
-        // Object has no superclass so check for null
-        if (superClass != null && !superClass.equals(Object.class)) {
-            getAllInterfaces(superClass, implemented);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
deleted file mode 100644
index 8ca030c0dd..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.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.core;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of an extension point to hold Tuscany module activators.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultModuleActivatorExtensionPoint implements ModuleActivatorExtensionPoint {
-    private List<ModuleActivator> activators = new ArrayList<ModuleActivator>();
-    private boolean loadedActivators;
-    
-    /**
-     * Constructs a new extension point. 
-     */
-    public DefaultModuleActivatorExtensionPoint() {
-    }
-
-    public void addModuleActivator(ModuleActivator activator) {
-        activators.add(activator);
-    }
-    
-    public List<ModuleActivator> getModuleActivators() {
-        loadModuleActivators();
-        return activators;
-    }
-    
-    public void removeModuleActivator(Object activator) {
-        activators.remove(activator);
-    }
-
-    /**
-     * Dynamically load module activators declared under META-INF/services
-     */
-    private void loadModuleActivators() {
-        if (loadedActivators)
-            return;
-
-        // Get the activator service declarations
-        Set<ServiceDeclaration> activatorDeclarations; 
-        try {
-            activatorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(ModuleActivator.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        // Load and instantiate module activators
-        for (ServiceDeclaration activatorDeclaration: activatorDeclarations) {
-            ModuleActivator activator;
-            try {
-                Class<ModuleActivator> activatorClass = (Class<ModuleActivator>)activatorDeclaration.loadClass();
-                activator = activatorClass.newInstance();
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InstantiationException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            }
-            addModuleActivator(activator);
-        }
-        
-        loadedActivators = true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
deleted file mode 100644
index 6f7c83c8d9..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.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.core;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Default implementation of an extension point to hold Tuscany utility utilities.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultUtilityExtensionPoint implements UtilityExtensionPoint {
-    private Map<Class<?>, Object> utilities = new HashMap<Class<?>, Object>();
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    /**
-     * Constructs a new extension point. 
-     */
-    public DefaultUtilityExtensionPoint(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-    }
-
-    /**
-     * Add a utility to the extension point. This default implementation
-     * stores utilities against the interfaces that they implement.
-     *
-     * @param utility The instance of the utility
-     *
-     * @throws IllegalArgumentException if utility is null
-     */
-    public void addUtility(Object utility) {
-        if (utility == null) {
-            throw new IllegalArgumentException("Cannot register null as a Service");
-        }
-
-        Set<Class<?>> interfaces = getAllInterfaces(utility.getClass());
-        for (Class<?> i : interfaces) {
-            utilities.put(i, utility);
-        }
-    }
-    
-    private Constructor<?> getConstructor(Constructor<?>[] constructors, Class<?>[] paramTypes) {
-        for (Constructor<?> c : constructors) {
-            Class<?>[] types = c.getParameterTypes();
-            if (c.getParameterTypes().length == paramTypes.length) {
-                boolean found = true;
-                for (int i = 0; i < types.length; i++) {
-                    if (types[i] != paramTypes[i]) {
-                        found = false;
-                        break;
-                    }
-                }
-                if (found) {
-                    return c;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the utility by the interface that it implements
-     *
-     * @param utilityType The lookup key (utility interface)
-     * @return The instance of the utility
-     *
-     * @throws IllegalArgumentException if utilityType is null
-     */
-    public <T> T getUtility(Class<T> utilityType) {
-        if (utilityType == null) {
-            throw new IllegalArgumentException("Cannot lookup Service of type null");
-        }
-
-        Object utility = utilities.get(utilityType);
-        if (utility == null) {
-            
-            // Dynamically load a utility class declared under META-INF/utilities           
-            try {
-                Class<?> utilityClass = 
-                	ServiceDiscovery.getInstance().loadFirstServiceClass(utilityType);
-                if (utilityClass != null) {
-                    // Construct the utility
-                    Constructor<?>[] constructors = utilityClass.getConstructors();
-                    Constructor<?> constructor = getConstructor(constructors, new Class<?>[] {ExtensionPointRegistry.class});
-                    if (constructor != null) {
-                        utility = constructor.newInstance(extensionPoints);
-                    } else {
-                        constructor = getConstructor(constructors, new Class<?>[] {});
-                        if (constructor != null) {
-                            utility = constructor.newInstance();
-                        } else {
-                            throw new IllegalArgumentException(
-                                                               "No valid constructor is found for " + utilityClass);
-                        }
-                    }
-                   
-                    // Cache the loaded utility
-                    addUtility(utility);
-                }
-            } catch (InvocationTargetException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IOException e) {
-                throw new IllegalArgumentException(e);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InstantiationException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-        return utilityType.cast(utility);
-    }
-
-    /**
-     * Remove a utility based on the interface that it implements
-     *
-     * @param utility The utility to remove
-     *
-     * @throws IllegalArgumentException if utility is null
-     */
-    public void removeUtility(Object utility) {
-        if (utility == null) {
-            throw new IllegalArgumentException("Cannot remove null as a Service");
-        }
-
-        Set<Class<?>> interfaces = getAllInterfaces(utility.getClass());
-        for (Class<?> i : interfaces) {
-            utilities.remove(i);
-        }
-    }
-
-    /**
-     * Returns the set of interfaces implemented by the given class and its
-     * ancestors or a blank set if none
-     */
-    private static Set<Class<?>> getAllInterfaces(Class<?> clazz) {
-        Set<Class<?>> implemented = new HashSet<Class<?>>();
-        getAllInterfaces(clazz, implemented);
-        return implemented;
-    }
-
-    private static void getAllInterfaces(Class<?> clazz, Set<Class<?>> implemented) {
-        Class<?>[] interfaces = clazz.getInterfaces();
-        for (Class<?> interfaze : interfaces) {
-            if (Modifier.isPublic(interfaze.getModifiers())) {
-                implemented.add(interfaze);
-            }
-        }
-        Class<?> superClass = clazz.getSuperclass();
-        // Object has no superclass so check for null
-        if (superClass != null && !superClass.equals(Object.class)) {
-            getAllInterfaces(superClass, implemented);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
deleted file mode 100644
index f2f67b2d52..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.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.core;
-
-
-/**
- * The registry for the Tuscany core extension points. As the point of contact
- * for all extension artifacts this registry allows loaded extensions to find
- * all other parts of the system and register themselves appropriately.
- *
- * @version $Rev$ $Date$
- */
-public interface ExtensionPointRegistry {
-
-    /**
-     * Add an extension point to the registry
-     * @param extensionPoint The instance of the extension point
-     *
-     * @throws IllegalArgumentException if extensionPoint is null
-     */
-    void addExtensionPoint(Object extensionPoint);
-
-    /**
-     * Get the extension point by the interface
-     * @param extensionPointType The lookup key (extension point interface)
-     * @return The instance of the extension point
-     *
-     * @throws IllegalArgumentException if extensionPointType is null
-     */
-    <T> T getExtensionPoint(Class<T> extensionPointType);
-
-    /**
-     * Remove an extension point
-     * @param extensionPoint The extension point to remove
-     *
-     * @throws IllegalArgumentException if extensionPoint is null
-     */
-    void removeExtensionPoint(Object extensionPoint);
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
deleted file mode 100644
index dbfd0dcd90..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.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.core;
-
-
-/**
- * ModuleActivator represents a module that plugs into the Tuscany system. Each 
- * module should provide an implementation of this interface and register the 
- * ModuleActivator implementation class by defining a file named 
- * 
- * "META-INF/services/org.apache.tuscany.core.ModuleActivator"
- * 
- * The content of the file is the class name of the ModuleActivator implementation. 
- * The implementation class must have a no-arg constructor. The same instance 
- * will be used to invoke all the methods during different phases of the module 
- * activation. Note that the start and stop methods defined by this interface
- * take a reference to the Tuscany SCA runtime ExtensionPointRegistry. This 
- * gives the ModuleActivator the opportunity to add extension points to the
- * registry as it is requested to start up and remove them when it is requested
- * to shut down.
- * 
- * @version $Rev$ $Date$
- */
-public interface ModuleActivator {
-
-    /**
-     * This method is invoked when the module is started by the Tuscany system.
-     * It can be used by this module to register extensions against extension
-     * points.
-     * 
-     * @param registry The extension point registry
-     */
-    void start(ExtensionPointRegistry registry);
-
-    /**
-     * This method is invoked when the module is stopped by the Tuscany system.
-     * It can be used by this module to unregister extensions against the
-     * extension points.
-     * 
-     * @param registry The extension point registry
-     */
-    void stop(ExtensionPointRegistry registry);
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
deleted file mode 100644
index ec0f12b8ba..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.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.core;
-
-import java.util.List;
-
-
-/**
- * The extension point for the Tuscany module activator extensions.
- *
- * @version $Rev$ $Date$
- */
-public interface ModuleActivatorExtensionPoint {
-
-    /**
-     * Add a module activator extension to the extension point
-     * @param activator The instance of the module activator
-     *
-     * @throws IllegalArgumentException if activator is null
-     */
-    void addModuleActivator(ModuleActivator activator);
-
-    /**
-     * Returns the module activator extensions.
-     * @return The module activator extensions
-     */
-    List<ModuleActivator> getModuleActivators();
-
-    /**
-     * Remove a module activator
-     * @param activator The module activator to remove
-     *
-     * @throws IllegalArgumentException if activator is null
-     */
-    void removeModuleActivator(Object activator);
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
deleted file mode 100644
index 6b14b95666..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.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.core;
-
-
-/**
- * The extension point for the Tuscany core utility extensions.
- *
- * @version $Rev$ $Date$
- */
-public interface UtilityExtensionPoint {
-
-    /**
-     * Add a utility to the extension point
-     * @param utility The instance of the utility
-     *
-     * @throws IllegalArgumentException if utility is null
-     */
-    void addUtility(Object utility);
-
-    /**
-     * Get the utility by the interface
-     * @param utilityType The lookup key (utility interface)
-     * @return The instance of the utility
-     *
-     * @throws IllegalArgumentException if utilityType is null
-     */
-    <T> T getUtility(Class<T> utilityType);
-
-    /**
-     * Remove a utility
-     * @param utility The utility to remove
-     *
-     * @throws IllegalArgumentException if utility is null
-     */
-    void removeUtility(Object utility);
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
deleted file mode 100644
index 4b25f2adc2..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.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.extensibility;
-
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.util.Map;
-
-/**
- * Service declaration using J2SE Jar service provider spec Classes specified
- * inside this declaration are loaded using the ClassLoader used to read the
- * configuration file corresponding to this declaration.
- *
- * @version $Rev$ $Date$
- */
-public class ServiceDeclaration {
-
-    private WeakReference<ClassLoader> classLoader;
-
-    private String className;
-
-    private Map<String, String> attributes;
-
-    /**
-     * Service declaration constructor
-     * 
-     * @param className Service implementation class name
-     * @param classLoader ClassLoader corresponding to this service
-     *                implementation
-     * @param attributes Optional attributes for this service declaration
-     */
-    public ServiceDeclaration(String className, ClassLoader classLoader, Map<String, String> attributes) {
-
-        this.className = className;
-        this.classLoader = new WeakReference<ClassLoader>(classLoader);
-        this.attributes = attributes;
-    }
-
-    /**
-     * Load this service implementation class
-     * 
-     * @return Class
-     * @throws ClassNotFoundException
-     */
-    @SuppressWarnings("unchecked")
-    public Class<?> loadClass() throws ClassNotFoundException {
-
-        return Class.forName(className, true, classLoader.get());
-    }
-
-    /**
-     * Load another class using the ClassLoader of this service implementation
-     * 
-     * @param anotherClassName
-     * @return Class
-     * @throws ClassNotFoundException
-     */
-    public Class<?> loadClass(String anotherClassName) throws ClassNotFoundException {
-
-        return Class.forName(anotherClassName, true, classLoader.get());
-    }
-
-    /**
-     * Return the resource corresponding to this service implementation class
-     * 
-     * @return resource URL
-     */
-    public URL getResource() {
-        return classLoader.get().getResource(className);
-    }
-
-    /**
-     * ClassLoader associated with this service declaration
-     * 
-     * @return ClassLoader
-     */
-    public ClassLoader getClassLoader() {
-        return classLoader.get();
-    }
-
-    /**
-     * Service implementation class corresponding to this declaration
-     * 
-     * @return The Service implementation class corresponding to this declaration 
-     */
-    public String getClassName() {
-        return className;
-    }
-
-    /**
-     * Attributes specified for this declaration
-     * 
-     * @return attributes
-     */
-    public Map<String, String> getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * Equals method used to ensure that each service declaration is stored only
-     * once in a set of declarations.
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof ServiceDeclaration))
-            return false;
-        ServiceDeclaration s = (ServiceDeclaration)o;
-        if (!className.equals(s.className))
-            return false;
-        else if (!classLoader.equals(s.classLoader))
-            return false;
-        else if (attributes == null)
-            return s.attributes == null;
-        else
-            return attributes.equals(s.attributes);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
deleted file mode 100644
index 45a4494f24..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.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.extensibility;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Service discovery for Tuscany based on J2SE Jar service provider spec.
- * Services are described using configuration files in META-INF/services.
- * Service description specifies a class name followed by optional properties.
- * Multi-ClassLoader environments are supported through a ClassLoader
- * registration API
- *
- * @version $Rev$ $Date$
- */
-public class ServiceDiscovery {
-    private static final Logger logger = Logger.getLogger(ServiceDiscovery.class.getName());
-
-    private static ServiceDiscovery instance;
-
-    private HashSet<ClassLoader> registeredClassLoaders;
-
-    /**
-     * Get an instance of Service discovery, one instance is created per
-     * ClassLoader that this class is loaded from
-     * 
-     * @return
-     */
-    public static ServiceDiscovery getInstance() {
-
-        if (instance == null) {
-            instance = new ServiceDiscovery();
-            instance.registeredClassLoaders = new HashSet<ClassLoader>();
-            instance.registeredClassLoaders.add(ServiceDiscovery.class.getClassLoader());
-        }
-        return instance;
-    }
-
-    /**
-     * Register a ClassLoader with this discovery mechanism. Tuscany extension
-     * ClassLoaders are registered here.
-     * 
-     * @param classLoader
-     */
-    public synchronized void registerClassLoader(ClassLoader classLoader) {
-        registeredClassLoaders.add(classLoader);
-    }
-    
-    /**
-     * Unregister a ClassLoader with this discovery mechanism. 
-     * 
-     * @param classLoader
-     */
-    public synchronized void unregisterClassLoader(ClassLoader classLoader) {
-        registeredClassLoaders.remove(classLoader);
-    }
-
-    /**
-     * Get all service declarations for this name
-     * 
-     * @param name
-     * @return set of service declarations
-     * @throws IOException
-     */
-    public synchronized Set<ServiceDeclaration> getServiceDeclarations(String name) throws IOException {
-
-        Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
-
-        for (ClassLoader classLoader : registeredClassLoaders) {
-            getServiceClasses(classLoader, name, classSet, true);
-        }
-        return classSet;
-    }
-
-    /**
-     * Get all service declarations for this interface
-     * 
-     * @param serviceInterface
-     * @return set of service declarations
-     * @throws IOException
-     */
-    public Set<ServiceDeclaration> getServiceDeclarations(Class<?> serviceInterface) throws IOException {
-
-        return getServiceDeclarations(serviceInterface.getName());
-    }
-
-    /**
-     * Load one service implementation class for this interface
-     * 
-     * @param serviceInterface
-     * @return service implementation class
-     * @throws IOException
-     * @throws ClassNotFoundException
-     */
-    public synchronized Class<?> loadFirstServiceClass(Class<?> serviceInterface) throws IOException, ClassNotFoundException {
-
-        Set<ServiceDeclaration> classSet = new HashSet<ServiceDeclaration>();
-
-        for (ClassLoader classLoader : registeredClassLoaders) {
-            getServiceClasses(classLoader, serviceInterface.getName(), classSet, false);
-            if (classSet.size() > 0)
-                break;
-        }
-        if (classSet.size() > 0)
-            return classSet.iterator().next().loadClass();
-        else
-            return null;
-
-    }
-
-    /**
-     * Returns a unique list of resource URLs of name META-INF/services/<name>
-     * Each URL is associated with the first ClassLoader that it was visible
-     * from
-     * 
-     * @param name Name of resource
-     * @return Table of URLs with associated ClassLoaders
-     * @throws IOException
-     */
-    public synchronized Hashtable<ClassLoader, Set<URL>> getServiceResources(final String name) throws IOException {
-
-        Hashtable<ClassLoader, Set<URL>> resourceTable = new Hashtable<ClassLoader, Set<URL>>();
-
-        HashSet<URL> allURLs = new HashSet<URL>();
-        for (final ClassLoader classLoader : registeredClassLoaders) {
-            HashSet<URL> urls = new HashSet<URL>();
-            resourceTable.put(classLoader, urls);
-            boolean debug = logger.isLoggable(Level.FINE);
-            if (debug) {
-                logger.fine("Discovering service resources using class loader " + classLoader);
-            }
-            // Allow privileged access to read META-INF/services/*. Add FilePermission to added to security policy file.
-            ArrayList<URL> urlList;
-            try {
-                // FIXME J2 Security - promote this to callers of this method
-                urlList = AccessController.doPrivileged(new PrivilegedExceptionAction<ArrayList<URL>>() {
-                    public ArrayList<URL> run() throws IOException {
-                        return Collections.list(classLoader.getResources("META-INF/services/" + name));
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                throw (IOException)e.getException();
-            }
-            
-            for (URL url : urlList) {
-                if (allURLs.contains(url))
-                    continue;
-                urls.add(url);
-            }
-            allURLs.addAll(urls);
-        }
-        return resourceTable;
-    }
-
-    /**
-     * Parse a service declaration in the form class;attr=value,attr=value and
-     * return a map of attributes
-     * 
-     * @param declaration
-     * @return a map of attributes
-     */
-    private Map<String, String> parseServiceDeclaration(String declaration) {
-        Map<String, String> attributes = new HashMap<String, String>();
-        int index = declaration.indexOf(';');
-        if (index != -1) {
-            attributes.put("class", declaration.substring(0, index).trim());
-            declaration = declaration.substring(index);
-        } else {
-            int j = declaration.indexOf('=');
-            if (j == -1) {
-                attributes.put("class", declaration.trim());
-                return attributes;
-            } else {
-                declaration = ";" + declaration;
-            }
-        }
-        StringTokenizer tokens = new StringTokenizer(declaration);
-        for (; tokens.hasMoreTokens();) {
-            String key = tokens.nextToken("=").substring(1).trim();
-            if (key == null)
-                break;
-            String value = tokens.nextToken(",").substring(1).trim();
-            if (value == null)
-                break;
-            attributes.put(key, value);
-        }
-        return attributes;
-    }
-
-    /**
-     * Load the service class whose name specified in a configuration file
-     * 
-     * @param classLoader
-     * @param name The name of the service class
-     * @param classSet Populate this set with classes extends/implements the
-     *                service class
-     * @throws IOException
-     */
-    private void getServiceClasses(final ClassLoader classLoader,
-                                   final String name,
-                                   Set<ServiceDeclaration> classSet,
-                                   boolean findAllClasses) throws IOException {
-
-        boolean debug = logger.isLoggable(Level.FINE);
-        if (debug) {
-            logger.fine("Discovering service providers using class loader " + classLoader);
-        }
-        // Allow privileged access to read META-INF/services/*. Add FilePermission to added to
-        // security policy file.
-        ArrayList<URL> urlList;
-        try {
-            urlList = AccessController.doPrivileged(new PrivilegedExceptionAction<ArrayList<URL>>() {
-                public ArrayList<URL> run() throws IOException {
-                    return Collections.list(classLoader.getResources("META-INF/services/" + name));
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (IOException)e.getException();
-        }
-        
-        for (final URL url : urlList) {
-            if (debug) {
-                logger.fine("Reading service provider file: " + url.toExternalForm());
-            }
-
-            // Allow privileged access to open URL stream. Add FilePermission to added to security
-            // policy file.
-            InputStream is;
-            try {
-                is = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-                    public InputStream run() throws IOException {
-                        return url.openStream();
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                throw (IOException)e.getException();
-            }
-            BufferedReader reader = null;
-            try {
-                reader = new BufferedReader(new InputStreamReader(is));
-                while (true) {
-                    String line = reader.readLine();
-                    if (line == null)
-                        break;
-                    line = line.trim();
-                    if (!line.startsWith("#") && !"".equals(line)) {
-                        String reg = line.trim();
-                        if (debug) {
-                            logger.fine("Registering service provider: " + reg);
-                        }
-
-                        Map<String, String> attributes = parseServiceDeclaration(reg);
-                        String className = attributes.get("class");
-                        ServiceDeclaration serviceClass = new ServiceDeclaration(className, classLoader, attributes);
-                        classSet.add(serviceClass);
-
-                        if (!findAllClasses)
-                            break;
-                    }
-                }
-            } finally {
-                if (reader != null)
-                    reader.close();
-                if (is != null) {
-                    try {
-                        is.close();
-                    } catch (IOException ioe) {
-                    }
-                }
-            }
-            if (!findAllClasses && classSet.size() > 0)
-                break;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
deleted file mode 100644
index 42bad63132..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ /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.core.DefaultModuleActivatorExtensionPoint

diff --git a/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
deleted file mode 100644
index d769bad283..0000000000
--- a/tags/java/sca/1.3/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ /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.core.DefaultUtilityExtensionPoint

diff --git a/tags/java/sca/1.3/modules/extension-helper/LICENSE b/tags/java/sca/1.3/modules/extension-helper/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/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/tags/java/sca/1.3/modules/extension-helper/NOTICE b/tags/java/sca/1.3/modules/extension-helper/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/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/tags/java/sca/1.3/modules/extension-helper/pom.xml b/tags/java/sca/1.3/modules/extension-helper/pom.xml
deleted file mode 100644
index 732091ec84..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-extension-helper</artifactId>
-    <name>Apache Tuscany SCA Extension Helper</name>
-
-    <dependencies>
-    
-    	<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>                                      
-            <artifactId>junit</artifactId>
-            <version>4.2</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.extension.helper</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.extension*</Export-Package>
-                        <DynamicImport-Package>org.apache.tuscany.sca.host.http</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
deleted file mode 100644
index e117e952c7..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.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.extension.helper;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * A BindingActivator adds an SCA binding type to the Tuscany runtime.
- * 
- * The SCDL XML used for the binding is derived from the name of the
- * class returned from the getBindingClass method - the package name and
- * any trailing "Binding" string is removed, leading upper case characters
- * are converted to lowercase, and the suffix "binding." is added.
- * For example if getBindingClass returns a class named "mypkg.FooBinding"
- * then the SCDL for the binding will be <binding.foo>.
- * 
- * Attributes of the <binding.foo> SCDL are based on the getters/setters of
- * the binding class. So if FooBinding had getBar/setBar then there
- * would be an attribute name 'bar', for example, <binding.foo bar="xxx">. 
- * 
- * BindingActivator implementations may use constructor arguments to have 
- * Tuscany ExtensionPointRegistry objects passed in on their constructor.
- * For example:
- * 
- *    public class MyBindingActivator implements BindingActivator {
- *       ServletHost servletHost;
- *       public MyBindingActivator(ServletHost servletHost) {
- *          this.servletHost = servletHost;
- *       }
- *       ...
- *    }
- *    
- * BindingActivator implementations are discovered by the Tuscany runtime
- * using the J2SE jar file extensions for service provider discovery. All
- * that means is packaging the new binding type in a jar which contains a  
- * file META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator and
- * that file lists the BindingActivator implementation class name.
- *
- * @version $Rev$ $Date$
- */
-public interface BindingActivator<B> {
-
-    Class<B> getBindingClass();
-
-    InvokerFactory createInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, B pojoBinding);
-    
-    ComponentLifecycle createService(RuntimeComponent rc, RuntimeComponentService rcs, Binding b, B pojoBinding);
-    
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
deleted file mode 100644
index 92b6e4191f..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.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.extension.helper;
-
-/**
- * Interface that defines the Component Lifecycle methods.
- *
- * @version $Rev$ $Date$
- */
-public interface ComponentLifecycle {
-    
-    void start();
-    void stop();
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
deleted file mode 100644
index 7d2a9c3d2d..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.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.extension.helper;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * An ImplementationActivator adds an SCA implementation type to the Tuscany runtime.
- * 
- * The SCDL XML used for the implementation is derived from the name of the
- * class returned from the getImplementationClass method - the package name and
- * any trailing "Implementation" string is removed, leading upper case characters
- * are converted to lowercase, and the suffix "implementation." is added. For 
- * example if getImplementationClass returns a class named "mypkg.FooImplementation"
- * then the SCDL for the implementation will be <implementation.foo>.
- * 
- * Attributes of the <implementation.foo> SCDL are based on the getters/setters of
- * the Implementation class. So if FooImplementation had getBar/setBar then there
- * would be an attribute name 'bar', for example, <implementation.foo bar="xxx">. 
- * 
- * BindingActivator implementations may use constructor arguments to have 
- * Tuscany ExtensionPointRegistry objects passed in on their constructor.
- * For example:
- * 
- *    public class MyImplementationActivator implements ImplementationActivator {
- *       ServletHost servletHost;
- *       public MyImplementationActivator(ServletHost servletHost) {
- *          this.servletHost = servletHost;
- *       }
- *       ...
- *    }
- *    
- * ImplementationActivator implementations are discovered by the Tuscany runtime
- * using the J2SE jar file extensions for service provider discovery. All
- * that means is packaging the new binding type in a jar which contains a  
- * file META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator and
- * that file lists the ImplementationActivator implementation class name.
- *
- * @version $Rev$ $Date$
- */
-public interface ImplementationActivator<T> {
-
-    Class<T> getImplementationClass();
-
-    InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, T implementation);
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
deleted file mode 100644
index c51a7267cc..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.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.extension.helper;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-
-/**
- * Interface that defines the methods for an Invoker Factory.
- *
- * @version $Rev$ $Date$
- */
-public interface InvokerFactory {
-
-    Invoker createInvoker(Operation operation);
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
deleted file mode 100644
index 8a83f630e9..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.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.extension.helper.impl;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.NamespaceContext;
-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.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.extension.helper.utils.AbstractBinding;
-
-/**
- * An SCDL ArtifactProcessor which uses the Binding class getters/setters
- * to define the SCDL attributes.
- * 
- * TODO: merge this with SCDLProcessor
- *
- * @version $Rev$ $Date$
- */
-public class BindingSCDLProcessor implements StAXArtifactProcessor {
-
-    protected QName scdlQName;
-    protected Class<Binding> bindingClass;
-
-    protected Map<String, Method> attributeSetters;
-    protected Method elementTextSetter;
-
-    public BindingSCDLProcessor(QName scdlQName, Class<Binding> implementationClass) {
-        this.scdlQName = scdlQName;
-        this.bindingClass = implementationClass;
-        initAttributes();
-    }
-
-    protected void initAttributes() {
-        attributeSetters = new HashMap<String, Method>();
-        Set<Method> methods = new HashSet<Method>(Arrays.asList(bindingClass.getMethods()));
-        methods.removeAll(Arrays.asList(AbstractBinding.class.getMethods()));
-        for (Method m : methods) {
-            if ("setElementText".equals(m.getName())) {
-                elementTextSetter = m;
-            } else if ((m.getName().startsWith("set"))) {
-                attributeSetters.put(getFieldName(m), m);
-            }
-        }
-    }
-
-    /**
-     * Remove get/set from method name, set 1st char to lowercase and
-     * remove any trailing underscore character
-     */
-    protected String getFieldName(Method m) {
-        StringBuilder sb = new StringBuilder(m.getName().substring(3));
-        sb.setCharAt(0, Character.toLowerCase(sb.charAt(0)));
-        String name = sb.toString();
-        if (name.endsWith("_")) {
-            name = name.substring(0,name.length()-1);
-        }
-        return name;
-    }
-
-    public QName getArtifactType() {
-        return scdlQName;
-    }
-
-    public Class getModelType() {
-        //FIXME Having two different bindings, PojoBinding wrapping
-        // the real binding is pretty confusing, looks like if you don't return
-        // PojoBinding here, the write and resolve methods will never be
-        // called, returning PojoBinding.class seems to fix that issue without
-        // breaking anything else
-        return PojoBinding.class;
-    }
-
-    public Binding read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Object impl;
-        try {
-            impl = bindingClass.newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        for (String attribute : attributeSetters.keySet()) {
-            String value = reader.getAttributeValue(null, attribute);
-            if (value != null && value.length() > 0) {
-                try {
-                    attributeSetters.get(attribute).invoke(impl, new Object[] {value});
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        //FIXME: none of the attributes of Binding seem to be working with PojoBinding
-        // For now at least read the binding URI
-        String uri = reader.getAttributeValue(null, "uri");
-        
-        if (elementTextSetter != null) {
-            try {
-                String value = reader.getElementText();
-                if (value != null && value.length() > 0) {
-                    elementTextSetter.invoke(impl, value);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        while (!(reader.getEventType() == END_ELEMENT && scdlQName.equals(reader.getName())) && reader.hasNext()) {
-            reader.next();
-        }
-
-        if (!(impl instanceof Binding)) {
-            impl = new PojoBinding(impl);
-            
-            //FIXME: none of the attributes of Binding seem to be working with PojoBinding
-            // For now at least read the binding URI
-            if (uri != null) {
-                ((PojoBinding)impl).setURI(uri);
-            }
-        }
-        return (Binding)impl;
-    }
-
-    public void resolve(Object model, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-    public void write(Object model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        //FIXME: none of the attributes of Binding seem to be working with PojoBinding
-        // For now at least write the binding URI
-        
-        // Find a namespace prefix and write the element 
-        String prefix = writer.getPrefix(scdlQName.getNamespaceURI());
-        if (prefix == null) {
-            NamespaceContext nsc = writer.getNamespaceContext();
-            for (int i=1; ; i++) {
-                prefix = "ns" + i;
-                if (nsc.getNamespaceURI(prefix) == null) {
-                    break;
-                }
-            }
-            writer.setPrefix(prefix, scdlQName.getNamespaceURI());
-        }
-        writer.writeStartElement(scdlQName.getNamespaceURI(), scdlQName.getLocalPart());
-
-        // Write the binding URI attribute
-        String uri;
-        try {
-            uri = (String)model.getClass().getMethod("getURI").invoke(model);
-        } catch (Exception e) {
-            uri = null;
-        }
-        if (uri != null) {
-            writer.writeAttribute("uri", uri);
-        }
-        
-        writer.writeEndElement();
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
deleted file mode 100644
index bca1dac0ed..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.extension.helper.impl;
-
-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.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModuleActivator;
-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.interfacedef.InterfaceContract;
-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.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-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 BindingsActivator implements ModuleActivator {
-
-    protected List<BindingActivator> bindingActivators;
-    protected AssemblyFactory assemblyFactory;
-    protected Map<Class, BindingActivator> bindingActivatorMap = new HashMap<Class, BindingActivator>();
-
-    public void start(ExtensionPointRegistry registry) {
-
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
-
-
-        this.bindingActivators =
-            DiscoveryUtils.discoverActivators(BindingActivator.class, registry);
-
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        ProviderFactoryExtensionPoint providerFactories =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-
-        for (final BindingActivator bindingActivator : bindingActivators) {
-            Class bindingClass = bindingActivator.getBindingClass();
-            bindingActivatorMap.put(bindingClass, bindingActivator);
-            QName scdlQName = getBindingQName(bindingClass);
-            staxProcessors.addArtifactProcessor(new BindingSCDLProcessor(scdlQName, bindingClass));
-
-            // Check if the binding extends from Binding interface
-            if (Binding.class.isAssignableFrom(bindingClass)) {
-                // Add provider factory against the binding class
-                providerFactories.addProviderFactory(new DelegatingBindingProviderFactory(bindingClass));
-            }
-
-        }
-
-        // Add a generic provider factory against PojoBinding.class
-        providerFactories.addProviderFactory(new DelegatingBindingProviderFactory(PojoBinding.class));
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        ProviderFactoryExtensionPoint providerFactories =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-
-        for (final BindingActivator bindingActivator : bindingActivators) {
-
-            // Remove the binding SCDL processor from the runtime
-            if (staxProcessors != null) {
-                StAXArtifactProcessor processor =
-                    staxProcessors.getProcessor(getBindingQName(bindingActivator.getBindingClass()));
-                if (processor != null) {
-                    staxProcessors.removeArtifactProcessor(processor);
-                }
-            }
-
-            // Remove the ProviderFactory from the runtime
-            if (providerFactories != null && bindingActivator.getBindingClass() != null) {
-                ProviderFactory factory = providerFactories.getProviderFactory(bindingActivator.getBindingClass());
-                if (factory != null) {
-                    providerFactories.removeProviderFactory(factory);
-                }
-            }
-        }
-        if (providerFactories != null) {
-            ProviderFactory factory = providerFactories.getProviderFactory(PojoBinding.class);
-            if (factory != null) {
-                providerFactories.removeProviderFactory(factory);
-            }
-        }
-    }
-
-    protected QName getBindingQName(Class bindingClass) {
-        String localName = bindingClass.getName();
-        if (localName.lastIndexOf('.') > -1) {
-            localName = localName.substring(localName.lastIndexOf('.') + 1);
-        }
-        if (localName.endsWith("Binding")) {
-            localName = localName.substring(0, localName.length() - 7);
-        }
-        StringBuilder sb = new StringBuilder(localName);
-        for (int i = 0; i < sb.length(); i++) {
-            if (Character.isUpperCase(sb.charAt(i))) {
-                sb.setCharAt(i, Character.toLowerCase(sb.charAt(i)));
-            } else {
-                break;
-            }
-        }
-        return new QName(Constants.SCA10_TUSCANY_NS, "binding." + sb.toString());
-    }
-
-    private final class DelegatingBindingProviderFactory implements BindingProviderFactory {
-        private Class modelType;
-
-        public DelegatingBindingProviderFactory(Class modelType) {
-            super();
-            this.modelType = modelType;
-        }
-
-        public ReferenceBindingProvider createReferenceBindingProvider(final RuntimeComponent rc,
-                                                                       final RuntimeComponentReference rcr,
-                                                                       final Binding b) {
-            final Object realBinding;
-            if (b instanceof PojoBinding) {
-                realBinding = ((PojoBinding)b).getUserBinding();
-            } else {
-                realBinding = b;
-            }
-            final BindingActivator bindingActivator = bindingActivatorMap.get(realBinding.getClass());
-            return new ReferenceBindingProvider() {
-                List<InvokerProxy> invokers = new ArrayList<InvokerProxy>();
-                private InvokerFactory factory;
-
-                public Invoker createInvoker(Operation operation) {
-                    InvokerProxy invoker = new InvokerProxy(factory, operation);
-                    invokers.add(invoker);
-                    return invoker;
-                }
-                
-                public boolean supportsOneWayInvocation() {
-                    return false;
-                }
-
-                public InterfaceContract getBindingInterfaceContract() {
-                    return null;
-                }
-
-                public void start() {
-                    if (b instanceof PojoBinding) {
-                        factory = bindingActivator.createInvokerFactory(rc, rcr, b, ((PojoBinding)b).getUserBinding());
-                    } else {
-                        factory = bindingActivator.createInvokerFactory(rc, rcr, b, b);
-                    }
-                    if ( (factory != null) &&  (factory instanceof ComponentLifecycle)) {
-                        ((ComponentLifecycle)factory).start();
-                    }
-//                    for (InvokerProxy invoker : invokers) {
-//                        invoker.start(factory);
-//                    }
-                }
-
-                public void stop() {
-                    if (factory instanceof ComponentLifecycle) {
-                        ((ComponentLifecycle)factory).stop();
-                    }
-                }
-            };
-        }
-
-        public ServiceBindingProvider createServiceBindingProvider(final RuntimeComponent rc,
-                                                                   final RuntimeComponentService rcs,
-                                                                   final Binding b) {
-            final Object realBinding;
-            if (b instanceof PojoBinding) {
-                realBinding = ((PojoBinding)b).getUserBinding();
-            } else {
-                realBinding = b;
-            }
-            final BindingActivator bindingActivator = bindingActivatorMap.get(realBinding.getClass());
-            return new ServiceBindingProvider() {
-                ComponentLifecycle listener = bindingActivator.createService(rc, rcs, b, realBinding);
-
-                public InterfaceContract getBindingInterfaceContract() {
-                    return null;
-                }
-                
-                public boolean supportsOneWayInvocation() {
-                    return false;
-                }
-
-                public void start() {
-                    listener.start();
-                }
-
-                public void stop() {
-                    listener.stop();
-                }
-            };
-        }
-
-        public Class getModelType() {
-            return modelType;
-        }
-    }
-
-}
-
-class InvokerProxy implements Invoker {
-    InvokerFactory factory;
-    Invoker invoker;
-    Operation op;
-
-    InvokerProxy(InvokerFactory factory, Operation op) {
-        this.factory = factory;
-        this.op = op;
-        this.invoker = factory.createInvoker(op);
-    }
-
-    public Message invoke(Message arg0) {
-        return invoker.invoke(arg0);
-    }
-
-//    public void start(InvokerFactory factory) {
-//        invoker = factory.createInvoker(op);
-//    }
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
deleted file mode 100644
index 9d772c8ae8..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.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.extension.helper.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Discovers Activators in the classpath using the J2SE
- * jar file extensions for Service Provider discovery
- *
- * @version $Rev$ $Date$
- */
-public class DiscoveryUtils {
-
-	@SuppressWarnings("unchecked")
-    public static <T> List<T> discoverActivators(Class<T> activatorClass, ExtensionPointRegistry registry) {
-        List<T> activators;
-		try {
-			Set<ServiceDeclaration> activatorClasses = ServiceDiscovery.getInstance().getServiceDeclarations(activatorClass);
-			activators = new ArrayList<T>();
-			for (ServiceDeclaration declaration : activatorClasses) {
-			    try {
-			    	Class<T> c = (Class<T>)declaration.loadClass();
-			        activators.add(c.cast(instantiateActivator(c, registry)));
-			    } catch (Throwable e) {
-			        e.printStackTrace(); // TODO: log
-			    }
-			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-        return activators;
-    }
-
-    static Object instantiateActivator(Class activator, ExtensionPointRegistry registry) {
-        Constructor[] cs = activator.getConstructors();
-        if (cs.length != 1) {
-            throw new RuntimeException("Activator must have only one constructors");
-        }
-        
-        Class<?>[] paramTypes = cs[0].getParameterTypes();
-        Object[] extensions = new Object[paramTypes.length];
-
-        for (int i=0; i< paramTypes.length; i++) {
-            if ("org.apache.tuscany.sca.host.http.ServletHost".equals(paramTypes[i].getName())) {
-                extensions[i] = getServletHost(registry);
-            } else {
-                extensions[i] = registry.getExtensionPoint(paramTypes[i]);
-            }
-        }
-        
-        try {
-
-            return cs[0].newInstance(extensions);
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static Object getServletHost(ExtensionPointRegistry registry) {
-        try {
-
-            Class<?> servletHostEPClass = Class.forName("org.apache.tuscany.sca.host.http.ServletHostExtensionPoint");
-            Object servletHostEP = registry.getExtensionPoint(servletHostEPClass);
-            Class<?> extensibleServletHost = Class.forName("org.apache.tuscany.sca.host.http.ExtensibleServletHost");
-            return extensibleServletHost.getConstructor(new Class[] {servletHostEPClass}).newInstance(servletHostEP);
-
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalArgumentException e) {
-            throw new RuntimeException(e);
-        } catch (SecurityException e) {
-            throw new RuntimeException(e);
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
deleted file mode 100644
index f7c65acb3d..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.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.extension.helper.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.extension.helper.ImplementationActivator;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-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 ImplementationProvider createInvoker method is called before the start method
- * but the runtime isn't properly setup until the start method is called. This means
- * that Invoker's can't initialize things like the services, references and  properties
- * until start is called. This class tries to get around that by using an Invoker
- * proxy that delays creating the real Invoker till start is called.
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationImplementationProvider implements ImplementationProvider {
-
-    ImplementationActivator implementationActivator;
-    RuntimeComponent runtimeComponent;
-    Implementation impl;
-    Object userImpl;
-    InvokerFactory factory;
-
-    List<InvokerProxy> invokers = new ArrayList<InvokerProxy>();
-
-    public ImplementationImplementationProvider(ImplementationActivator implementationActivator,
-                                                RuntimeComponent rc,
-                                                Implementation impl,
-                                                Object userImpl) {
-        this.implementationActivator = implementationActivator;
-        this.runtimeComponent = rc;
-        this.impl = impl;
-        this.userImpl = userImpl;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService arg0, final Operation op) {
-        InvokerProxy invoker = new InvokerProxy(op);
-        return invoker;
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-        factory = implementationActivator.createInvokerFactory(runtimeComponent, impl, userImpl);
-    }
-
-    public void stop() {
-    }
-
-    class InvokerProxy implements Invoker {
-        Invoker invoker;
-        Operation op;
-
-        InvokerProxy(Operation op) {
-            this.op = op;
-        }
-
-        public Message invoke(Message msg) {
-            init();
-            return invoker.invoke(msg);
-        }
-
-        public synchronized void init() {
-            if (invoker == null) {
-                invoker = factory.createInvoker(op);
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
deleted file mode 100644
index d156d835ad..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.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.extension.helper.impl;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.ModuleActivator;
-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.extension.helper.ImplementationActivator;
-import org.apache.tuscany.sca.extension.helper.utils.DefaultPropertyValueObjectFactory;
-import org.apache.tuscany.sca.extension.helper.utils.PropertyValueObjectFactory;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * A Tuscany ModuleActivator which activates all the ImplementationActivators
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationsActivator implements ModuleActivator {
-
-    protected List<ImplementationActivator> implementationActivators;
-    
-    public void start(ExtensionPointRegistry registry) {
-
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = factories.getFactory(AssemblyFactory.class);
-
-        DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
-        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class); 
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        
-        //FIXME Pass this factory differently as it's not an extension point
-        PropertyValueObjectFactory propertyFactory = new DefaultPropertyValueObjectFactory(mediator);
-        registry.addExtensionPoint(propertyFactory);
-
-        this.implementationActivators = DiscoveryUtils.discoverActivators(ImplementationActivator.class, registry);
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-
-        for (final ImplementationActivator implementationActivator : implementationActivators) {
-
-            Class<Implementation> implClass = implementationActivator.getImplementationClass();
-            QName scdlQName = getSCDLQName(implClass);
-            staxProcessors.addArtifactProcessor(new SCDLProcessor(assemblyFactory, scdlQName, implClass, registry, factories));
-
-            if (implementationActivator.getImplementationClass() != null && providerFactories != null) {
-                addImplementationProvider(implementationActivator, providerFactories);
-            }
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        StAXArtifactProcessorExtensionPoint staxProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        for (final ImplementationActivator implementationActivator : implementationActivators) {
-            if (staxProcessors != null) {
-                StAXArtifactProcessor processor = staxProcessors.getProcessor(getSCDLQName(implementationActivator.getImplementationClass()));
-                if (processor != null) {
-                    staxProcessors.removeArtifactProcessor(processor);
-                }
-            }
-        }
-    }
-
-    private void addImplementationProvider(final ImplementationActivator implementationActivator, ProviderFactoryExtensionPoint providerFactories) {
-
-        providerFactories.addProviderFactory(new ImplementationProviderFactory() {
-            public ImplementationProvider createImplementationProvider(final RuntimeComponent rc, final Implementation impl) {
-                if (impl instanceof PojoImplementation) {
-                    return new ImplementationImplementationProvider(implementationActivator, rc, impl, ((PojoImplementation)impl).getUserImpl());
-                } else {
-                    return new ImplementationImplementationProvider(implementationActivator, rc, impl, impl);
-                }
-            }
-            public Class getModelType() {
-                Class c = implementationActivator.getImplementationClass();
-
-                if (Implementation.class.isAssignableFrom(c)) {
-                    return c;
-                } else {
-                    return PojoImplementation.class;
-                }
-            }
-        });
-    }
-
-    protected QName getSCDLQName(Class implementationClass) {
-        String localName = implementationClass.getName();
-        if (localName.lastIndexOf('.') > -1) {
-            localName = localName.substring(localName.lastIndexOf('.') + 1);
-        }
-        if (localName.endsWith("Implementation")) {
-            localName = localName.substring(0, localName.length() - 14);
-        }
-        StringBuilder sb = new StringBuilder(localName);
-        for (int i=0; i<sb.length(); i++) {
-            if (Character.isUpperCase(sb.charAt(i))) {
-                sb.setCharAt(i, Character.toLowerCase(sb.charAt(i)));
-            } else {
-                break;
-            }
-        }
-        return new QName(Constants.SCA10_TUSCANY_NS, "implementation." + sb.toString());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
deleted file mode 100644
index de9a5bfbb1..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.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.extension.helper.impl;
-
-import org.apache.tuscany.sca.extension.helper.utils.AbstractBinding;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class PojoBinding extends AbstractBinding {
-
-    Object userBinding;
-    
-    public PojoBinding(Object userImpl) {
-        this.userBinding = userImpl;
-    }
-
-    public Object getUserBinding() {
-        return userBinding;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
deleted file mode 100644
index a59733aced..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.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.extension.helper.impl;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.extension.helper.utils.DynamicImplementation;
-
-/**
- * Enables Implementation extensions to use a simple POJO
- * for the implementation object instead of requiring
- * implementing the Implementation interface. 
- *
- * @version $Rev$ $Date$
- */
-public class PojoImplementation<Implementation> extends DynamicImplementation {
-    
-    Object userImpl;
-    
-    public PojoImplementation(Object userImpl) {
-        this.userImpl = userImpl;
-    }
-
-    public Object getUserImpl() {
-        return userImpl;
-    }
-    
-    public void resolve(ModelResolver resolver) {
-    	
-    	try {
-  		    Method resolveMethod;
-  		    if (userImpl != null &&
-  				  (resolveMethod = userImpl.getClass().getMethod("resolve", ModelResolver.class)) != null) {
-  			    resolveMethod.invoke(userImpl, resolver);
-  		  }
-  	    } catch (Exception e) {
-  	    }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
deleted file mode 100644
index c91618c24d..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.extension.helper.impl;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.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.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.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.extension.helper.utils.AbstractStAXArtifactProcessor;
-import org.apache.tuscany.sca.extension.helper.utils.DynamicImplementation;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * An SCDL ArtifactProcessor which uses the Implementation class getters/setters
- * to define the SCDL attributes.
- *
- * @version $Rev$ $Date$
- */
-public class SCDLProcessor extends AbstractStAXArtifactProcessor<Implementation> {
-
-    protected QName scdlQName;
-    protected Class<Implementation> implementationClass;
-    protected ExtensionPointRegistry registry;
-    protected ModelFactoryExtensionPoint factories;
-
-    protected Map<String, Method> attributeSetters;
-    protected Method elementTextSetter;
-
-    public SCDLProcessor(AssemblyFactory assemblyFactory, QName scdlQName, Class<Implementation> implementationClass, ExtensionPointRegistry registry, ModelFactoryExtensionPoint factories) {
-        super(assemblyFactory);
-        this.scdlQName = scdlQName;
-        this.implementationClass = implementationClass;
-        this.registry = registry;
-        this.factories = factories;
-        initAttributes();
-    }
-
-    protected void initAttributes() {
-        attributeSetters = new HashMap<String, Method>();
-        Set<Method> methods = new HashSet<Method>(Arrays.asList(implementationClass.getMethods()));
-        methods.removeAll(Arrays.asList(DynamicImplementation.class.getMethods()));
-        for (Method m : methods) {
-            if ("setElementText".equals(m.getName())) {
-                elementTextSetter = m;
-            } else if ((m.getName().startsWith("set"))) {
-                attributeSetters.put(getFieldName(m), m);
-            }
-        }
-    }
-
-    /**
-     * Remove get/set from method name, set 1st char to lowercase and
-     * remove any trailing underscore character
-     */
-    protected String getFieldName(Method m) {
-        StringBuilder sb = new StringBuilder(m.getName().substring(3));
-        sb.setCharAt(0, Character.toLowerCase(sb.charAt(0)));
-        String name = sb.toString();
-        if (name.endsWith("_")) {
-            name = name.substring(0,name.length()-1);
-        }
-        return name;
-    }
-
-    private Object[] getImplConstrArgs() {
-        Constructor[] cs = implementationClass.getConstructors();
-        if (cs.length != 1) {
-            throw new IllegalArgumentException("Implementation class must have a single constructor: "+ implementationClass.getName());
-        }
-        List args = new ArrayList();
-        for (Class c : cs[0].getParameterTypes()) {
-            Object o = factories.getFactory(c);
-            if (o == null) {
-                o = registry.getExtensionPoint(c);
-            }
-            args.add(o);
-        }
-        return args.toArray();
-    }
-
-    
-    public QName getArtifactType() {
-        return scdlQName;
-    }
-
-    public Class<Implementation> getModelType() {
-        Class clazz;
-        if (Implementation.class.isAssignableFrom(implementationClass)) {
-            clazz = implementationClass;
-        } else {
-            clazz = PojoImplementation.class;
-        }
-        return clazz;
-    }
-
-    public Implementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Object impl;
-        try {
-            impl = implementationClass.getConstructors()[0].newInstance(getImplConstrArgs());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        for (String attribute : attributeSetters.keySet()) {
-            String value = reader.getAttributeValue(null, attribute);
-            if (value != null && value.length() > 0) {
-                try {
-                    attributeSetters.get(attribute).invoke(impl, new Object[] {value});
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        if (elementTextSetter != null) {
-            try {
-                String value = reader.getElementText();
-                if (value != null && value.length() > 0) {
-                    elementTextSetter.invoke(impl, value);
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        while (!(reader.getEventType() == END_ELEMENT && scdlQName.equals(reader.getName())) && reader.hasNext()) {
-            reader.next();
-        }
-        
-        if (!(impl instanceof Implementation)) {
-            impl = new PojoImplementation(impl);
-        }
-
-        return (Implementation)impl;
-    }
-
-    public void write(Implementation arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {
-    }
-
-    @Override
-    protected void addSideFileComponentType(String name, Implementation impl, ModelResolver resolver) {
-//    protected void addSideFileComponentType(Implementation impl, ModelResolver resolver) {
-
-        ComponentType componentType;
-        try {
-            componentType = getComponentType(resolver, impl);
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-        if (componentType != null && !componentType.isUnresolved()) {
-            for (Reference reference : componentType.getReferences()) {
-                impl.getReferences().add(reference);
-            }
-            for (Service service : componentType.getServices()) {
-                impl.getServices().add(service);
-            }
-            for (Property property : componentType.getProperties()) {
-                impl.getProperties().add(property);
-            }
-            if (componentType.getConstrainingType() != null) {
-                impl.setConstrainingType(componentType.getConstrainingType());
-            }
-        }
-    }
-
-    ComponentType getComponentType(ModelResolver resolver, Implementation impl) throws IllegalArgumentException, IllegalAccessException,
-            InvocationTargetException {
-        for (Method m : getGetters()) {
-            Object io;
-            if (impl instanceof PojoImplementation) {
-                io = ((PojoImplementation) impl).getUserImpl();
-            } else {
-                io = impl;
-            }
-            String value = (String) m.invoke(io, new Object[] {});
-            if (value != null) {
-                value = value.substring(0, value.lastIndexOf('.'));
-                ComponentType componentType = assemblyFactory.createComponentType();
-                componentType.setUnresolved(true);
-                componentType.setURI(value + ".componentType");
-                componentType = resolver.resolveModel(ComponentType.class, componentType);
-                if (!componentType.isUnresolved()) {
-                    return componentType;
-                }
-            }
-        }
-        return null;
-    }
-
-    private List<Method> getGetters() {
-        List<Method> ms = new ArrayList<Method>();
-        for (Method setter : attributeSetters.values()) {
-            String s = getFieldName(setter);
-            for (Method m : implementationClass.getMethods()) {
-                String name = m.getName();
-                if (name.length() > 3 && name.startsWith("get")) {
-                    if (s.endsWith(name.substring(4))) {
-                        ms.add(m);
-                    }
-                }
-            }
-        }
-        return ms;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
deleted file mode 100644
index d5dc7d8644..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.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.extension.helper.utils;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Helper for implementing Bindings, implements all the
- * standard getters and setters on the binding interface.
- *
- * @version $Rev$ $Date$
- */
-public class AbstractBinding implements Binding {
-
-    private String name;
-    private String uri;
-    private List<Object> extensions;
-    private boolean unresolved;
-
-    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 unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
deleted file mode 100644
index 0e658cfd1e..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.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.extension.helper.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-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.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Helper for implementing Implementations, implements all the
- * standard getters and setters on the Implementation interface.
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractImplementation implements Implementation {
-
-    private List<Service> services = new ArrayList<Service>();
-    private List<Reference> references = new ArrayList<Reference>();
-    private List<Property> properties = new ArrayList<Property>();
-    private ConstrainingType constrainingType;
-    private String uri;
-    private boolean unresolved = true;
-    private List<ConfiguredOperation>  configuredOperations = new ArrayList<ConfiguredOperation>();
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private IntentAttachPointType type = null;
-
-    public AbstractImplementation() {
-    }
-
-    public List<Property> getProperties() {
-        return properties;
-    }
-
-    public List<Reference> getReferences() {
-        return references;
-    }
-
-    public List<Service> getServices() {
-        return services;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        return constrainingType;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        this.constrainingType = constrainingType;
-    }
-
-    public List<Object> getExtensions() {
-        // TODO what is this for?
-        return null;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public Service getService(String name) {
-        for (Service service : getServices()) {
-            if (service.getName().equals(name)) {
-                return service;
-            }
-        }
-        return null;
-    }
-
-    public Reference getReference(String name) {
-        for (Reference reference : getReferences()) {
-            if (reference.getName().equals(name)) {
-                return reference;
-            }
-        }
-        return null;
-    }
-    
-    public Property getProptery(String name) {
-        for (Property property : getProperties()) {
-            if (property.getName().equals(name)) {
-                return property;
-            }
-        }
-        return null;
-    }
-
-    public List<ConfiguredOperation> getConfiguredOperations() {
-        return configuredOperations;
-    }
-
-    //    public void setConfiguredOperations(List<ConfiguredOperation> configuredOperations) {
-    //        this.configuredOperations = configuredOperations;
-    //    }
-    
-        public List<PolicySet> getApplicablePolicySets() {
-            return applicablePolicySets;
-        }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
deleted file mode 100644
index 9a521b5b79..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.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.extension.helper.utils;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-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.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-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.impl.InterfaceContractImpl;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-
-/**
- * TODO: couldn't something like this class be provided by the runtime?
- * Each impl shouldn't have to have their own .componentType merging code
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractStAXArtifactProcessor<I extends Implementation> implements StAXArtifactProcessor<I> {
-
-    protected AssemblyFactory assemblyFactory;
-
-    public AbstractStAXArtifactProcessor(AssemblyFactory assemblyFactory) {
-        this.assemblyFactory = assemblyFactory;
-    }
-
-    public void resolve(I model, ModelResolver resolver) throws ContributionResolveException {
-
-      addSideFileComponentType(model.getURI(), model, resolver);
-
-      if (model instanceof DynamicImplementation) {
-          // if no services have been defined then add a dynamic one
-          if (model.getServices().size() < 1) {
-              Service dynamicService = createDynamicService();
-              model.getServices().add(dynamicService);
-          }
-      }
-      
-      // Allow implementation classes to resolve themselves
-      try {
-		  Method resolveMethod;
-		  if ((resolveMethod = model.getClass().getMethod("resolve", ModelResolver.class)) != null) {
-			  resolveMethod.invoke(model, resolver);
-		  }
-	  } catch (Exception e) {
-	  }
-
-      model.setUnresolved(false);
-    }
-
-    protected void addSideFileComponentType(String name, Implementation impl, ModelResolver resolver) {
-        if (name == null) {
-            return;
-        }
-        int lastDot = name.lastIndexOf('.');
-        if (lastDot < 0) {
-            return;
-        }
-        String sideFileName = name.substring(0, lastDot) + ".componentType";
-
-        ComponentType componentType = assemblyFactory.createComponentType();
-        componentType.setURI(sideFileName);
-        componentType.setUnresolved(true);
-
-        componentType = resolver.resolveModel(ComponentType.class, componentType);
-
-        if (!componentType.isUnresolved()) {
-            for (Reference reference : componentType.getReferences()) {
-                impl.getReferences().add(reference);
-            }
-            for (Service service : componentType.getServices()) {
-                impl.getServices().add(service);
-            }
-            for (Property property : componentType.getProperties()) {
-                impl.getProperties().add(property);
-            }
-            if (componentType.getConstrainingType() != null) {
-                impl.setConstrainingType(componentType.getConstrainingType());
-            }
-        }
-    }
-
-    protected Service createDynamicService() {
-        Service dynamicService = assemblyFactory.createService();
-        dynamicService.setName("$dynamic$");
-        InterfaceContract dynamicInterfaceContract = new InterfaceContractImpl() {};
-        Interface dynamicInterface = new DynamicInterfaceImpl();
-        Operation dynamicOperation = new OperationImpl();
-        dynamicOperation.setDynamic(true);
-        dynamicInterface.getOperations().add(dynamicOperation);
-        dynamicInterfaceContract.setInterface(dynamicInterface);
-        dynamicService.setInterfaceContract(dynamicInterfaceContract);
-
-        return dynamicService;
-    }
-    
-    private static class DynamicInterfaceImpl extends InterfaceImpl {
-        @Override
-        public boolean isDynamic() {
-            return true;
-        }
-        
-    }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
deleted file mode 100644
index 550498d7b1..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.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.extension.helper.utils;
-
-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;
-
-/**
- * TODO: Shouldn't this class be provided by the runtime?
- *
- * @version $Rev$ $Date$
- */
-public class DefaultPropertyValueObjectFactory implements PropertyValueObjectFactory {
-    // protected DataBindingRegistry dbRegistry = new DataBindingRegistryImpl();
-    protected Mediator mediator = null;
-    protected SimpleTypeMapper simpleTypeMapper = new SimpleTypeMapperImpl();
-    boolean isSimpleType;
-    
-    public DefaultPropertyValueObjectFactory(Mediator mediator) {
-        this.mediator = mediator;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.tuscany.sca.extension.helper.utils.PVOF#createValueFactory(org.apache.tuscany.sca.assembly.Property)
-     */
-    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);
-        }
-
-        @SuppressWarnings("unchecked")
-        public Object getInstance() throws ObjectCreationException {
-            if (isSimpleType) {
-                return simpleTypeMapper.toJavaObject(property.getXSDType(), (String)propertyValue, null);
-            } else {
-                return mediator.mediate(propertyValue, sourceDataType, targetDataType, null);
-                //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(mediator.mediate(aValue,
-                                                      sourceDataType,
-                                                      targetDataType,
-                                                      null));
-                }
-                return instances;
-            }
-        }
-    }
-}
-      
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
deleted file mode 100644
index dbfb9d089f..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.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.extension.helper.utils;
-
-import org.apache.tuscany.sca.assembly.Component;
-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.ComponentPreProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class DynamicImplementation extends AbstractImplementation implements ComponentPreProcessor {
-    
-    public void preProcess(Component component) {
-        RuntimeComponent rtc = (RuntimeComponent) component;
-        
-        for (Service service : rtc.getServices()) {
-            if (getService(service.getName()) == null) {
-                getServices().add(createService(service));
-            }
-        }
-        
-        Service dynamicService = getService("$dynamic$");
-        if (dynamicService != null && getServices().size() > 1) {
-            getServices().remove(dynamicService);
-            dynamicService = null;
-        }
-
-        for (Reference reference : rtc.getReferences()) {
-            if (getReference(reference.getName()) == null) {
-                getReferences().add(createReference(reference));
-            }
-        }
-        
-        for (Property property : rtc.getProperties()) {
-            if (getProptery(property.getName()) == null) {
-                getProperties().add(createProperty(property));
-            }
-        }
-        
-        // TODO: support properties
-    }
-    
-    protected Service createService(Service service) {
-        Service newService;
-        try {
-            newService = (Service)service.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // should not ever happen
-        }
-
-        return newService;
-    }
-
-    protected Reference createReference(Reference reference) {
-        Reference newReference;
-        try {
-            newReference = (Reference)reference.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // should not ever happen
-        }
-        return newReference;
-    }
-    
-    protected Property createProperty(Property property) {
-        Property newProperty;
-        try {
-            newProperty = (Property)property.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // should not ever happen
-        }
-        return newProperty;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
deleted file mode 100644
index f209825679..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.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.extension.helper.utils;
-
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface PropertyValueObjectFactory {
-
-    ObjectFactory createValueFactory(Property property);
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
deleted file mode 100644
index efa84c6816..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.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.extension.helper.utils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-
-/**
- * TODO: Shouldn't this be using the contribution service?
- *
- * @version $Rev$ $Date$
- */
-public class ResourceHelper {
-
-    public static String readResource(URL scriptSrcUrl) {
-        
-        InputStream is;
-        try {
-            is = scriptSrcUrl.openStream();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        try {
-
-            Reader reader = new InputStreamReader(is, "UTF-8");
-            char[] buffer = new char[1024];
-            StringBuilder source = new StringBuilder();
-            int count;
-            while ((count = reader.read(buffer)) > 0) {
-                source.append(buffer, 0, count);
-            }
-
-            return source.toString();
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                is.close();
-            } catch (IOException e) {
-                // ignore
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index a408b0d061..0000000000
--- a/tags/java/sca/1.3/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /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 ExtensionActivator

-org.apache.tuscany.sca.extension.helper.impl.ImplementationsActivator

-org.apache.tuscany.sca.extension.helper.impl.BindingsActivator

diff --git a/tags/java/sca/1.3/modules/host-embedded/LICENSE b/tags/java/sca/1.3/modules/host-embedded/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/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/tags/java/sca/1.3/modules/host-embedded/NOTICE b/tags/java/sca/1.3/modules/host-embedded/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/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/tags/java/sca/1.3/modules/host-embedded/pom.xml b/tags/java/sca/1.3/modules/host-embedded/pom.xml
deleted file mode 100644
index 4199aa2e37..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-host-embedded</artifactId>
-    <name>Apache Tuscany SCA Embedded Host</name>
-
-    <dependencies>
-    	<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint</artifactId>
-            <version>1.3</version>
-            <scope>runtime</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.host.embedded</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.embedded*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
deleted file mode 100644
index 00e6f49f84..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ /dev/null
@@ -1,284 +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.host.embedded;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Constructor;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A handle to an SCA domain.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class SCADomain {
-    
-    static final String LOCAL_DOMAIN_URI = "http://localhost";
-
-    /**
-     * Static variable to hold the most recent instance of SCADomain
-     */
-    // TODO: Temporary support for SCADomain.connect() API
-    protected static SCADomain theDomain;
-
-    
-    /**
-     * Returns a new instance of a local SCA domain.
-     *  
-     * @return
-     */
-    public static SCADomain newInstance() {
-        return createNewInstance(LOCAL_DOMAIN_URI, null);
-    }
-    
-    /**
-     * Returns a new instance of a local SCA domain. The specified deployable
-     * composite will be included in the SCA domain.
-     * 
-     * @param composite the deployable composite to include in the SCA domain.
-     * @return
-     */
-    public static SCADomain newInstance(String composite) {
-        return createNewInstance(LOCAL_DOMAIN_URI, "/", composite);
-    }
-    
-    /**
-     * Returns a new instance of a local SCA domain. The specified deployable
-     * composites will be included in the SCA domain.
-     * 
-     * @param domainURI the URI of the SCA domain
-     * @param contributionLocation the location of an SCA contribution
-     * @param composites the deployable composites to include in the SCA domain.
-     * @return
-     */
-    public static SCADomain newInstance(String domainURI, String contributionLocation, String... composites) {
-        return createNewInstance(domainURI, contributionLocation, composites);
-    }
-
-    /**
-     * Removes the specified local SCA Domain instance
-     * 
-     * @param domainInstance the instance to be removed
-     */
-    // FIXME: Adding this as temporary support for the "connect" API
-    public static void removeInstance(SCADomain domainInstance) {
-        theDomain = null;
-    }
-
-    /**
-     * Returns an SCADomain representing a remote SCA domain.
-     * 
-     * @param domainURI the URI of the SCA domain
-     * @return
-     */
-    // FIXME : this is a temporary implementation to get the capability working
-    public static SCADomain connect(String domainURI) {
-        return theDomain;
-    }
-
-    /**
-     * Close the SCA domain.
-     */
-    public void close() {
-        // TODO: temporary to support initial SCADomain.connect capability
-        SCADomain.removeInstance(this);
-    }
-
-    /**
-     * Returns the URI of the SCA Domain.
-     * 
-     * @return the URI of the SCA Domain
-     */
-    public abstract 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
-     */
-    public abstract <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException;
-
-    /**
-     * Returns a proxy for a service provided by a component in the SCA domain.
-     * 
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return an object that implements the business interface
-     */
-    public abstract <B> B getService(Class<B> businessInterface, String serviceName);
-
-    /**
-     * Returns a ServiceReference for a service provided by a component in the
-     * SCA domain.
-     * 
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return a ServiceReference for the designated service
-     */
-    public abstract <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName);
-
-    /**
-     * Read the service name from a configuration file
-     * 
-     * @param classLoader
-     * @param name The name of the service class
-     * @return A class name which extends/implements the service class
-     * @throws IOException
-     */
-    private static String getServiceName(final ClassLoader classLoader, final String name) throws IOException {
-        InputStream is;
-        // Allow privileged access to open stream. Requires FilePermission in security policy.
-        try {
-            is = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-                public InputStream run() throws IOException {
-                    return classLoader.getResourceAsStream("META-INF/services/" + name);
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (IOException)e.getException();
-        }
-                
-        if (is == null) {
-            return null;
-        }
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(is));
-            while (true) {
-                String line = reader.readLine();
-                if (line == null) {
-                    break;
-                } else if (!line.startsWith("#")) {
-                    return line.trim();
-                }
-            }
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns an SCADomain instance. If the system property
-     * "org.apache.tuscany.sca.host.embedded.SCADomain" is set, its value is used as
-     * the name of the implementation class. Otherwise, if the resource
-     * "META-INF/services/org.apache.tuscany.sca.host.embedded.SCADomain" can be
-     * loaded from the supplied ClassLoader. Otherwise, it will use
-     * "org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain" as the default.
-     * The named class is loaded from the supplied ClassLoader.
-     * 
-     * @param classLoader
-     * @param domainURI
-     * @param contributionLocation
-     * @param composites
-     * @return
-     */
-    static SCADomain createNewInstance(String domainURI, String contributionLocation, String... composites) {
-
-        SCADomain domain = null;
-
-        try {
-            // Determine the runtime and application ClassLoader
-            final ClassLoader runtimeClassLoader = SCADomain.class.getClassLoader();
-            final ClassLoader applicationClassLoader = Thread.currentThread().getContextClassLoader();
-            
-            // Discover the SCADomain implementation
-            final String name = SCADomain.class.getName();
-            String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty(name);
-                }
-            });
-
-            if (className == null) {
-                className = getServiceName(runtimeClassLoader, name);
-            }
-            
-            if (className == null) {
-                
-                // Create a default SCA domain implementation
-                domain =
-                    new DefaultSCADomain(runtimeClassLoader,
-                                         applicationClassLoader,
-                                         domainURI,
-                                         contributionLocation,
-                                         composites);
-            } else {
-                
-                // Create an instance of the discovered SCA domain implementation
-                Class cls = Class.forName(className, true, runtimeClassLoader);
-                Constructor<?> constructor = null;
-                try {
-                    constructor = cls.getConstructor(ClassLoader.class, ClassLoader.class,
-                                                     String.class, String.class, String[].class);
-                } catch (NoSuchMethodException e) {}
-                if (constructor != null) {
-                    domain = (SCADomain)constructor.newInstance(runtimeClassLoader,
-                                                                applicationClassLoader,
-                                                                domainURI,
-                                                                contributionLocation,
-                                                                composites);
-                } else {
-                    
-                    constructor = cls.getConstructor(ClassLoader.class, String.class);
-                    domain = (SCADomain)constructor.newInstance(runtimeClassLoader, domainURI);
-                }
-            }
-            
-            // FIXME: temporary support for connect() API
-            theDomain = domain;
-            
-            return domain;
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public ComponentManager getComponentManager() {
-        return null; 
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
deleted file mode 100644
index c9bfe499c6..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.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.host.embedded;
-
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class SCADomainBean extends SCADomain {
-    
-    private SCADomain instance;
-    
-    private String uri = LOCAL_DOMAIN_URI;
-    private String location = "/";
-    private String[] composites;
-
-    /**
-     * Constructs a new SCA domain
-     */
-    public SCADomainBean() {
-    }
-
-    @Override
-    public String getURI() {
-        return uri;
-    }
-    
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    public void setContributionLocation(String contributionLocation) {
-        this.location = contributionLocation;
-    }
-    
-    public String getContributionLocation() {
-        return location;
-    }
-
-    public void setDeployableComposite(String composite) {
-        setDeployableComposites(composite);
-    }
-    
-    public void setDeployableComposites(String... composites) {
-        this.composites = composites;
-    }
-    
-    public String[] getDeployableComposites() {
-        return composites;
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        if (instance == null) {
-            instance = SCADomain.createNewInstance(uri, location, composites);
-        }
-        Object result = instance.cast(target); 
-        return (R) result;
-    }
-
-    @Override
-    public void close() {
-        if (instance == null) {
-            instance = SCADomain.createNewInstance(uri, location, composites);
-        }
-        instance.close();
-        instance = null;
-    }
-
-    @Override
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        if (instance == null) {
-            instance = SCADomain.createNewInstance(uri, location, composites);
-        }
-        return instance.getService(businessInterface, serviceName);
-    }
-
-    @Override
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) {
-        if (instance == null) {
-            instance = SCADomain.createNewInstance(uri, location, composites);
-        }
-        return instance.getServiceReference(businessInterface, referenceName);
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        
-        // Make sure that the SCA domain is closed
-        if (instance != null) {
-            instance.close();
-            instance = null;
-        }
-    }
-
-    @Override
-    public ComponentManager getComponentManager() {
-        if (instance == null) {
-            instance = SCADomain.createNewInstance(uri, location, composites);
-        }
-        return instance.getComponentManager();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
deleted file mode 100644
index e299bcc524..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.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.    
- */
-package org.apache.tuscany.sca.host.embedded;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader.
- * 
- * @version $Rev$ $Date$
- */
-public class SCATestCaseRunner {
-
-    private ClassLoader classLoader;
-    private Class<?> testSuiteClass;
-    private Object testSuite;
-    private Class<?> testResultClass;
-    private Class<?> testCaseClass;
-    private Object testCase;
-
-    private Class<?> beforeAnnotation;
-    private Class<?> beforeClassAnnotation;
-    private Class<?> afterAnnotation;
-    private Class<?> afterClassAnnotation;
-    private Class<?> junit4AdapterClass;
-    private Class<?> junit3TestCaseClass;
-
-    /**
-     * Constructs a new TestCase runner.
-     * 
-     * @param testClass
-     */
-    public SCATestCaseRunner(Class testClass) {
-        try {
-            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            classLoader = testClass.getClassLoader();
-            if (classLoader instanceof URLClassLoader) {
-                URL[] urls = ((URLClassLoader)classLoader).getURLs();
-                classLoader = new URLClassLoader(urls, classLoader.getParent());
-            } else if (classLoader == tccl || classLoader.getParent() == tccl) {
-                classLoader = new URLClassLoader(new URL[0], classLoader);
-            } else {
-                classLoader = tccl;
-            }
-
-            try {
-                // Thread.currentThread().setContextClassLoader(classLoader);
-                // Allow privileged access to set class loader. Requires RuntimePermission
-                // setContextClassLoader in security policy.
-                final ClassLoader finalClassLoader = classLoader;
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        Thread.currentThread().setContextClassLoader(finalClassLoader);
-                        return null;
-                    }
-                });                     
-                
-                testCaseClass = Class.forName(testClass.getName(), true, classLoader);
-                testCase = testCaseClass.newInstance();
-                ClassLoader testClassLoader = testCaseClass.getClassLoader();
-
-                junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader);
-
-                testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader);
-                Constructor testSuiteConstructor = testSuiteClass.getConstructor(Class.class);
-                testSuite = testSuiteConstructor.newInstance(testCaseClass);
-
-                testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader);
-
-                try {
-                    beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader);
-                    afterAnnotation = Class.forName("org.junit.After", true, testClassLoader);
-                    beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader);
-                    afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader);
-                    junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader);
-                } catch (Exception e) {
-                    // Unexpected
-                    throw new AssertionError(e);
-                }
-            } catch (Throwable e) {
-                System.out.println( "DOB: Caught bad throwable");
-                e.printStackTrace();
-            } finally {
-                // Thread.currentThread().setContextClassLoader(tccl);
-                // Allow privileged access to set class loader. Requires RuntimePermission
-                // setContextClassLoader in security policy.
-                final ClassLoader finaltccl = tccl;
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        Thread.currentThread().setContextClassLoader(finaltccl);
-                        return null;
-                    }
-                });
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Run the test case
-     */
-    public void run() {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });                     
-
-            if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) {
-                Object testResult = testResultClass.newInstance();
-                Method runMethod = testSuiteClass.getMethod("run", testResultClass);
-                runMethod.invoke(testSuite, testResult);
-            } else {
-                Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass);
-                Object testResult = testResultClass.newInstance();
-                Method runMethod = junit4AdapterClass.getMethod("run", testResultClass);
-                runMethod.invoke(junit4Adapter, testResult);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-    /**
-     * Invoke the setUp method
-     */
-    public void setUp() {
-        execute("setUp");
-    }
-
-    /**
-     * Invoke the before methods
-     */
-    public void before() {
-        execute(beforeAnnotation);
-    }
-
-    /**
-     * Invoke the beforeClass methods
-     */
-    public void beforeClass() {
-        execute(beforeClassAnnotation);
-    }
-
-    /**
-     * Invoke the tearDown method
-     */
-    public void tearDown() {
-        execute("tearDown");
-    }
-
-    /**
-     * Invoke the after methods
-     */
-    public void after() {
-        execute(afterAnnotation);
-    }
-
-    /**
-     * Invoke the afterClass methods
-     */
-    public void afterClass() {
-        execute(afterClassAnnotation);
-    }
-
-    /**
-     * Invoke the specified test method.
-     */
-    public void run(String methodName) {
-        execute(methodName);
-    }
-
-    /**
-     * Invoke the methods annotated with the specified annotation.
-     */
-    private void execute(Class<?> annotationClass) {
-        if (annotationClass == null) {
-            throw new RuntimeException(new NoSuchMethodException());
-        }
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });                     
-
-            for (Method method : testCaseClass.getDeclaredMethods()) {
-                for (Annotation annotation : method.getAnnotations()) {
-                    if (annotation.annotationType() == annotationClass) {
-                        method.invoke(testCase);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-    /**
-     * Invoke the specified method
-     */
-    private void execute(String methodName) {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });                     
-            Method setUpMethod = testCaseClass.getDeclaredMethod(methodName);
-            setUpMethod.setAccessible(true);
-            setUpMethod.invoke(testCase);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
deleted file mode 100644
index 187f32f405..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.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.host.embedded.impl;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.RuntimeComponentImpl;
-import org.apache.tuscany.sca.host.embedded.management.ComponentListener;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-
-/**
- * Implementation of the ComponentManager.
- *
- * @version $Rev$ $Date$
- */
-public class ComponentManagerImpl implements ComponentManager {
-
-    protected List<ComponentListener> listeners = new CopyOnWriteArrayList<ComponentListener>();
-    protected EmbeddedSCADomain domain;
-
-    public ComponentManagerImpl(EmbeddedSCADomain domain) {
-        this.domain = domain;
-    }
-
-    public void addComponentListener(ComponentListener listener) {
-        this.listeners.add(listener);
-    }
-
-    public void removeComponentListener(ComponentListener listener) {
-        this.listeners.remove(listener);
-    }
-
-    public Set<String> getComponentNames() {
-        Set<String> names = new HashSet<String>();
-        for (Composite composite: domain.getDomainComposite().getIncludes()) {
-            for (Component component: composite.getComponents()) {
-                names.add(component.getName());
-            }
-        }
-        return names;
-    }
-
-    public Component getComponent(String componentName) {
-        for (Composite composite: domain.getDomainComposite().getIncludes()) {
-            for (Component component: composite.getComponents()) {
-                if (component.getName().equals(componentName)) {
-                    return component;
-                }
-            }
-        }
-        return null;
-    }
-
-    public void startComponent(String componentName) throws ActivationException {
-        Component component = getComponent(componentName);
-        if (component == null) {
-            throw new IllegalArgumentException("no component: " + componentName);
-        }
-        domain.getCompositeActivator().start(component);
-        notifyComponentStarted(componentName);
-    }
-
-    public void stopComponent(String componentName) throws ActivationException {
-        Component component = getComponent(componentName);
-        if (component == null) {
-            throw new IllegalArgumentException("no component: " + componentName);
-        }
-        domain.getCompositeActivator().stop(component);
-        notifyComponentStopped(componentName);
-    }
-
-    public void notifyComponentStarted(String componentName) {
-        for (ComponentListener listener : listeners) {
-            try {
-                listener.componentStarted(componentName);
-            } catch (Exception e) {
-                e.printStackTrace(); // TODO: log
-            }
-        }
-    }
-
-    public void notifyComponentStopped(String componentName) {
-        for (ComponentListener listener : listeners) {
-            try {
-                listener.componentStopped(componentName);
-            } catch (Exception e) {
-                e.printStackTrace(); // TODO: log
-            }
-        }
-    }
-
-    public boolean isComponentStarted(String componentName) {
-        RuntimeComponentImpl runtimeComponent = (RuntimeComponentImpl)getComponent(componentName);
-        return runtimeComponent.isStarted();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
deleted file mode 100644
index 875a139ca2..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.embedded.impl;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AccessController;
-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.concurrent.CopyOnWriteArrayList;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionException;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeComponentImpl;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.management.ComponentListener;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-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.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A default SCA domain facade implementation.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultSCADomain extends SCADomain {
-
-    private String uri;
-    private String[] composites;
-    private Composite domainComposite;
-    private List<Contribution> contributions;
-    private Map<String, Component> components;
-    private ReallySmallRuntime runtime;
-    private ComponentManager componentManager;
-    private ClassLoader runtimeClassLoader;
-    private ClassLoader applicationClassLoader;
-    private String domainURI;
-    private String contributionLocation;
-    private Monitor monitor;
-
-    /**
-     * Constructs a new domain facade.
-     * 
-     * @param domainURI
-     * @param contributionLocation
-     * @param composites
-     */
-    public DefaultSCADomain(ClassLoader runtimeClassLoader,
-                            ClassLoader applicationClassLoader,
-                            String domainURI,
-                            String contributionLocation,
-                            String... composites) {
-        this.uri = domainURI;
-        this.composites = composites;
-        this.runtimeClassLoader = runtimeClassLoader;
-        this.applicationClassLoader = applicationClassLoader;
-        this.domainURI = domainURI;
-        this.contributionLocation = contributionLocation;
-        this.composites = composites;
-
-        init();
-
-    }
-
-    public void init() {
-        contributions = new ArrayList<Contribution>();
-        components = new HashMap<String, Component>();
-        runtime = new ReallySmallRuntime(runtimeClassLoader);
-        try {
-            runtime.start();
-
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        
-        ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-
-        // Contribute the given contribution to an in-memory repository
-        ContributionService contributionService = runtime.getContributionService();
-        URL contributionURL;
-        try {
-            contributionURL = getContributionLocation(applicationClassLoader, contributionLocation, this.composites);
-            if (contributionURL != null) {
-                // Make sure the URL is correctly encoded (for example, escape the space characters) 
-                contributionURL = contributionURL.toURI().toURL();
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-        try {
-            String scheme = contributionURL.toURI().getScheme();
-            if (scheme == null || scheme.equalsIgnoreCase("file")) {
-                final File contributionFile = new File(contributionURL.toURI());
-                // Allow privileged access to test file. Requires FilePermission in security policy.
-                Boolean isDirectory = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
-                    public Boolean run() {
-                        return contributionFile.isDirectory();
-                    }
-                });
-                if (isDirectory) {
-                    // Allow privileged access to create file list. Requires FilePermission in
-                    // security policy.
-                    String[] contributions = AccessController.doPrivileged(new PrivilegedAction<String[]>() {
-                        public String[] run() {
-                            return contributionFile.list(new FilenameFilter() {
-                                public boolean accept(File dir, String name) {
-                                    return name.endsWith(".jar");
-                                }
-                            });
-                        }
-                    });
-
-                    if (contributions != null && contributions.length > 0
-                        && contributions.length == contributionFile.list().length) {
-                        for (String contribution : contributions) {
-                            addContribution(contributionService, new File(contributionFile, contribution).toURI()
-                                .toURL());
-                        }
-                    } else {
-                        addContribution(contributionService, contributionURL);
-                    }
-                } else {
-                    addContribution(contributionService, contributionURL);
-                }
-            } else {
-                addContribution(contributionService, contributionURL);
-            }
-        } catch (IOException e) {
-            throw new ServiceRuntimeException(e);
-        } catch (URISyntaxException e) {
-            throw new ServiceRuntimeException(e);
-        }
-
-        // Create an in-memory domain level composite
-        AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-        domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
-        domainComposite.setURI(domainURI);
-
-        //when the deployable composites were specified when initializing the runtime
-        if (composites != null && composites.length > 0 && composites[0].length() > 0) {
-            // Include all specified deployable composites in the SCA domain
-            Map<String, Composite> compositeArtifacts = new HashMap<String, Composite>();
-            for (Contribution contribution : contributions) {
-                for (Artifact artifact : contribution.getArtifacts()) {
-                    if (artifact.getModel() instanceof Composite) {
-                        compositeArtifacts.put(artifact.getURI(), (Composite)artifact.getModel());
-                    }
-                }
-            }
-            for (String compositePath : composites) {
-                Composite composite = compositeArtifacts.get(compositePath);
-                if (composite == null) {
-                    throw new ServiceRuntimeException("Composite not found: " + compositePath);
-                }
-                domainComposite.getIncludes().add(composite);
-            }
-        } else {
-            // in this case, a sca-contribution.xml should have been specified
-            for (Contribution contribution : contributions) {
-                for (Composite composite : contribution.getDeployables()) {
-                    domainComposite.getIncludes().add(composite);
-                }
-            }
-        }
-
-        //update the runtime for all SCA Definitions processed from the contribution..
-        //so that the policyset determination done during 'build' has the all the defined
-        //intents and policysets
-        //runtime.updateSCADefinitions(null);
-
-        // Build the SCA composites
-        for (Composite composite : domainComposite.getIncludes()) {
-            try {
-                runtime.buildComposite(composite);
-                analyseProblems();
-            } catch (CompositeBuilderException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        // Activate and start composites
-        CompositeActivator compositeActivator = runtime.getCompositeActivator();
-        compositeActivator.setDomainComposite(domainComposite);
-        for (Composite composite : domainComposite.getIncludes()) {
-            try {
-                compositeActivator.activate(composite);
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-        for (Composite composite : domainComposite.getIncludes()) {
-            try {
-                for (Component component : composite.getComponents()) {
-                    compositeActivator.start(component);
-                }
-            } catch (Exception e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        // Index the top level components
-        for (Composite composite : domainComposite.getIncludes()) {
-            for (Component component : composite.getComponents()) {
-                components.put(component.getName(), component);
-            }
-        }
-
-        this.componentManager = new DefaultSCADomainComponentManager(this);
-
-        // For debugging purposes, print the composites
-        //        ExtensionPointRegistry extensionPoints = runtime.getExtensionPointRegistry();
-        //        StAXArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        //        StAXArtifactProcessor processor = artifactProcessors.getProcessor(Composite.class);
-        //        for (Composite composite : domainComposite.getIncludes()) {
-        //            try {
-        //                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        //                XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
-        //                outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-        //                processor.write(composite, outputFactory.createXMLStreamWriter(bos));
-        //                Document document =
-        //                    DocumentBuilderFactory.newInstance().newDocumentBuilder().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);
-        //            } catch (Exception e) {
-        //                e.printStackTrace();
-        //            }
-        //        }
-    }
-    
-    private void analyseProblems() throws ServiceRuntimeException {
-        
-        for (Problem problem : monitor.getProblems()){
-            // look for any reported errors. Schema errors are filtered
-            // out as there are several that are generally reported at the
-            // moment and we don't want to stop 
-            if ((problem.getSeverity() == Severity.ERROR) &&
-                 (!problem.getMessageId().equals("SchemaError"))){
-                if (problem.getCause() != null){
-                    throw new ServiceRuntimeException(problem.getCause());
-                } else {
-                    throw new ServiceRuntimeException(problem.toString());
-                }    
-            }
-        }
-    }    
-
-    protected void addContribution(final ContributionService contributionService, final URL contributionURL) throws IOException {
-        String contributionURI = FileHelper.getName(contributionURL.getPath());
-        if (contributionURI == null || contributionURI.length() == 0) {
-            contributionURI = contributionURL.toString();
-        }
-        // Allow privileged access to load resources. Requires RuntimePermission in security
-        // policy.
-        final String finalContributionURI = contributionURI;
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws ContributionException, IOException {
-                    contributions.add(contributionService.contribute(finalContributionURI, contributionURL, false));
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw new ServiceRuntimeException(e.getException());
-        }
-        
-        analyseProblems();
-    }
-
-    @Override
-    public void close() {
-
-        super.close();
-
-        // Stop and deactivate composites
-        CompositeActivator compositeActivator = runtime.getCompositeActivator();
-        for (Composite composite : domainComposite.getIncludes()) {
-            try {
-                for (Component component : composite.getComponents()) {
-                    compositeActivator.stop(component);
-                }
-            } catch (ActivationException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-        for (Composite composite : domainComposite.getIncludes()) {
-            try {
-                compositeActivator.deactivate(composite);
-            } catch (ActivationException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        // Remove the contribution from the in-memory repository
-        ContributionService contributionService = runtime.getContributionService();
-        for (Contribution contribution : contributions) {
-            try {
-                contributionService.remove(contribution.getURI());
-            } catch (ContributionException e) {
-                throw new ServiceRuntimeException(e);
-            }
-        }
-
-        // Stop the runtime
-        try {
-            runtime.stop();
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Determine the location of a contribution, given a contribution path and a
-     * list of composites.
-     * 
-     * @param contributionPath
-     * @param composites
-     * @param classLoader
-     * @return
-     * @throws MalformedURLException
-     */
-    protected URL getContributionLocation(ClassLoader classLoader, String contributionPath, String[] composites)
-        throws MalformedURLException {
-        if (contributionPath != null && contributionPath.length() > 0) {
-            //encode spaces as they would cause URISyntaxException
-            contributionPath = contributionPath.replace(" ", "%20");
-            URI contributionURI = URI.create(contributionPath);
-            if (contributionURI.isAbsolute() || composites.length == 0) {
-                return new URL(contributionPath);
-            }
-        }
-
-        String contributionArtifactPath = null;
-        URL contributionArtifactURL = null;
-        if (composites != null && composites.length > 0 && composites[0].length() > 0) {
-
-            // Here the SCADomain was started with a reference to a composite file
-            contributionArtifactPath = composites[0];
-            contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
-            if (contributionArtifactURL == null) {
-                throw new IllegalArgumentException("Composite not found: " + contributionArtifactPath);
-            }
-        } else {
-
-            // Here the SCADomain was started without any reference to a composite file
-            // We are going to look for an sca-contribution.xml or sca-contribution-generated.xml
-
-            // Look for META-INF/sca-contribution.xml
-            contributionArtifactPath = Contribution.SCA_CONTRIBUTION_META;
-            contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
-
-            // Look for META-INF/sca-contribution-generated.xml
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_GENERATED_META;
-                contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
-            }
-
-            // Look for META-INF/sca-deployables directory
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
-                contributionArtifactURL = classLoader.getResource(contributionArtifactPath);
-            }
-        }
-
-        if (contributionArtifactURL == null) {
-            throw new IllegalArgumentException(
-                                               "Can't determine contribution deployables. Either specify a composite file, or use an sca-contribution.xml file to specify the deployables.");
-        }
-
-        URL contributionURL = null;
-        // "jar:file://....../something.jar!/a/b/c/app.composite"
-        try {
-            String url = contributionArtifactURL.toExternalForm();
-            String protocol = contributionArtifactURL.getProtocol();
-            if ("file".equals(protocol)) {
-                // directory contribution
-                if (url.endsWith(contributionArtifactPath)) {
-                    final String location = url.substring(0, url.lastIndexOf(contributionArtifactPath));
-                    // workaround from evil URL/URI form Maven
-                    // contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-                    // Allow privileged access to open URL stream. Add FilePermission to added to
-                    // security policy file.
-                    try {
-                        contributionURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {
-                            public URL run() throws IOException {
-                                return FileHelper.toFile(new URL(location)).toURI().toURL();
-                            }
-                        });
-                    } catch (PrivilegedActionException e) {
-                        throw (MalformedURLException)e.getException();
-                    }
-                }
-
-            } else if ("jar".equals(protocol)) {
-                // jar contribution
-                String location = url.substring(4, url.lastIndexOf("!/"));
-                // workaround for evil URL/URI from Maven
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if ("wsjar".equals(protocol)) {
-                // See https://issues.apache.org/jira/browse/TUSCANY-2219
-                // wsjar contribution 
-                String location = url.substring(6, url.lastIndexOf("!/"));
-                // workaround for evil url/uri from maven 
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if (protocol != null && (protocol.equals("bundle") || protocol.equals("bundleresource"))) {
-                contributionURL =
-                    new URL(contributionArtifactURL.getProtocol(), contributionArtifactURL.getHost(),
-                            contributionArtifactURL.getPort(), "/");
-            }
-        } catch (MalformedURLException mfe) {
-            throw new IllegalArgumentException(mfe);
-        }
-
-        return contributionURL;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)runtime.getProxyFactory().cast(target);
-    }
-
-    @Override
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);
-        if (serviceReference == null) {
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        }
-        return serviceReference.getService();
-    }
-
-    private <B> ServiceReference<B> createServiceReference(Class<B> businessInterface, String targetURI) {
-        try {
-            AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-            Composite composite = assemblyFactory.createComposite();
-            composite.setName(new QName(Constants.SCA10_TUSCANY_NS, "default"));
-            RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent();
-            component.setName("default");
-            component.setURI("default");
-            runtime.getCompositeActivator().configureComponentContext(component);
-            composite.getComponents().add(component);
-            RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference();
-            reference.setName("default");
-            ModelFactoryExtensionPoint factories =
-                runtime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);
-            JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class);
-            InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-            interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
-            reference.setInterfaceContract(interfaceContract);
-            component.getReferences().add(reference);
-            reference.setComponent(component);
-            SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-            SCABinding binding = scaBindingFactory.createSCABinding();
-            binding.setURI(targetURI);
-            reference.getBindings().add(binding);
-            return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, runtime
-                .getProxyFactory(), runtime.getCompositeActivator());
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    @Override
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {
-
-        // Extract the component name
-        String componentName;
-        String serviceName;
-        int i = name.indexOf('/');
-        if (i != -1) {
-            componentName = name.substring(0, i);
-            serviceName = name.substring(i + 1);
-
-        } else {
-            componentName = name;
-            serviceName = null;
-        }
-
-        // Lookup the component in the domain
-        Component component = components.get(componentName);
-        if (component == null) {
-            // The component is not local in the partition, try to create a remote service ref
-            return createServiceReference(businessInterface, name);
-        }
-        RuntimeComponentContext componentContext = null;
-
-        // If the component is a composite, then we need to find the
-        // non-composite component that provides the requested service
-        if (component.getImplementation() instanceof Composite) {
-            for (ComponentService componentService : component.getServices()) {
-                if (serviceName == null || serviceName.equals(componentService.getName())) {
-                    CompositeService compositeService = (CompositeService)componentService.getService();
-                    if (compositeService != null) {
-                        if (serviceName != null) {
-                            serviceName = "$promoted$." + component.getName() + "." + serviceName;
-                        }
-                        componentContext =
-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
-                        return componentContext.createSelfReference(businessInterface, compositeService
-                            .getPromotedService());
-                    }
-                    break;
-                }
-            }
-            // No matching service is found
-            throw new ServiceRuntimeException("Composite service not found: " + name);
-        } else {
-            componentContext = ((RuntimeComponent)component).getComponentContext();
-            if (serviceName != null) {
-                return componentContext.createSelfReference(businessInterface, serviceName);
-            } else {
-                return componentContext.createSelfReference(businessInterface);
-            }
-        }
-
-    }
-
-    @Override
-    public String getURI() {
-        return uri;
-    }
-
-    @Override
-    public ComponentManager getComponentManager() {
-        return componentManager;
-    }
-
-    public Set<String> getComponentNames() {
-        Set<String> componentNames = new HashSet<String>();
-        for (Contribution contribution : contributions) {
-            for (Artifact artifact : contribution.getArtifacts()) {
-                if (artifact.getModel() instanceof Composite) {
-                    for (Component component : ((Composite)artifact.getModel()).getComponents()) {
-                        componentNames.add(component.getName());
-                    }
-                }
-            }
-        }
-        return componentNames;
-    }
-
-    public Component getComponent(String componentName) {
-        for (Contribution contribution : contributions) {
-            for (Artifact artifact : contribution.getArtifacts()) {
-                if (artifact.getModel() instanceof Composite) {
-                    for (Component component : ((Composite)artifact.getModel()).getComponents()) {
-                        if (component.getName().equals(componentName)) {
-                            return component;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public void startComponent(String componentName) throws ActivationException {
-        Component component = getComponent(componentName);
-        if (component == null) {
-            throw new IllegalArgumentException("no component: " + componentName);
-        }
-        CompositeActivator compositeActivator = runtime.getCompositeActivator();
-        compositeActivator.start(component);
-    }
-
-    public void stopComponent(String componentName) throws ActivationException {
-        Component component = getComponent(componentName);
-        if (component == null) {
-            throw new IllegalArgumentException("no component: " + componentName);
-        }
-        CompositeActivator compositeActivator = runtime.getCompositeActivator();
-        compositeActivator.stop(component);
-    }
-}
-
-class DefaultSCADomainComponentManager implements ComponentManager {
-
-    protected DefaultSCADomain scaDomain;
-    protected List<ComponentListener> listeners = new CopyOnWriteArrayList<ComponentListener>();
-
-    public DefaultSCADomainComponentManager(DefaultSCADomain scaDomain) {
-        this.scaDomain = scaDomain;
-    }
-
-    public void addComponentListener(ComponentListener listener) {
-        this.listeners.add(listener);
-    }
-
-    public void removeComponentListener(ComponentListener listener) {
-        this.listeners.remove(listener);
-    }
-
-    public Set<String> getComponentNames() {
-        return scaDomain.getComponentNames();
-    }
-
-    public Component getComponent(String componentName) {
-        return scaDomain.getComponent(componentName);
-    }
-
-    public void startComponent(String componentName) throws ActivationException {
-        scaDomain.startComponent(componentName);
-    }
-
-    public void stopComponent(String componentName) throws ActivationException {
-        scaDomain.stopComponent(componentName);
-    }
-
-    public void notifyComponentStarted(String componentName) {
-        for (ComponentListener listener : listeners) {
-            try {
-                listener.componentStarted(componentName);
-            } catch (Exception e) {
-                e.printStackTrace(); // TODO: log
-            }
-        }
-    }
-
-    public void notifyComponentStopped(String componentName) {
-        for (ComponentListener listener : listeners) {
-            try {
-                listener.componentStopped(componentName);
-            } catch (Exception e) {
-                e.printStackTrace(); // TODO: log
-            }
-        }
-    }
-
-    public boolean isComponentStarted(String componentName) {
-        RuntimeComponentImpl runtimeComponent = (RuntimeComponentImpl)getComponent(componentName);
-        return runtimeComponent.isStarted();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
deleted file mode 100644
index 45daf57399..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.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.host.embedded.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.SCABinding;
-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.xml.Constants;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-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.RuntimeComponentContext;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * An SCA domain facade implementation.
- * 
- * @version $Rev$ $Date$
- */
-public class EmbeddedSCADomain extends SCADomain {
-
-    private String uri;
-    private Composite domainComposite;
-    private ReallySmallRuntime runtime;
-    private ComponentManagerImpl componentManager = new ComponentManagerImpl(this);
-    
-    /**
-     * Constructs a new domain facade.
-     *
-     * @param runtimeClassLoader
-     * @param domainURI
-     */
-    public EmbeddedSCADomain(ClassLoader runtimeClassLoader,
-                            String domainURI) {
-        this.uri = domainURI;
-        
-        // Create a runtime
-        runtime = new ReallySmallRuntime(runtimeClassLoader);
-    }
-    
-    public void start() throws ActivationException {
-
-        // Start the runtime
-        runtime.start();
-        
-        // Create an in-memory domain level composite
-        AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-        domainComposite = assemblyFactory.createComposite();
-        domainComposite.setName(new QName(Constants.SCA10_NS, "domain"));
-        domainComposite.setURI(uri);
-        
-        getCompositeActivator().setDomainComposite(domainComposite);
-        
-    }
-
-    public void stop() throws ActivationException {
-        
-        // Stop the runtime
-        runtime.stop();
-        
-        // Cleanup
-        domainComposite = null;
-    }
-    
-    public void buildComposite(Composite composite) throws CompositeBuilderException {
-        runtime.buildComposite(composite);
-    }
-
-    public ContributionService getContributionService() {
-        return runtime.getContributionService();
-    }
-    
-    public CompositeBuilder getCompositeBuilder() {
-        return runtime.getCompositeBuilder();
-    }
-    
-    public CompositeActivator getCompositeActivator() {
-        return runtime.getCompositeActivator();
-    }
-    
-    public Composite getDomainComposite() {
-        return domainComposite;
-    }
-    
-    @Override
-    public ComponentManager getComponentManager() {
-        return componentManager;
-    }
-    
-    @Override
-    public void close() {
-        super.close();
-    }
-
-    @Override
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)runtime.getProxyFactory().cast(target);
-    }
-
-    @Override
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);
-        if (serviceReference == null) {
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        }
-        return serviceReference.getService();
-    }
-
-    private <B> ServiceReference<B> createServiceReference(Class<B> businessInterface, String targetURI) {
-        try {
-            AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-            Composite composite = assemblyFactory.createComposite();
-            composite.setName(new QName(Constants.SCA10_TUSCANY_NS, "default"));
-            RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent();
-            component.setName("default");
-            component.setURI("default");
-            runtime.getCompositeActivator().configureComponentContext(component);
-            composite.getComponents().add(component);
-            RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference();
-            reference.setName("default");
-            ModelFactoryExtensionPoint factories =
-                runtime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);
-            JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class);
-            InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract();
-            interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface));
-            reference.setInterfaceContract(interfaceContract);
-            component.getReferences().add(reference);
-            reference.setComponent(component);
-            SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-            SCABinding binding = scaBindingFactory.createSCABinding();
-            binding.setURI(targetURI);
-            reference.getBindings().add(binding);
-            return new ServiceReferenceImpl<B>(businessInterface, component, reference, binding, runtime
-                .getProxyFactory(), runtime.getCompositeActivator());
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-    @Override
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {
-
-        // Extract the component name
-        String componentName;
-        String serviceName;
-        int i = name.indexOf('/');
-        if (i != -1) {
-            componentName = name.substring(0, i);
-            serviceName = name.substring(i + 1);
-
-        } else {
-            componentName = name;
-            serviceName = null;
-        }
-
-        // Lookup the component in the domain
-        Component component = componentManager.getComponent(componentName);
-        if (component == null) {
-            // The component is not local in the partition, try to create a remote service ref
-            return createServiceReference(businessInterface, name);
-        }
-        RuntimeComponentContext componentContext = null;
-
-        // If the component is a composite, then we need to find the
-        // non-composite component that provides the requested service
-        if (component.getImplementation() instanceof Composite) {
-            for (ComponentService componentService : component.getServices()) {
-                if (serviceName == null || serviceName.equals(componentService.getName())) {
-                    CompositeService compositeService = (CompositeService)componentService.getService();
-                    if (compositeService != null) {
-                        if (serviceName != null) {
-                            serviceName = "$promoted$." + component.getName() + "." + serviceName;
-                        }
-                        componentContext =
-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
-                        return componentContext.createSelfReference(businessInterface, compositeService
-                            .getPromotedService());
-                    }
-                    break;
-                }
-            }
-            // No matching service is found
-            throw new ServiceRuntimeException("Composite service not found: " + name);
-        } else {
-            componentContext = ((RuntimeComponent)component).getComponentContext();
-            if (serviceName != null) {
-                return componentContext.createSelfReference(businessInterface, serviceName);
-            } else {
-                return componentContext.createSelfReference(businessInterface);
-            }
-        }
-
-    }
-
-    @Override
-    public String getURI() {
-        return uri;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
deleted file mode 100644
index d59f1544e5..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.embedded.impl;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-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.core.assembly.ActivationException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * An SCADomain that starts a Tuscany runtime supporting multiple
- * SCA contribution jars. All contribution jars found in a repository
- * directory will be contributed to the SCA domain. Any changes to the
- * contributions in that repository will be automatically detected and
- * the SCADomain updated accordingly.
- * 
- *  TODO: find how to properly add/remove contributions and start/activate the SCADomain
- *  TODO: support contributions that are folders as well as jar's
- *  TODO: needs to restart the entire SCADomain when a contribution changes
- *        as the domain classpath includes all the contribution jar's, would
- *        be nice to find a way to avoid this
- *  TODO: hot update requires copying contribution jars to a temp location
- *        to avoid the classpath lock preventing updating the contribution
- *        jars, would be nice to find a way to avoid that
- *
- * @version $Rev$ $Date$
- */
-public class HotUpdatableSCADomain extends SCADomain {
-    private static final Logger logger = Logger.getLogger(HotUpdatableSCADomain.class.getName());
-    protected String domainURI;
-    protected File contributionRepository;
-    
-    protected EmbeddedSCADomain scaDomain;
-
-    protected boolean hotUpdateActive;
-    protected Thread hotUpdateThread;
-    protected int hotUpdateInterval; //  milliseconds, 0 = hotupdate disabled
-
-    protected HashMap<URL, Long> existingContributions; // value is last modified time
-    protected ClassLoader originalCCL;
-
-    protected static final String REPOSITORY_FOLDER = "sca-contributions";
-    
-    public HotUpdatableSCADomain(String domainURI, File contributionRepository, int hotupdateInterval) {
-        this.domainURI = domainURI;
-        this.contributionRepository = contributionRepository;
-        this.hotUpdateInterval = hotupdateInterval;
-        this.originalCCL = Thread.currentThread().getContextClassLoader();
-        start();
-    }
-    
-    protected void start() {
-        try {
-            initEmbeddedSCADomain();
-            activateHotUpdate();
-            for (URL url : existingContributions.keySet()) {
-                File f = new File(url.toURI());
-                logger.info("added contribution: " + f.getName());
-            }
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        } catch (URISyntaxException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-    
-    @Override
-    public void close() {
-        try {
-            hotUpdateActive = false;
-            scaDomain.stop();
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-        Thread.currentThread().setContextClassLoader(originalCCL);
-        super.close();
-    }
-
-
-    protected SCADomain initEmbeddedSCADomain() throws ActivationException {
-
-        URL[] contributionJars = getContributionJarURLs(contributionRepository);
-
-        this.existingContributions = getLastModified(contributionJars);
-
-        if (hotUpdateInterval > 0) {
-            contributionJars = copyContributionsToTemp(contributionJars);
-        }
-
-        // Using the CCL as the parent exposes Tuscany to the contributions, want to do this? 
-        URLClassLoader cl = new URLClassLoader(contributionJars, originalCCL);
-        Thread.currentThread().setContextClassLoader(cl);
-
-        scaDomain = new EmbeddedSCADomain(cl, domainURI);
-
-        scaDomain.start();
-
-        initContributions(scaDomain, cl, contributionJars);
-        
-        return scaDomain;
-    }
-
-    protected URL[] getContributionJarURLs(File repositoryDir) {
-
-        String[] jars = repositoryDir.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".jar");
-            }});
-
-        List<URL> contributionJars = new ArrayList<URL>();
-        if (jars != null) {
-            for (String jar : jars) {
-                try {
-                    contributionJars.add(new File(repositoryDir, jar).toURL());
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        return contributionJars.toArray(new URL[contributionJars.size()]);
-    }
-
-    /**
-     * TODO: No idea what the 'correct' way to add/contribute and activate/start things to an scaDomain is
-     *       but this seems to work. Doesn't seem to start <service>s or <reference>s which are outside of
-     *       a <component> so something is missing/wrong. Also this doesn't seem to be picking up composites
-     *       located in META-INF/deployables or specified in the sca-deployables.xml. Maybe the EmbeddedSCADomain
-     *       and ContributionService APIs should make all this easier?
-     */
-    protected void initContributions(EmbeddedSCADomain scaDomain,  ClassLoader cl, URL[] contributionJars) {
-    	Contribution contribution = null;
-        ContributionService contributionService = scaDomain.getContributionService();
-        for (URL jar : contributionJars) {
-            InputStream is = null;
-            try {
-                is = jar.openStream();
-                contribution = contributionService.contribute(jar.toString(), jar, is);
-            } catch (Exception e) {
-                System.err.println("exception adding contribution: " + jar);
-                e.printStackTrace();
-            }
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-        }
-        
-        if (contribution != null ) {
-            try {
-
-                for (Composite composite : contribution.getDeployables()) {
-                    scaDomain.getDomainComposite().getIncludes().add(composite);
-                    scaDomain.getCompositeBuilder().build(composite);
-                    scaDomain.getCompositeActivator().activate(composite);
-                }
-
-                for (Composite composite : contribution.getDeployables()) {
-                     scaDomain.getCompositeActivator().start(composite);
-                }
-
-            } catch (ActivationException e) {
-                throw new RuntimeException(e);
-            } catch (CompositeBuilderException e) {
-                throw new RuntimeException(e);
-            }        	
-        }
-        
-    }
-
-    /**
-     * Copies Files to a temp location returning the URLs of the new temp files.
-     * For hot update to work need to be able to delete/update the contribution jar's
-     * but as they're in the classpath the URLClassLoader has an open lock on the jar's
-     * so you can't update them. This solution copies each contribution to a temp
-     * location for use on the classpath, nicer would be a ClassLoder impl that doesn't
-     * lock the jar's.
-     */
-    protected URL[] copyContributionsToTemp(URL[] contributionJars) {
-        try {
-
-            URL[] newURLs = new URL[contributionJars.length];
-            File tempDir = new File(System.getProperty("java.io.tmpdir"));
-            for (int i=0; i<contributionJars.length; i++) {
-                File fin = new File(contributionJars[i].toURI());
-                File fout = File.createTempFile("tuscany", fin.getName(), tempDir);
-                fout.deleteOnExit();
-                FileHelper.copyFile(fin, fout);
-                fout.setLastModified(System.currentTimeMillis());
-                newURLs[i] = fout.toURL();
-            }
-            return newURLs;
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);            
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);            
-        }
-    }
-
-    /**
-     * Returns the last modified times of the files pointed to by the URLs  
-     */
-    protected HashMap<URL, Long> getLastModified(URL[] contrabutions) {
-        try {
-
-            HashMap<URL, Long> contributionLastUpdates = new HashMap<URL, Long>();
-            for (URL url: contrabutions) {
-                File f = new File(url.toURI());
-                contributionLastUpdates.put(url, new Long(f.lastModified()));
-            }
-            return contributionLastUpdates;
-
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    protected void activateHotUpdate() {
-        if (hotUpdateInterval == 0) {
-            return; // hotUpdateInterval of 0 disables hotupdate
-        }
-
-        Runnable runable = new Runnable() {
-            public void run() {
-                logger.info("Tuscany contribution hotupdate running");
-                while (hotUpdateActive) {
-                    try {
-                        Thread.sleep(hotUpdateInterval);
-                    } catch (InterruptedException e) {
-                    }
-                    if (hotUpdateActive) {
-                        checkForUpdates();
-                    }
-                }
-                logger.info("Tuscany contribution hotupdate stopped");
-            }
-        };
-        hotUpdateThread = new Thread(runable, "TuscanyHotUpdate");
-        hotUpdateActive = true;
-        hotUpdateThread.start();
-    }
-
-
-    /**
-     * Checks if any of the contributions have been updated and if so restarts the SCADomain
-     * TODO: Ideally just the altered contribution would be restarted but thats not possible
-     *       as the ClassLoader used by the SCADomain includes the old contribution so need
-     *       to restart the entire domain to use a new ClassLoader. Should there be separate 
-     *       ClassLoader per contribution? But then have all the issues with sharing classes
-     *       across contributions.
-     */
-    protected void checkForUpdates() {
-        URL[] currentContributions = getContributionJarURLs(contributionRepository);
-        
-        if (areContributionsAltered(currentContributions)) {
-            try {
-                scaDomain.stop();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                initEmbeddedSCADomain();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    protected boolean areContributionsAltered(URL[] currentContrabutions) {
-        try {
-            
-            List addedContributions = getAddedContributions(currentContrabutions);
-            List removedContributions = getRemovedContributions(currentContrabutions);
-            List updatedContributions = getUpdatedContributions(currentContrabutions);
-            
-            return (addedContributions.size() > 0 || removedContributions.size() > 0 || updatedContributions.size() > 0);
-
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected List<URL> getUpdatedContributions(URL[] currentContrabutions) throws URISyntaxException {
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : currentContrabutions) {
-            if (existingContributions.containsKey(url)) {
-                File curentFile = new File(url.toURI());
-                if (curentFile.lastModified() != existingContributions.get(url)) {
-                    urls.add(url);
-                    logger.info("updated contribution: " + curentFile.getName());
-                }
-            }
-        }
-        return urls;
-    }
-
-    protected List getRemovedContributions(URL[] currentContrabutions) throws URISyntaxException {
-        List<URL> currentUrls = Arrays.asList(currentContrabutions);
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : existingContributions.keySet()) {
-            if (!currentUrls.contains(url)) {
-                urls.add(url);
-            }
-        }
-        for (URL url : urls) {
-            logger.info("removed contributions: " + new File(url.toURI()).getName());
-        }
-        return urls;
-    }
-
-    protected List getAddedContributions(URL[] currentContrabutions) throws URISyntaxException {
-        List<URL> urls = new ArrayList<URL>();
-        for (URL url : currentContrabutions) {
-            if (!existingContributions.containsKey(url)) {
-                urls.add(url);
-                logger.info("added contribution: " + new File(url.toURI()).getName());
-            }
-        }
-        return urls;
-    }
-
-    @Override
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        throw new UnsupportedOperationException("not implemented");
-    }
-
-    @Override
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-        return scaDomain.getService(businessInterface, serviceName);
-    }
-
-    @Override
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) {
-        return scaDomain.getServiceReference(businessInterface, referenceName);
-    }
-
-    @Override
-    public String getURI() {
-        return domainURI;
-    }
-
-    @Override
-    public ComponentManager getComponentManager(){
-        return  scaDomain.getComponentManager();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
deleted file mode 100644
index 47dd741d75..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.embedded.impl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-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.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.assembly.builder.DomainBuilder;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-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.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-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.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-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.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class ReallySmallRuntime {
-	private static final Logger logger = Logger.getLogger(ReallySmallRuntime.class.getName());
-    private List<ModuleActivator> modules;
-    private ExtensionPointRegistry registry;
-
-    private ClassLoader classLoader;
-    private AssemblyFactory assemblyFactory;
-    private ContributionService contributionService;
-    private CompositeActivator compositeActivator;
-    private CompositeBuilder compositeBuilder;
-    private DomainBuilder domainBuilder;    
-    private WorkScheduler workScheduler;
-    private ScopeRegistry scopeRegistry;
-    private ProxyFactory proxyFactory;
-    private List<SCADefinitions> policyDefinitions;
-    private ModelResolver policyDefinitionsResolver;
-    private Monitor monitor;
-
-    public ReallySmallRuntime(ClassLoader classLoader) {
-        this.classLoader = classLoader;
-    }
-
-    public void start() throws ActivationException {
-    	long start = System.currentTimeMillis();
-    	
-        // Create our extension point registry
-        registry = new DefaultExtensionPointRegistry();
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-
-        // Get work scheduler
-        workScheduler = utilities.getUtility(WorkScheduler.class);
-
-        // Create an interface contract mapper
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        // Get factory extension point
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        
-        // Get Message factory
-        MessageFactory messageFactory = factories.getFactory(MessageFactory.class);
-
-        // Get proxy factory
-        ProxyFactoryExtensionPoint proxyFactories = registry.getExtensionPoint(ProxyFactoryExtensionPoint.class);  
-        proxyFactory = new ExtensibleProxyFactory(proxyFactories); 
-
-        // Create model factories
-        assemblyFactory = new RuntimeAssemblyFactory();
-        factories.addFactory(assemblyFactory);
-        PolicyFactory policyFactory = new DefaultPolicyFactory();
-        factories.addFactory(policyFactory);
-        
-        // Load the runtime modules
-        modules = loadModules(registry);
-        
-        // Start the runtime modules
-        startModules(registry, modules);
-        
-        SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory intentAttachPointTypeFactory = new DefaultIntentAttachPointTypeFactory();
-        factories.addFactory(intentAttachPointTypeFactory);
-        ContributionFactory contributionFactory = factories.getFactory(ContributionFactory.class);
-        
-        // Create a monitor
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        
-        if (monitorFactory != null){
-            monitor = monitorFactory.createMonitor();
-        } else {
-            monitorFactory = new DefaultMonitorFactoryImpl();
-            monitor = monitorFactory.createMonitor();
-            utilities.addUtility(monitorFactory);
-            //logger.fine("No MonitorFactory is found on the classpath.");
-        }
-        
-        // Create a contribution service
-        policyDefinitions = new ArrayList<SCADefinitions>();
-        policyDefinitionsResolver = new DefaultModelResolver();
-        contributionService = ReallySmallRuntimeBuilder.createContributionService(classLoader,
-                                                                                  registry,
-                                                                                  contributionFactory,
-                                                                                  assemblyFactory,
-                                                                                  policyFactory,
-                                                                                  mapper,
-                                                                                  policyDefinitions,
-                                                                                  policyDefinitionsResolver,
-                                                                                  monitor);
-        
-        // Create the ScopeRegistry
-        scopeRegistry = ReallySmallRuntimeBuilder.createScopeRegistry(registry); 
-        
-        // Create a composite activator
-        compositeActivator = ReallySmallRuntimeBuilder.createCompositeActivator(registry,
-                                                                                assemblyFactory,
-                                                                                messageFactory,
-                                                                                scaBindingFactory,
-                                                                                mapper,
-                                                                                proxyFactory,
-                                                                                scopeRegistry,
-                                                                                workScheduler);
-
-        // Load the definitions.xml
-        loadSCADefinitions();
-        
-        if (logger.isLoggable(Level.FINE)) {
-            long end = System.currentTimeMillis();
-            logger.fine("The tuscany runtime is started in " + (end - start) + " ms.");
-        }
-    }
-    
-    public void stop() throws ActivationException {
-    	long start = System.currentTimeMillis();
-
-        // Stop the runtime modules
-        stopModules(registry, modules);
-
-        // Stop and destroy the work manager
-        workScheduler.destroy(); 
-
-        // Cleanup
-        modules = null;
-        registry = null;
-        assemblyFactory = null;
-        contributionService = null;
-        compositeActivator = null;
-        workScheduler = null;
-        scopeRegistry = null;
-        
-        if (logger.isLoggable(Level.FINE)) {
-            long end = System.currentTimeMillis();
-            logger.fine("The tuscany runtime is stopped in " + (end - start) + " ms.");
-        }
-    }
-    
-    public void buildComposite(Composite composite) throws CompositeBuilderException {
-        //Get factory extension point
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory intentAttachPointTypeFactory = factories.getFactory(IntentAttachPointTypeFactory.class);
-        EndpointFactory endpointFactory = factories.getFactory(EndpointFactory.class);        
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        
-        //Create a composite builder
-        SCADefinitions aggregatedDefinitions = new SCADefinitionsImpl();
-        for ( SCADefinitions definition : ((List<SCADefinitions>)policyDefinitions) ) {
-            SCADefinitionsUtil.aggregateSCADefinitions(definition, aggregatedDefinitions);
-        }
-        compositeBuilder = ReallySmallRuntimeBuilder.createCompositeBuilder(monitor,
-                                                                            assemblyFactory,
-                                                                            scaBindingFactory,
-                                                                            endpointFactory,
-                                                                            intentAttachPointTypeFactory,
-                                                                            mapper, 
-                                                                            aggregatedDefinitions);
-        compositeBuilder.build(composite);
-        
-    }
-    
-    public ContributionService getContributionService() {
-        return contributionService;
-    }
-
-    public CompositeActivator getCompositeActivator() {
-        return compositeActivator;
-    }
-    
-    public CompositeBuilder getCompositeBuilder() {
-        return compositeBuilder;
-    }
-
-    public AssemblyFactory getAssemblyFactory() {
-        return assemblyFactory;
-    }
-   
-    private void  loadSCADefinitions() throws ActivationException {
-        try {
-            URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-            URLArtifactProcessor<SCADefinitions> definitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
-            SCADefinitionsProviderExtensionPoint scaDefnProviders = registry.getExtensionPoint(SCADefinitionsProviderExtensionPoint.class);
-            
-            SCADefinitions systemSCADefinitions = new SCADefinitionsImpl();
-            SCADefinitions aSCADefn = null;
-            for ( SCADefinitionsProvider aProvider : scaDefnProviders.getSCADefinitionsProviders() ) {
-               aSCADefn = aProvider.getSCADefinition(); 
-               SCADefinitionsUtil.aggregateSCADefinitions(aSCADefn, systemSCADefinitions);
-            }
-            
-            policyDefinitions.add(systemSCADefinitions);
-            
-            //we cannot expect that providers will add the intents and policysets into the resolver
-            //so we do this here explicitly
-            for ( Intent intent : systemSCADefinitions.getPolicyIntents() ) {
-                policyDefinitionsResolver.addModel(intent);
-            }
-            
-            for ( PolicySet policySet : systemSCADefinitions.getPolicySets() ) {
-                policyDefinitionsResolver.addModel(policySet);
-            }
-            
-            for ( IntentAttachPointType attachPoinType : systemSCADefinitions.getBindingTypes() ) {
-                policyDefinitionsResolver.addModel(attachPoinType);
-            }
-            
-            for ( IntentAttachPointType attachPoinType : systemSCADefinitions.getImplementationTypes() ) {
-                policyDefinitionsResolver.addModel(attachPoinType);
-            }
-            
-            //now that all system sca definitions have been read, lets resolve them right away
-            definitionsProcessor.resolve(systemSCADefinitions, 
-                                         policyDefinitionsResolver);
-        } catch ( Exception e ) {
-            throw new ActivationException(e);
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private List<ModuleActivator> loadModules(ExtensionPointRegistry registry) throws ActivationException {
-
-        // Load and instantiate the modules found on the classpath (or any registered ClassLoaders)
-        modules = new ArrayList<ModuleActivator>();
-        try {
-            Set<ServiceDeclaration> moduleActivators =
-                ServiceDiscovery.getInstance().getServiceDeclarations(ModuleActivator.class);
-            Set<String> moduleClasses = new HashSet<String>();
-            for (ServiceDeclaration moduleDeclarator : moduleActivators) {
-                if (moduleClasses.contains(moduleDeclarator.getClassName())) {
-                    continue;
-                }
-                moduleClasses.add(moduleDeclarator.getClassName());
-                Class<?> moduleClass = moduleDeclarator.loadClass();
-                ModuleActivator module = (ModuleActivator)moduleClass.newInstance();
-                modules.add(module);
-            }
-        } catch (IOException e) {
-            throw new ActivationException(e);
-        } catch (ClassNotFoundException e) {
-            throw new ActivationException(e);
-        } catch (InstantiationException e) {
-            throw new ActivationException(e);
-        } catch (IllegalAccessException e) {
-            throw new ActivationException(e);
-        }
-
-        return modules;
-    }
-    
-    private void startModules(ExtensionPointRegistry registry, List<ModuleActivator> modules)
-        throws ActivationException {
-        boolean debug = logger.isLoggable(Level.FINE);
-        // Start all the extension modules
-        for (ModuleActivator module : modules) {
-            long start = 0L;
-            if (debug) {
-                logger.fine(module.getClass().getName() + " is starting.");
-                start = System.currentTimeMillis();
-            }
-            try {
-                module.start(registry);
-                if (debug) {
-                    long end = System.currentTimeMillis();
-                    logger.fine(module.getClass().getName() + " is started in " + (end - start) + " ms.");
-                }
-            } catch (Throwable e) {
-            	logger.log(Level.WARNING, "Exception starting module " + module.getClass().getName() + " :" + e.getMessage());
-            	logger.log(Level.FINE, "Exception starting module " + module.getClass().getName(), e);
-            }
-        }
-    }
-
-    private void stopModules(final ExtensionPointRegistry registry, List<ModuleActivator> modules) {
-        boolean debug = logger.isLoggable(Level.FINE);
-        for (ModuleActivator module : modules) {
-            long start = 0L;
-            if (debug) {
-                logger.fine(module.getClass().getName() + " is stopping.");
-                start = System.currentTimeMillis();
-            }
-            module.stop(registry);
-            if (debug) {
-                long end = System.currentTimeMillis();
-                logger.fine(module.getClass().getName() + " is stopped in " + (end - start) + " ms.");
-            }
-        }
-    }
-
-    /**
-     * @return the proxyFactory
-     */
-    public ProxyFactory getProxyFactory() {
-        return proxyFactory;
-    }
-
-    /**
-     * @return the registry
-     */
-    public ExtensionPointRegistry getExtensionPointRegistry() {
-        return registry;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
deleted file mode 100644
index 3bbb5fcf34..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.embedded.impl;
-
-import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.List;
-import java.util.logging.Logger;
-
-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.EndpointFactory;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.DomainBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensiblePackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
-import org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener;
-import org.apache.tuscany.sca.contribution.service.TypeDescriber;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
-import org.apache.tuscany.sca.contribution.service.impl.ContributionServiceImpl;
-import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.core.assembly.CompositeActivatorImpl;
-import org.apache.tuscany.sca.core.conversation.ConversationManager;
-import org.apache.tuscany.sca.core.conversation.ConversationManagerImpl;
-import org.apache.tuscany.sca.core.invocation.ExtensibleWireProcessor;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.CompositeScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ConversationalScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.RequestScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ScopeContainerFactory;
-import org.apache.tuscany.sca.core.scope.ScopeRegistry;
-import org.apache.tuscany.sca.core.scope.ScopeRegistryImpl;
-import org.apache.tuscany.sca.core.scope.StatelessScopeContainerFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class ReallySmallRuntimeBuilder {
-    
-    private static final Logger logger = Logger.getLogger(ReallySmallRuntimeBuilder.class.getName());
-	
-    public static CompositeActivator createCompositeActivator(ExtensionPointRegistry registry,
-                                                              AssemblyFactory assemblyFactory,
-                                                              MessageFactory messageFactory,
-                                                              SCABindingFactory scaBindingFactory,
-                                                              InterfaceContractMapper mapper,
-                                                              ProxyFactory proxyFactory,
-                                                              ScopeRegistry scopeRegistry,
-                                                              WorkScheduler workScheduler) {
-
-        // Create a wire post processor extension point
-        RuntimeWireProcessorExtensionPoint wireProcessors =
-            registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-        RuntimeWireProcessor wireProcessor = new ExtensibleWireProcessor(wireProcessors);
-
-        // Retrieve the processors extension point
-        StAXArtifactProcessorExtensionPoint processors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);        
-
-        // Create a provider factory extension point
-        ProviderFactoryExtensionPoint providerFactories =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        
-        // Create a endpoint resolver factory extension point
-        EndpointResolverFactoryExtensionPoint endpointResolverFactories =
-            registry.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class);        
-
-        JavaInterfaceFactory javaInterfaceFactory =
-            registry.getExtensionPoint(ModelFactoryExtensionPoint.class).getFactory(JavaInterfaceFactory.class);
-        RequestContextFactory requestContextFactory =
-            registry.getExtensionPoint(ContextFactoryExtensionPoint.class).getFactory(RequestContextFactory.class);
-
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        ConversationManager conversationManager = utilities.getUtility(ConversationManager.class);
-        
-        // Create the composite activator
-        CompositeActivator compositeActivator =
-            new CompositeActivatorImpl(assemblyFactory, messageFactory, javaInterfaceFactory, scaBindingFactory,
-                                       mapper, scopeRegistry, workScheduler, wireProcessor, requestContextFactory,
-                                       proxyFactory, providerFactories, endpointResolverFactories, processors, conversationManager);
-
-        return compositeActivator;
-    }
-
-    public static CompositeBuilder createCompositeBuilder(Monitor monitor,
-                                                          AssemblyFactory assemblyFactory,
-                                                          SCABindingFactory scaBindingFactory,
-                                                          EndpointFactory endpointFactory,
-                                                          IntentAttachPointTypeFactory intentAttachPointTypeFactory,
-                                                          InterfaceContractMapper interfaceContractMapper,
-                                                          SCADefinitions policyDefinitions) {
-      
-        
-        return new CompositeBuilderImpl(assemblyFactory, 
-                                        endpointFactory,
-                                        scaBindingFactory, 
-                                        intentAttachPointTypeFactory, 
-                                        interfaceContractMapper,
-                                        policyDefinitions,
-                                        monitor);
-    }
-    
-
-    /**
-     * Create the contribution service used by this domain.
-     * 
-     * @throws ActivationException
-     */
-    public static ContributionService createContributionService(ClassLoader classLoader,
-                                                                ExtensionPointRegistry registry,
-                                                                ContributionFactory contributionFactory,
-                                                                AssemblyFactory assemblyFactory,
-                                                                PolicyFactory policyFactory,
-                                                                InterfaceContractMapper mapper,
-                                                                List<SCADefinitions> policyDefinitions,
-                                                                ModelResolver policyDefinitionResolver,
-                                                                Monitor monitor)
-        throws ActivationException {
-
-        // Get the model factory extension point
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-
-        // Create a new XML input factory
-        // Allow privileged access to factory. Requires RuntimePermission in security policy file.
-        XMLInputFactory inputFactory = AccessController.doPrivileged(new PrivilegedAction<XMLInputFactory>() {
-            public XMLInputFactory run() {
-                return XMLInputFactory.newInstance();
-            }
-        });
-        modelFactories.addFactory(inputFactory);
-        
-        // Create a validation XML schema extension point
-        ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
-               
-        // Create a validating XML input factory
-        XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas, monitor);
-        modelFactories.addFactory(validatingInputFactory);
-        
-        // Create StAX artifact processor extension point
-        StAXArtifactProcessorExtensionPoint staxProcessors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        // Create and register StAX processors for SCA assembly XML
-        // Allow privileged access to factory. Requires RuntimePermission in security policy file.
-        XMLOutputFactory outputFactory = AccessController.doPrivileged(new PrivilegedAction<XMLOutputFactory>() {
-            public XMLOutputFactory run() {
-                return XMLOutputFactory.newInstance();
-            }
-        });           
-        ExtensibleStAXArtifactProcessor staxProcessor =
-            new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor);
-
-        // Create URL artifact processor extension point
-        URLArtifactProcessorExtensionPoint documentProcessors =
-            registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-
-        // Create and register document processors for SCA assembly XML
-        documentProcessors.getProcessor(Composite.class);
-        documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, policyDefinitions, monitor));
-
-        // Create Model Resolver extension point
-        ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class);
-
-        // Create contribution package processor extension point
-        TypeDescriber describer = new PackageTypeDescriberImpl();
-        PackageProcessor packageProcessor =
-            new ExtensiblePackageProcessor(registry.getExtensionPoint(PackageProcessorExtensionPoint.class), describer, monitor);
-
-        // Create contribution listener
-        ExtensibleContributionListener contributionListener =
-            new ExtensibleContributionListener(registry.getExtensionPoint(ContributionListenerExtensionPoint.class));
-
-        // Create a contribution repository
-        ContributionRepository repository;
-        try {
-            repository = new ContributionRepositoryImpl("target", inputFactory, monitor);
-        } catch (IOException e) {
-            throw new ActivationException(e);
-        }
-
-        ExtensibleURLArtifactProcessor documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, monitor);
-
-        // Create the contribution service
-        ContributionService contributionService =
-            new ContributionServiceImpl(repository, packageProcessor, documentProcessor, staxProcessor,
-                                        contributionListener, policyDefinitionResolver, modelResolvers, modelFactories,
-                                        assemblyFactory, contributionFactory, inputFactory, policyDefinitions, monitor);
-        return contributionService;
-    }
-
-    public static ScopeRegistry createScopeRegistry(ExtensionPointRegistry registry) {
-        ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
-        ScopeContainerFactory[] factories =
-            new ScopeContainerFactory[] {new CompositeScopeContainerFactory(), new StatelessScopeContainerFactory(),
-                                         new RequestScopeContainerFactory(),
-                                         new ConversationalScopeContainerFactory(null),
-            // new HttpSessionScopeContainer(monitor)
-            };
-        for (ScopeContainerFactory f : factories) {
-            scopeRegistry.register(f);
-        }
-
-        //FIXME Pass the scope container differently as it's not an extension point
-        registry.addExtensionPoint(scopeRegistry);
-
-        return scopeRegistry;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
deleted file mode 100644
index 5f38c0c063..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.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.host.embedded.management;
-
-import java.util.EventListener;
-
-/**
- * Component Listener interface.
- *
- * @version $Rev$ $Date$
- */
-public interface ComponentListener extends EventListener {
-    
-    void componentStarted(String componentName);
-    void componentStopped(String componentName);
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
deleted file mode 100644
index 4acb270810..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.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.embedded.management;
-
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-
-/**
- * Component Manager interface.
- *
- * @version $Rev$ $Date$
- */
-public interface ComponentManager {
-
-    Set<String> getComponentNames();
-
-    Component getComponent(String componentName);
-    
-    boolean isComponentStarted(String componentName);
-
-    void startComponent(String componentName) throws ActivationException;
-
-    void stopComponent(String componentName) throws ActivationException;
-
-    void addComponentListener(ComponentListener listener);
-
-    void removeComponentListener(ComponentListener listener);
-    
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
deleted file mode 100644
index 9252b114a1..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.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.host.embedded;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.test.extension.TestService;
-import org.osoa.sca.ServiceReference;
-
-
-
-/**
- * Test creation of an SCADomainBean and invocation of a service.
- * 
- * @version $Rev$ $Date$
- */
-public class SCADomainBeanTestCase extends TestCase {
-
-    private SCADomainBean domain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        domain = new SCADomainBean();
-        domain.setDeployableComposites("test.composite");
-    }
-
-    public void testInvoke() throws Exception {
-        ServiceReference<TestService> serviceReference = domain.getServiceReference(TestService.class, "TestServiceComponent");
-        assertNotNull(serviceReference);
-        TestService service = serviceReference.getService();
-        String result = service.ping("Bob");
-        assertEquals("Hello Bob", result);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
deleted file mode 100644
index c52c16d8e1..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.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.embedded;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.test.extension.TestService;
-import org.osoa.sca.ServiceReference;
-
-
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- * 
- * @version $Rev$ $Date$
- */
-public class SCADomainTestCase extends TestCase {
-
-    private SCADomain domain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance("test.composite");
-    }
-
-    public void testInvoke() throws Exception {
-        ServiceReference<TestService> serviceReference = domain.getServiceReference(TestService.class, "TestServiceComponent");
-        assertNotNull(serviceReference);
-        TestService service = serviceReference.getService();
-        String result = service.ping("Bob");
-        assertEquals("Hello Bob", result);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
deleted file mode 100644
index 087a75426b..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.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.host.embedded.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.apache.tuscany.sca.host.embedded.test.extension.TestService;
-
-
-/**
- * Test creation of DefaultSCADomain.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultSCADomainTestCase extends TestCase {
-    private DefaultSCADomain domain;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = new DefaultSCADomain(getClass().getClassLoader(), getClass().getClassLoader(),
-                                      "http://localhost", ".", "test.composite");
-    }
-
-    public void testStart() throws Exception {
-        TestService service = domain.getService(TestService.class, "TestServiceComponent");
-        assertNotNull(service);
-    }
-
-    public void testComponentManager() throws Exception {
-        ComponentManager componentManager = domain.getComponentManager();
-        assertEquals(1, componentManager.getComponentNames().size());
-        assertEquals("TestServiceComponent", componentManager.getComponentNames().iterator().next());
-        assertNotNull(componentManager.getComponent("TestServiceComponent"));
-        
-        assertTrue(componentManager.isComponentStarted("TestServiceComponent"));
-        componentManager.stopComponent("TestServiceComponent");
-        assertFalse(componentManager.isComponentStarted("TestServiceComponent"));
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
deleted file mode 100644
index 2a59635a19..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.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.host.embedded.impl;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Component;
-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.management.ComponentListener;
-import org.apache.tuscany.sca.host.embedded.management.ComponentManager;
-import org.apache.tuscany.sca.host.embedded.test.extension.TestService;
-
-/**
- * Test creation of an EmbeddedSCADomain and invocation of a service.
- * 
- * @version $Rev$ $Date$
- */
-public class EmbeddedSCADomainTestCase extends TestCase {
-    private EmbeddedSCADomain domain;
-
-    @Override
-    protected void setUp() throws Exception {
-        
-        // Create a test embedded SCA domain 
-        domain = new EmbeddedSCADomain(getClass().getClassLoader(), "http://localhost");
-    }
-
-    public void testDomain() throws Exception {
-        // Start the domain
-        domain.start();
-        
-        // Determine my class loader and my test SCA contribution location  
-        ClassLoader myClassLoader = getClass().getClassLoader();
-        String url = myClassLoader.getResource("test.txt").toString();
-        url = url.substring(0, url.length()-8);
-        
-        // Contribute the SCA contribution
-        TestModelResolver myResolver = new TestModelResolver(myClassLoader);
-        ContributionService contributionService = domain.getContributionService();
-        Contribution contribution = contributionService.contribute("http://test/contribution", new URL(url), myResolver, false);
-        assertNotNull(contribution);
-        
-        // Decide which SCA composite I want to deploy
-        Composite myComposite = myResolver.getComposite(new QName("http://test", "test"));
-        
-        // Add the deployable composite to the domain
-        domain.getDomainComposite().getIncludes().add(myComposite);
-        
-        
-        domain.buildComposite(myComposite);
-
-        // Start the composite
-        domain.getCompositeActivator().activate(myComposite);
-        domain.getCompositeActivator().start(myComposite);
-        
-        // At this point the domain contains my contribution, my composite and
-        // it's started, my application code can start using it
-        
-        // Get the TestServiceComponent service
-        TestService service = domain.getService(TestService.class, "TestServiceComponent");
-        
-        // Invoke the service
-        String result = service.ping("Bob");
-        assertEquals("Hello Bob", result);
-        
-        // Stop my composite
-        domain.getCompositeActivator().stop(myComposite);
-        domain.getCompositeActivator().deactivate(myComposite);
-        
-        // Remove my composite
-        domain.getDomainComposite().getIncludes().remove(myComposite);
-        
-        // Remove my contribution
-        contributionService.remove("http://test/contribution");
-        
-        // Stop the domain
-        domain.stop();
-    }
-
-    public void testComponentManager() throws Exception {
-        // Start the domain
-        domain.start();
-        
-        // Determine my class loader and my test SCA contribution location  
-        ClassLoader myClassLoader = getClass().getClassLoader();
-        String url = myClassLoader.getResource("test.txt").toString();
-        url = url.substring(0, url.length()-8);
-        
-        // Contribute the SCA contribution
-        TestModelResolver myResolver = new TestModelResolver(myClassLoader);
-        ContributionService contributionService = domain.getContributionService();
-        Contribution contribution = contributionService.contribute("http://test/contribution", new URL(url), myResolver, false);
-        assertNotNull(contribution);
-        
-        // Decide which SCA composite I want to deploy
-        Composite myComposite = myResolver.getComposite(new QName("http://test", "test"));
-        
-        // Add the deployable composite to the domain
-        domain.getDomainComposite().getIncludes().add(myComposite);
-        
-        domain.buildComposite(myComposite);
-
-        // Start the composite
-        domain.getCompositeActivator().activate(myComposite);
-        domain.getCompositeActivator().start(myComposite);
-        
-        // At this point the domain contains my contribution, my composite and
-        // it's started, my application code can start using it
-
-        ComponentManager componentManager = domain.getComponentManager();
-        assertEquals(1, componentManager.getComponentNames().size());
-        assertEquals("TestServiceComponent", componentManager.getComponentNames().iterator().next());
-        
-        Component component = componentManager.getComponent("TestServiceComponent");
-        assertNotNull(component);
-        assertEquals("TestServiceComponent", component.getName());
-        
-        MyComponentListener cl = new MyComponentListener();
-        componentManager.addComponentListener(cl);
-
-        assertTrue(componentManager.isComponentStarted("TestServiceComponent"));
-        
-        assertFalse(cl.stopCalled);
-        componentManager.stopComponent("TestServiceComponent");
-        assertTrue(cl.stopCalled);
-        assertFalse(componentManager.isComponentStarted("TestServiceComponent"));
-        
-        assertFalse(cl.startCalled);
-        componentManager.startComponent("TestServiceComponent");
-        assertTrue(cl.startCalled);
-        assertTrue(componentManager.isComponentStarted("TestServiceComponent"));
-
-        // Stop my composite
-        domain.getCompositeActivator().stop(myComposite);
-        domain.getCompositeActivator().deactivate(myComposite);
-        
-        // Remove my composite
-        domain.getDomainComposite().getIncludes().remove(myComposite);
-        
-        // Remove my contribution
-        contributionService.remove("http://test/contribution");
-        
-        // Stop the domain
-        domain.stop();
-    }
-    
-    class MyComponentListener implements ComponentListener {
-        boolean startCalled;
-        boolean stopCalled;
-
-        public void componentStarted(String componentName) {
-            startCalled = true;
-        }
-
-        public void componentStopped(String componentName) {
-            stopCalled = true;
-        }
-        
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
deleted file mode 100644
index 1cfe5ed5d8..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.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.host.embedded.impl;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-
-
-/**
- * A test model 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;
-    
-    private Map<QName, Composite> composites = new HashMap<QName, Composite>();
-    
-    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) {
-            
-            // 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);
-        if (resolved instanceof Composite) {
-            Composite composite = (Composite)resolved;
-            composites.put(composite.getName(), composite);
-        }
-    }
-    
-    public Object removeModel(Object resolved) {
-        if (resolved instanceof Composite) {
-            Composite composite = (Composite)resolved;
-            composites.remove(composite.getName());
-        }
-        return map.remove(resolved);
-    }
-    
-    public Composite getComposite(QName qname) {
-        return composites.get(qname);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
deleted file mode 100644
index 86e0cb6a8a..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.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.embedded.test.extension;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.host.embedded.test.extension.impl.TestImplementationImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-
-/**
- * Default factory for the test implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultTestImplementationFactory implements TestImplementationFactory {
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    
-    public DefaultTestImplementationFactory(AssemblyFactory assemblyFactory,
-                                            JavaInterfaceFactory javaFactory) {
-        this.assemblyFactory = assemblyFactory;
-        this.javaFactory = javaFactory;
-    }
-
-    public TestImplementation createTestImplementation() {
-        return new TestImplementationImpl(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
deleted file mode 100644
index d9f1228307..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.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.host.embedded.test.extension;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- * The model representing a test implementation in an SCA assembly model.
- * 
- * @version $Rev$ $Date$
- */
-public interface TestImplementation extends Implementation {
-
-    /**
-     * Returns the greeting string that can be configured on test implementations.
-     * 
-     * @return the greeting string that can be configured on test implementations
-     */
-    String getGreeting();
-
-    /**
-     * Sets the greeting string that can be configured on test implementations.
-     * 
-     * @param greeting the greeting string that can be configured on test implementations
-     */
-    void setGreeting(String greeting);
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
deleted file mode 100644
index 9200d850bb..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.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.embedded.test.extension;
-
-
-/**
- * A factory for the test implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface TestImplementationFactory {
-    
-    /**
-     * Creates a new test implementation.
-     * 
-     * @return
-     */
-    TestImplementation createTestImplementation();
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
deleted file mode 100644
index 4adec91151..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.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.embedded.test.extension;
-
-/**
- * Service interface for test component implementations.
- * 
- * @version $Rev$ $Date$
- */
-public interface TestService {
-
-    String ping(String name);
-
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
deleted file mode 100644
index 083b01167f..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.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.host.embedded.test.extension.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.host.embedded.test.extension.TestService;
-import org.apache.tuscany.sca.host.embedded.test.extension.TestImplementation;
-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 test implementation in an SCA assembly model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestImplementationImpl implements TestImplementation {
-
-    private Service testService;
-    private String greeting;
-    
-    /**
-     * Constructs a new test implementation.
-     */
-    public TestImplementationImpl(AssemblyFactory assemblyFactory,
-                              JavaInterfaceFactory javaFactory) {
-
-        // Test implementations always provide a single service exposing
-        // the TestService interface, and have no references and properties
-        testService = assemblyFactory.createService();
-        testService.setName("Test");
-        JavaInterface javaInterface;
-        try {
-            javaInterface = javaFactory.createJavaInterface(TestService.class);
-        } catch (InvalidInterfaceException e) {
-            throw new IllegalArgumentException(e);
-        }
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        interfaceContract.setInterface(javaInterface);
-        testService.setInterfaceContract(interfaceContract);
-    }
-
-    public String getGreeting() {
-        return greeting;
-    }
-
-    public void setGreeting(String greeting) {
-        this.greeting = greeting;
-    }
-
-    public ConstrainingType getConstrainingType() {
-        // The test implementation does not support constrainingTypes
-        return null;
-    }
-
-    public List<Property> getProperties() {
-        // The test implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public List<Service> getServices() {
-        // The test implementation provides a single fixed Test service
-        return Collections.singletonList(testService);
-    }
-    
-    public List<Reference> getReferences() {
-        // The test implementation does not support properties
-        return Collections.emptyList();
-    }
-
-    public String getURI() {
-        // The test implementation does not have a URI
-        return null;
-    }
-
-    public void setConstrainingType(ConstrainingType constrainingType) {
-        // The test implementation does not support constrainingTypes
-    }
-
-    public void setURI(String uri) {
-        // The test implementation does not have a URI
-    }
-
-    public boolean isUnresolved() {
-        // The test implementation is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The test implementation is always resolved
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
deleted file mode 100644
index 73feffad50..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.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.host.embedded.test.extension.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.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.host.embedded.test.extension.TestImplementation;
-import org.apache.tuscany.sca.host.embedded.test.extension.TestImplementationFactory;
-
-
-
-/**
- * Implements a StAX artifact processor for test implementations.
- *
- * @version $Rev$ $Date$
- */
-public class TestImplementationProcessor implements StAXArtifactProcessor<TestImplementation> {
-    private static final QName IMPLEMENTATION_TEST = new QName("http://test/extension", "implementation.test");
-    
-    private TestImplementationFactory testFactory;
-    
-    public TestImplementationProcessor(TestImplementationFactory testFactory) {
-        this.testFactory = testFactory;
-    }
-
-    public QName getArtifactType() {
-        // Returns the QName of the XML element processed by this processor
-        return IMPLEMENTATION_TEST;
-    }
-
-    public Class<TestImplementation> getModelType() {
-        // Returns the type of model processed by this processor
-        return TestImplementation.class;
-    }
-
-    public TestImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        // Read an <implementation.test> element
-
-        // Read the message attribute.
-        String message = reader.getAttributeValue(null, "greeting");
-
-        // Create and initialize the test implementation model
-        TestImplementation implementation = testFactory.createTestImplementation();
-        implementation.setGreeting(message);
-        
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_TEST.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        return implementation;
-    }
-
-    public void resolve(TestImplementation impl, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-    public void write(TestImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        writer.writeStartElement(IMPLEMENTATION_TEST.getNamespaceURI(), IMPLEMENTATION_TEST.getLocalPart());
-        
-        if (implementation.getGreeting() != null) {
-            writer.writeAttribute("greeting", implementation.getGreeting());
-        }
-        
-        writer.writeEndElement();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
deleted file mode 100644
index f6f077e99b..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.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.host.embedded.test.extension.module;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.embedded.test.extension.DefaultTestImplementationFactory;
-import org.apache.tuscany.sca.host.embedded.test.extension.TestImplementationFactory;
-import org.apache.tuscany.sca.host.embedded.test.extension.impl.TestImplementationProcessor;
-import org.apache.tuscany.sca.host.embedded.test.extension.provider.TestImplementationProviderFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-
-
-
-/**
- * Implements a module activator for the test implementation extension module.
- * 
- * @version $Rev$ $Date$
- */
-public class TestModuleActivator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry registry) {
-
-        // Create the test  implementation factory
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        TestImplementationFactory testFactory = new DefaultTestImplementationFactory(assemblyFactory, javaFactory);
-        modelFactories.addFactory(testFactory);
-
-        // Add the test implementation extension to the StAXArtifactProcessor
-        // extension point
-        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        TestImplementationProcessor implementationArtifactProcessor = new TestImplementationProcessor(testFactory);
-        processors.addArtifactProcessor(implementationArtifactProcessor);
-
-        // Add the test provider factory to the ProviderFactory extension point
-        ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        providerFactories.addProviderFactory(new TestImplementationProviderFactory());
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
deleted file mode 100644
index 1d27e08fee..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.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.host.embedded.test.extension.provider;
-
-import org.apache.tuscany.sca.host.embedded.test.extension.TestImplementation;
-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;
-
-
-/**
- * Implementation provider for test implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class TestImplementationProvider implements ImplementationProvider {
-    
-    private RuntimeComponent component;
-    private TestImplementation implementation;
-
-    /**
-     * Constructs a new test implementation provider.
-     */
-    public TestImplementationProvider(RuntimeComponent component, TestImplementation implementation) {
-        this.component = component;
-        this.implementation = implementation;
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        TestInvoker invoker = new TestInvoker(operation, implementation.getGreeting());
-        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/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
deleted file mode 100644
index 15d3618fdd..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.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.embedded.test.extension.provider;
-
-import org.apache.tuscany.sca.host.embedded.test.extension.TestImplementation;
-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 test implementation in an SCA assembly model.
- * 
- * @version $Rev$ $Date$
- */
-public class TestImplementationProviderFactory implements ImplementationProviderFactory<TestImplementation> {
-
-    /**
-     * Constructs a new test implementation provider factory.
-     */
-    public TestImplementationProviderFactory() {
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component, TestImplementation implementation) {
-        return new TestImplementationProvider(component, implementation);
-    }
-    
-    public Class<TestImplementation> getModelType() {
-        return TestImplementation.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
deleted file mode 100644
index d49179dec0..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.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.embedded.test.extension.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-
-/**
- * Implements an invoker for test component implementations.
- * 
- * The target invoker is responsible for handling operation invocations.
- * 
- * @version $Rev$ $Date$
- */
-public class TestInvoker implements Invoker {
-    private Operation operation;
-    private String greeting;
-    
-    public TestInvoker(Operation operation, String greeting) {
-        this.operation = operation;
-        this.greeting = greeting;
-    }
-    
-    public Message invoke(Message msg) {
-        Object[] args = msg.getBody();
-        if (operation.getName().equals("ping")) {
-            msg.setBody(greeting + " " + args[0]);
-        } else {
-            msg.setFaultBody(new Exception("Operation " + operation.getName() + " is not supported"));
-        }
-        return msg;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 7e2e11e4cc..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/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.

-# Implementation class for the ExtensionActivator

-org.apache.tuscany.sca.host.embedded.test.extension.module.TestModuleActivator

diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.composite b/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.composite
deleted file mode 100644
index bd7c5fab79..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.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://test"
-	xmlns:se="http://test"
-	xmlns:e="http://test/extension"
-	name="test">
-
-    <component name="TestServiceComponent">
-        <e:implementation.test greeting="Hello" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.txt b/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.txt
deleted file mode 100644
index 287f9b1f65..0000000000
--- a/tags/java/sca/1.3/modules/host-embedded/src/test/resources/test.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/host-http/LICENSE b/tags/java/sca/1.3/modules/host-http/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/host-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/tags/java/sca/1.3/modules/host-http/NOTICE b/tags/java/sca/1.3/modules/host-http/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-http/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/tags/java/sca/1.3/modules/host-http/pom.xml b/tags/java/sca/1.3/modules/host-http/pom.xml
deleted file mode 100644
index f76f82985e..0000000000
--- a/tags/java/sca/1.3/modules/host-http/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-host-http</artifactId>
-    <name>Apache Tuscany SCA HTTP Servlet Host Extension Point</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</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>
-    </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.host.http</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.http*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
deleted file mode 100644
index 3de0b9f5a7..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.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.host.http;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLDecoder;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A minimal implementation of a Servlet that serves documents in a document root
- * directory.
- * 
- * A Servlet host implementation is not required to use this implementation and can map
- * the URI and document root to a more complete and more efficient implementation of  
- * a resource Servlet, for example the Tomcat or Jetty default Servlets.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultResourceServlet extends HttpServlet implements Servlet {
-    private static final long serialVersionUID = 2865466417329430610L;
-    
-    private String documentRoot;
-    
-    /**
-     * Constructs a new ResourceServlet
-     * @param documentRoot the document root
-     */
-    public DefaultResourceServlet(String documentRoot) {
-        this.documentRoot = documentRoot;
-    }
-    
-    /**
-     * Returns the document root.
-     * @return the document root
-     */
-    public String getDocumentRoot() {
-        return documentRoot;
-    }
-
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        
-        // Determine the resource path
-        String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
-        URL url = new URL(documentRoot + '/' + path);
-        
-        // Write the resource
-        InputStream is = url.openStream();
-        OutputStream os = response.getOutputStream(); 
-        byte[] buffer = new byte[2048];
-        for (;;) {
-            int n = is.read(buffer);
-            if (n <= 0)
-                break;
-            os.write(buffer, 0, n);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
deleted file mode 100644
index 5e6de0b29b..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.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.host.http;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Default implementation of a Servlet host extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultServletHostExtensionPoint implements ServletHostExtensionPoint {
-
-    private List<ServletHost> servletHosts = new ArrayList<ServletHost>();
-
-    public void addServletHost(ServletHost servletHost) {
-        servletHosts.add(servletHost);
-    }
-
-    public void removeServletHost(ServletHost servletHost) {
-        servletHosts.remove(servletHost);
-    }
-
-    public List<ServletHost> getServletHosts() {
-        return servletHosts;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
deleted file mode 100644
index 4be5de4100..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.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.host.http;
-
-import java.net.URL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-
-/**
- * Default implementation of an extensible Servlet host.
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensibleServletHost implements ServletHost {
-    
-    private ServletHostExtensionPoint servletHosts;
-    
-    public ExtensibleServletHost(ServletHostExtensionPoint servletHosts) {
-        this.servletHosts = servletHosts;
-    }
-    
-    public void setDefaultPort(int port) {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        for (ServletHost servletHost: servletHosts.getServletHosts()) {
-            servletHost.setDefaultPort(port);
-        }
-    }
-    
-    private ServletHost getDefaultServletHost() {
-        return servletHosts.getServletHosts().get(0);
-    }
-    
-    public int getDefaultPort() {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        return getDefaultServletHost().getDefaultPort();
-    }
-
-    public void addServletMapping(String uri, Servlet servlet) throws ServletMappingException {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        // TODO implement selection of the correct Servlet host based on the mapping
-        // For now just select the first one
-        getDefaultServletHost().addServletMapping(uri, servlet);
-    }
-
-    public Servlet getServletMapping(String uri) throws ServletMappingException {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        // TODO implement selection of the correct Servlet host based on the mapping
-        // For now just select the first one
-        return getDefaultServletHost().getServletMapping(uri);
-    }
-    
-    public Servlet removeServletMapping(String uri) throws ServletMappingException {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        // TODO implement selection of the correct Servlet host based on the mapping
-        // For now just select the first one
-        return getDefaultServletHost().removeServletMapping(uri);
-    }
-    
-    public RequestDispatcher getRequestDispatcher(String uri) throws ServletMappingException {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        // TODO implement selection of the correct Servlet host based on the mapping
-        // For now just select the first one
-        return getDefaultServletHost().getRequestDispatcher(uri);
-    }
-
-    public String getContextPath() {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        // TODO implement selection of the correct Servlet host based on the mapping
-        // For now just select the first one
-        return getDefaultServletHost().getContextPath();
-    }
-    
-    public URL getURLMapping(String uri) {
-        if (servletHosts.getServletHosts().isEmpty()) {
-            throw new ServletMappingException("No servlet host available");
-        }
-
-        return getDefaultServletHost().getURLMapping(uri);
-    }
-
-    public void setContextPath(String path) {
-        getDefaultServletHost().setContextPath(path);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
deleted file mode 100644
index e5dbd59a07..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.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.host.http;
-
-import java.net.URL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-
-/**
- * Interface implemented by host environments that allow Servlets to be
- * registered. 
- * <p/> 
- * This interface allows a system service to register a Servlet
- * to handle inbound requests.
- * 
- * @version $Rev$ $Date$
- */
-public interface ServletHost {
-    
-    /**
-     * Sets the default port for the server.
-     * 
-     * @param port the default port
-     */
-    void setDefaultPort(int port);
-
-    /**
-     * Returns the default port for the server.
-     * 
-     * @return the default port
-     */
-    int getDefaultPort();
-    
-    /**
-     * Add a mapping for an instance of a Servlet. This requests that the
-     * Servlet container direct all requests to the designated mapping to the
-     * supplied Servlet instance.
-     * 
-     * @param uri the URI-mapping for the Servlet
-     * @param servlet the Servlet that should be invoked
-     * @throws ServletMappingException
-     */
-    void addServletMapping(String uri, Servlet servlet) throws ServletMappingException;
-
-    /**
-     * Remove a Servlet mapping. This directs the Servlet container not to direct
-     * any more requests to a previously registered Servlet.
-     * 
-     * @param uri the URI-mapping for the Servlet
-     * @return the Servlet that was registered to the mapping, null if nothing
-     *         was registered to the mapping
-     * @throws ServletMappingException
-     */
-    Servlet removeServletMapping(String uri) throws ServletMappingException;
-
-    /**
-     * Returns the Servlet mapped to the given URI.
-     * 
-     * @param uri the URI-mapping for the Servlet
-     * @return the Servlet registered with the mapping
-     * @throws ServletMappingException
-     */
-    Servlet getServletMapping(String uri) throws ServletMappingException;
-
-    /**
-     * Returns a Servlet request dispatcher for the Servlet mapped to the specified URI.
-     * 
-     * @param uri the URI mapped to a Servlet
-     * @return a RequestDispatcher that can be used to dispatch requests to
-     * that Servlet
-     * @throws ServletMappingException
-     */
-    RequestDispatcher getRequestDispatcher(String uri) throws ServletMappingException;
-
-    /**
-     * Returns the portion of the request URI that indicates the context of the request
-     * 
-     * @return a String specifying the portion of the request URI that indicates the context of the request
-     */
-    String getContextPath();
-
-    /**
-     * Sets the portion of the request URI that indicates the context of the request
-     * 
-     * @param path the context path
-     */
-    void setContextPath(String path);
-
-    /**
-     * Returns the complete URL mapped to the specified URI. 
-     * @return the URL mapped to the specified URI
-     */
-    URL getURLMapping(String uri);
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
deleted file mode 100644
index fbd085ba2b..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.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.http;
-
-import java.util.List;
-
-/**
- * An extension point for Servlet hosts.
- * 
- * @version $Rev$ $Date$
- */
-public interface ServletHostExtensionPoint {
-
-    /**
-     * Adds a Servlet host extension.
-     * 
-     * @param servletHost
-     */
-    void addServletHost(ServletHost servletHost);
-
-    /**
-     * Removes a Servlet host extension.
-     * 
-     * @param servletHost
-     */
-    void removeServletHost(ServletHost servletHost);
-    
-    /**
-     * Returns a list of Servlet host extensions.
-     * 
-     * @return
-     */
-    List<ServletHost> getServletHosts();
-
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
deleted file mode 100644
index ae66c44c3e..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.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.host.http;
-
-/**
- * Indicates an exception while registering a Servlet mapping.
- * 
- * @version $Rev$ $Date$
- */
-public class ServletMappingException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public ServletMappingException() {
-        super();
-    }
-
-    public ServletMappingException(String message) {
-        super(message);
-    }
-
-    public ServletMappingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ServletMappingException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/tags/java/sca/1.3/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
deleted file mode 100644
index 44f4550b40..0000000000
--- a/tags/java/sca/1.3/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ /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.http.DefaultServletHostExtensionPoint

diff --git a/tags/java/sca/1.3/modules/host-jetty/LICENSE b/tags/java/sca/1.3/modules/host-jetty/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/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/tags/java/sca/1.3/modules/host-jetty/NOTICE b/tags/java/sca/1.3/modules/host-jetty/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/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/tags/java/sca/1.3/modules/host-jetty/pom.xml b/tags/java/sca/1.3/modules/host-jetty/pom.xml
deleted file mode 100644
index 711a87b0dd..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-host-jetty</artifactId>
-    <name>Apache Tuscany SCA Jetty Servlet Host Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>servlet-api-2.5</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</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.host.jetty</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.http.jetty*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
deleted file mode 100644
index 4f5bfb3c62..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.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.http.jetty;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.resource.Resource;
-import org.mortbay.resource.URLResource;
-
-/**
- * Customizes the Jetty default Servlet.
- *
- * @version $Rev$ $Date$
- */
-public class JettyDefaultServlet extends DefaultServlet {
-    private static final long serialVersionUID = 7000218247190209353L;
-
-    private String documentRoot;
-    private String servletPath;
-    
-    public JettyDefaultServlet(String servletPath, String documentRoot) {
-        this.servletPath = servletPath + '/';
-        this.documentRoot = documentRoot;
-    }
-
-    @Override
-    public Resource getResource(String pathInContext) {
-        if (pathInContext.startsWith(servletPath)) {
-            if (pathInContext.length() > servletPath.length()) {
-                pathInContext = pathInContext.substring(servletPath.length());
-            } else {
-                pathInContext = "";
-            }
-        } else {
-            if ((pathInContext + "/").equals(servletPath)) {
-                pathInContext = "";
-            }
-        }
-        
-        try {
-            URL url = new URL(documentRoot + "/" + pathInContext);
-            return new URLResource(url, url.openConnection()) {
-                private static final long serialVersionUID = 8560952113883507717L;
-                
-                @Override
-                public File getFile() throws IOException {
-                    return null;
-                }
-                
-            };
-        } catch (MalformedURLException e) {
-            return null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-    
-    @Override
-    public String getInitParameter(String name) {
-        if ("resourceBase".equals(name)) {
-            return documentRoot;
-        } else if ("redirectWelcome".equals(name)) {
-            return "true";
-        } else {
-            return super.getInitParameter(name);
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
deleted file mode 100644
index 1ecf1bca1b..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.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.http.jetty;
-
-import org.mortbay.log.Logger;
-
-/**
- * Replaces Jetty's logging mechanism
- * 
- * @version $Rev$ $Date$
- */
-public class JettyLogger implements Logger {
-
-    private boolean debugEnabled;
-
-    public boolean isDebugEnabled() {
-        return debugEnabled;
-    }
-
-    public void setDebugEnabled(boolean debugEnabled) {
-        this.debugEnabled = debugEnabled;
-    }
-
-    public void info(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":INFO:  " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void debug(String msg, Throwable th) {
-        if (debugEnabled) {
-            System.err.println(":DEBUG:  " + msg);
-            th.printStackTrace();
-        }
-    }
-
-    public void debug(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":DEBUG: " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void warn(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":WARN: " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void warn(String msg, Throwable th) {
-        if (debugEnabled) {
-            System.err.println(":WARN: " + msg);
-            th.printStackTrace();
-        }
-    }
-
-    public Logger getLogger(String name) {
-        return this;
-    }
-
-    private String format(String msg, Object arg0, Object arg1) {
-        int i0 = msg.indexOf("{}");
-        int i1 = i0 < 0 ? -1 : msg.indexOf("{}", i0 + 2);
-        if (arg1 != null && i1 >= 0) {
-            msg = msg.substring(0, i1) + arg1 + msg.substring(i1 + 2);
-        }
-        if (arg0 != null && i0 >= 0) {
-            msg = msg.substring(0, i0) + arg0 + msg.substring(i0 + 2);
-        }
-        return msg;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
deleted file mode 100644
index d0b2500eb8..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.jetty;
-
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.logging.Logger;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-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;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.ServletMapping;
-import org.mortbay.jetty.servlet.SessionHandler;
-import org.mortbay.thread.ThreadPool;
-
-/**
- * Implements an HTTP transport service using Jetty.
- *
- * @version $Rev$ $Date$
- */
-public class JettyServer implements ServletHost {
-    private static final Logger logger = Logger.getLogger(JettyServer.class.getName());
-
-    private final Object joinLock = new Object();
-    private String keystore;
-    private String certPassword;
-    private String keyPassword;
-    private boolean sendServerVersion;
-    private WorkScheduler workScheduler;
-    private int defaultPort = 8080;
-
-    /**
-     * Represents a port and the server that serves it.
-     */
-    private class Port {
-        private Server server;
-        private ServletHandler servletHandler;
-        
-        private Port(Server server, ServletHandler servletHandler) {
-            this.server = server;
-            this.servletHandler = servletHandler;
-        }
-
-        public Server getServer() {
-            return server;
-        }
-        
-        public ServletHandler getServletHandler() {
-            return servletHandler;
-        }
-    }
-    
-    private Map<Integer, Port> ports = new HashMap<Integer, Port>();
-
-    private String contextPath = "/";
-
-    static {
-        // Hack to replace the static Jetty logger
-        System.setProperty("org.mortbay.log.class", JettyLogger.class.getName());
-    }
-
-    public JettyServer(WorkScheduler workScheduler) {
-        this.workScheduler = workScheduler;
-    }
-    
-    public void setDefaultPort(int port) {
-        defaultPort = port;
-    }
-    
-    public int getDefaultPort() {
-        return defaultPort;
-    }
-
-    public void setSendServerVersion(boolean sendServerVersion) {
-        this.sendServerVersion = sendServerVersion;
-    }
-
-    public void setKeystore(String keystore) {
-        this.keystore = keystore;
-    }
-
-    public void setCertPassword(String certPassword) {
-        this.certPassword = certPassword;
-    }
-
-    public void setKeyPassword(String keyPassword) {
-        this.keyPassword = keyPassword;
-    }
-
-    /**
-     * Stop all the started servers.
-     */
-    public void stop() {
-        synchronized (joinLock) {
-            joinLock.notifyAll();
-        }
-        try {
-            Set<Entry<Integer, Port>> entries = new HashSet<Entry<Integer, Port>>(ports.entrySet());
-            for (Entry<Integer, Port> entry: entries) {
-                Port port = entry.getValue();
-                port.getServer().stop();
-                ports.remove(entry.getKey());
-            }
-        } catch (Exception e) {
-            throw new ServletMappingException(e);
-        }
-    }
-
-    public void addServletMapping(String suri, Servlet servlet) 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 port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-
-            // Create and start a new server
-            try {
-                Server server = new Server();
-                server.setThreadPool(new WorkSchedulerThreadPool());
-                if ("https".equals(scheme)) {
-                    Connector httpConnector = new SelectChannelConnector();
-                    httpConnector.setPort(portNumber);
-                    SslSocketConnector sslConnector = new SslSocketConnector();
-                    sslConnector.setPort(portNumber);
-                    sslConnector.setKeystore(keystore);
-                    sslConnector.setPassword(certPassword);
-                    sslConnector.setKeyPassword(keyPassword);
-                    server.setConnectors(new Connector[] {httpConnector, sslConnector});
-                } else {
-                    SelectChannelConnector selectConnector = new SelectChannelConnector();
-                    selectConnector.setPort(portNumber);
-                    server.setConnectors(new Connector[] {selectConnector});
-                }
-    
-                ContextHandler contextHandler = new ContextHandler();
-                //contextHandler.setContextPath(contextPath);
-                contextHandler.setContextPath("/");
-                server.setHandler(contextHandler);
-    
-                SessionHandler sessionHandler = new SessionHandler();
-                ServletHandler servletHandler = new ServletHandler();
-                sessionHandler.addHandler(servletHandler);
-    
-                contextHandler.setHandler(sessionHandler);
-    
-                server.setStopAtShutdown(true);
-                server.setSendServerVersion(sendServerVersion);
-                server.start();
-                
-                // Keep track of the new server and Servlet handler 
-                port = new Port(server, servletHandler);
-                ports.put(portNumber, port);
-                
-            } catch (Exception e) {
-                throw new ServletMappingException(e);
-            }
-        }
-
-        // Register the Servlet mapping
-        ServletHandler servletHandler = port.getServletHandler();
-        ServletHolder holder;
-        if (servlet instanceof DefaultResourceServlet) {
-            
-            // Optimize the handling of resource requests, use the Jetty default Servlet
-            // instead of our default resource Servlet
-            String servletPath = uri.getPath();
-            if (servletPath.endsWith("*")) {
-                servletPath = servletPath.substring(0, servletPath.length()-1);
-            }
-            if (servletPath.endsWith("/")) {
-                servletPath = servletPath.substring(0, servletPath.length()-1);
-            }          
-            if (!servletPath.startsWith("/")) {
-                servletPath = '/' + servletPath;
-            }     
-       
-            DefaultResourceServlet resourceServlet = (DefaultResourceServlet)servlet;
-            DefaultServlet defaultServlet = new JettyDefaultServlet(servletPath, resourceServlet.getDocumentRoot());
-            holder = new ServletHolder(defaultServlet);
-            
-        } else {
-            holder = new ServletHolder(servlet);
-        }
-        servletHandler.addServlet(holder);
-        
-        ServletMapping mapping = new ServletMapping();
-        mapping.setServletName(holder.getName());
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }  
-                
-        mapping.setPathSpec(path);
-        servletHandler.addServletMapping(mapping);
-        
-        // 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 = 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 (!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 = defaultPort;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-            return null;
-        }
-        
-        // Remove the Servlet mapping for the given Servlet 
-        ServletHandler servletHandler = port.getServletHandler();
-        Servlet servlet = null;
-        List<ServletMapping> mappings =
-            new ArrayList<ServletMapping>(Arrays.asList(servletHandler.getServletMappings()));
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        
-        for (ServletMapping mapping : mappings) {
-            if (Arrays.asList(mapping.getPathSpecs()).contains(path)) {
-                try {
-                    servlet = servletHandler.getServlet(mapping.getServletName()).getServlet();
-                } catch (ServletException e) {
-                    throw new IllegalStateException(e);
-                }
-                break;
-            }
-        }
-        return servlet;
-    }
-
-    public Servlet removeServletMapping(String suri) {
-        URI uri = URI.create(suri);
-        
-        // Get the URI port
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-
-        // 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);
-        }
-        
-        // Remove the Servlet mapping for the given Servlet 
-        ServletHandler servletHandler = port.getServletHandler();
-        Servlet removedServlet = null;
-        List<ServletMapping> mappings =
-            new ArrayList<ServletMapping>(Arrays.asList(servletHandler.getServletMappings()));
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        
-        for (ServletMapping mapping : mappings) {
-            if (Arrays.asList(mapping.getPathSpecs()).contains(path)) {
-                try {
-                    removedServlet = servletHandler.getServlet(mapping.getServletName()).getServlet();
-                } catch (ServletException e) {
-                    throw new IllegalStateException(e);
-                }
-                mappings.remove(mapping);
-                //logger.info("Removed Servlet mapping: " + path);
-                break;
-            }
-        }
-        if (removedServlet != null) {
-            servletHandler.setServletMappings(mappings.toArray(new ServletMapping[mappings.size()]));
-            
-            // Stop the port if there are no servlet mappings on it anymore
-            if (mappings.size() == 0) {
-                try {
-                    port.getServer().stop();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-                ports.remove(portNumber);
-            }
-            
-        } else {
-            logger.warning("Trying to Remove servlet mapping: " + path + " where mapping is not registered");
-        }
-        
-        return removedServlet;
-    }
-
-    public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException {
-        //FIXME implement this later
-        return null;
-    }
-    
-    public String getContextPath() {
-        return contextPath;
-    }
-    
-    public void setContextPath(String path) {
-        this.contextPath = path;
-    }
-
-    /**
-     * A wrapper to enable use of a WorkScheduler with Jetty
-     */
-    private class WorkSchedulerThreadPool implements ThreadPool {
-
-        public boolean dispatch(Runnable work) {
-            workScheduler.scheduleWork(work);
-            return true;
-        }
-
-        public void join() throws InterruptedException {
-            synchronized (joinLock) {
-                joinLock.wait();
-            }
-        }
-
-        public int getThreads() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getIdleThreads() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isLowOnThreads() {
-            return false;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
deleted file mode 100644
index 884c8a4cce..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.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.http.jetty.module;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.jetty.JettyServer;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JettyRuntimeModuleActivator implements ModuleActivator {
-    private static final Logger logger = Logger.getLogger(JettyRuntimeModuleActivator.class.getName());
-
-    private JettyServer server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        // Register a Jetty 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.
-            try {
-                server = AccessController.doPrivileged(new PrivilegedAction<JettyServer>() {
-                    public JettyServer run() {
-                        return new JettyServer(workScheduler);
-                     }
-                });        
-                servletHosts.addServletHost(server);
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Exception creating JettyServer", e);
-            }
-        }
-    }
-
-    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/tags/java/sca/1.3/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index f61708de90..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/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.jetty.module.JettyRuntimeModuleActivator

diff --git a/tags/java/sca/1.3/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/tags/java/sca/1.3/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
deleted file mode 100644
index 4b8e4ae4f1..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.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.http.jetty;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.Socket;
-
-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 JettyServerTestCase extends TestCase {
-
-    private static final String REQUEST1_HEADER =
-        "GET / 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 {
-        JettyServer service = new JettyServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/", 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 that Servlets can be registered with multiple ports
-     */
-    public void testRegisterMultiplePorts() throws Exception {
-        JettyServer service = new JettyServer(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 {
-        JettyServer service = new JettyServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        String uri = "http://127.0.0.1:" + HTTP_PORT + "/foo";
-        service.addServletMapping(uri, servlet);
-        service.removeServletMapping(uri);
-        try {
-            Socket client = new Socket("127.0.0.1", HTTP_PORT);
-            OutputStream os = client.getOutputStream();
-            os.write(REQUEST1.getBytes());
-            os.flush();
-            read(client);
-            fail("Server still bound to port");
-        } catch (ConnectException e) {
-        }
-        service.stop();
-        assertFalse(servlet.invoked);
-    }
-
-    public void testRequestSession() throws Exception {
-        JettyServer service = new JettyServer(workScheduler);
-        TestServlet servlet = new TestServlet();
-        service.addServletMapping("http://127.0.0.1:" + HTTP_PORT + "/", 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 {
-        JettyServer service = new JettyServer(workScheduler);
-        service.stop();
-        service.stop();
-    }
-
-    public void testNoMappings() throws Exception {
-        JettyServer service = new JettyServer(workScheduler);
-        Exception ex = null;
-        try {
-            new Socket("127.0.0.1", HTTP_PORT);
-        } catch (ConnectException e) {
-            ex = e;
-        }
-        assertNotNull(ex);
-        service.stop();
-    }
-    
-    public void testResourceServlet() throws Exception {
-        JettyServer service = new JettyServer(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 {
-        JettyServer service = new JettyServer(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 {
-        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();
-            }
-        }
-    }
-
-    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/tags/java/sca/1.3/modules/host-jetty/src/test/resources/content/test.html b/tags/java/sca/1.3/modules/host-jetty/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/tags/java/sca/1.3/modules/host-jetty/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/tags/java/sca/1.3/modules/host-osgi/LICENSE b/tags/java/sca/1.3/modules/host-osgi/LICENSE
deleted file mode 100644
index 4b5ab74408..0000000000
--- a/tags/java/sca/1.3/modules/host-osgi/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/tags/java/sca/1.3/modules/host-osgi/NOTICE b/tags/java/sca/1.3/modules/host-osgi/NOTICE
deleted file mode 100644
index a3c65715e5..0000000000
--- a/tags/java/sca/1.3/modules/host-osgi/NOTICE
+++ /dev/null
@@ -1,17 +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/).
-
-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/tags/java/sca/1.3/modules/host-osgi/pom.xml b/tags/java/sca/1.3/modules/host-osgi/pom.xml
deleted file mode 100644
index 44c678d228..0000000000
--- a/tags/java/sca/1.3/modules/host-osgi/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-host-osgi</artifactId>
-    <name>Apache Tuscany Host for OSGi</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>                                      
-            <artifactId>junit</artifactId>
-            <version>3.8.1</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.host.osgi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.osgi*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 8bab603184..0000000000
--- a/tags/java/sca/1.3/modules/host-osgi/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 ExtensionActivator

-org.apache.tuscany.sca.host.osgi.XxxxModuleActivator

diff --git a/tags/java/sca/1.3/modules/host-rmi/LICENSE b/tags/java/sca/1.3/modules/host-rmi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/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/tags/java/sca/1.3/modules/host-rmi/NOTICE b/tags/java/sca/1.3/modules/host-rmi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/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/tags/java/sca/1.3/modules/host-rmi/pom.xml b/tags/java/sca/1.3/modules/host-rmi/pom.xml
deleted file mode 100644
index 70b1836f46..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-host-rmi</artifactId>

-    <name>Apache Tuscany SCA RMI Host Extension Point</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>1.3</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.host.rmi</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.host.rmi*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
deleted file mode 100644
index 8985c508fc..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.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.host.rmi;
-
-import java.rmi.AlreadyBoundException;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Default implementation of a RMI host.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultRMIHost implements RMIHost {
-
-    //map of RMI registries started and running
-    private Map<String, Registry> rmiRegistries;
-
-    public DefaultRMIHost() {
-        rmiRegistries = new ConcurrentHashMap<String, Registry>();
-        /*
-         * if (System.getSecurityManager() == null) { System.setSecurityManager(new RMISecurityManager()); }
-         */
-    }
-
-    public void registerService(String serviceName, int port, Remote serviceObject) throws RMIHostException,
-        RMIHostRuntimeException {
-        Registry registry;
-        try {
-            registry = rmiRegistries.get(Integer.toString(port));
-            if (registry == null) {
-                try {
-                    registry = LocateRegistry.getRegistry(port);
-                    registry.list();
-                } catch (RemoteException e) {
-                    registry = LocateRegistry.createRegistry(port);
-                }
-                rmiRegistries.put(Integer.toString(port), registry);
-            }
-            registry.bind(serviceName, serviceObject);
-        } catch (AlreadyBoundException e) {
-            throw new RMIHostException(e);
-        } catch (RemoteException e) {
-            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
-            rmiExec.setStackTrace(e.getStackTrace());
-            throw rmiExec;
-        }
-
-    }
-
-    public void registerService(String serviceName, Remote serviceObject) throws RMIHostException,
-        RMIHostRuntimeException {
-        registerService(serviceName, RMI_DEFAULT_PORT, serviceObject);
-    }
-
-    public void unregisterService(String serviceName, int port) throws RMIHostException, RMIHostRuntimeException {
-        Registry registry;
-
-        try {
-            registry = rmiRegistries.get(Integer.toString(port));
-            if (registry == null) {
-                registry = LocateRegistry.getRegistry(port);
-                rmiRegistries.put(Integer.toString(port), registry);
-            }
-            registry.unbind(serviceName);
-        } catch (RemoteException e) {
-            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
-            rmiExec.setStackTrace(e.getStackTrace());
-            throw rmiExec;
-        } catch (NotBoundException e) {
-            throw new RMIHostException(e.getMessage());
-        }
-    }
-
-    public void unregisterService(String serviceName) throws RMIHostException, RMIHostRuntimeException {
-        unregisterService(serviceName, RMI_DEFAULT_PORT);
-
-    }
-
-    public Remote findService(String host, String port, String svcName) throws RMIHostException,
-        RMIHostRuntimeException {
-        Registry registry;
-        Remote remoteService = null;
-        host = (host == null || host.length() <= 0) ? "localhost" : host;
-        int portNumber = (port == null || port.length() <= 0) ? RMI_DEFAULT_PORT : Integer.decode(port);
-
-        try {
-            // Requires permission java.net.SocketPermission "host:port", "connect,accept,resolve"
-            // in security policy.
-            registry = LocateRegistry.getRegistry(host, portNumber);
-
-            if (registry != null) {
-                remoteService = registry.lookup(svcName);
-            }
-        } catch (RemoteException e) {
-            RMIHostRuntimeException rmiExec = new RMIHostRuntimeException(e.getMessage());
-            rmiExec.setStackTrace(e.getStackTrace());
-            throw rmiExec;
-        } catch (NotBoundException e) {
-            throw new RMIHostException(e.getMessage());
-        }
-        return remoteService;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
deleted file mode 100644
index 3ac086a2ee..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.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.host.rmi;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Default implementation of an RMI host extension point.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultRMIHostExtensionPoint implements RMIHostExtensionPoint {
-
-    private List<RMIHost> rmiHosts = new ArrayList<RMIHost>();
-    
-    public DefaultRMIHostExtensionPoint() {
-        addRMIHost(new DefaultRMIHost());
-    }
-
-    public void addRMIHost(RMIHost rmiHost) {
-        rmiHosts.add(rmiHost);
-    }
-
-    public void removeRMIHost(RMIHost rmiHost) {
-        rmiHosts.remove(rmiHost);
-    }
-
-    public List<RMIHost> getRMIHosts() {
-        return rmiHosts;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
deleted file mode 100644
index 32fe6c2deb..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.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.rmi;
-
-import java.rmi.Remote;
-
-
-/**
- * Default implementation of an extensible RMI host.
- * 
- * @version $Rev$ $Date$
- */
-public class ExtensibleRMIHost implements RMIHost {
-    
-    private RMIHostExtensionPoint rmiHosts;
-    
-    public ExtensibleRMIHost(RMIHostExtensionPoint rmiHosts) {
-        this.rmiHosts = rmiHosts;
-    }
-    
-    public void registerService(String serviceName, int port, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException {
-        if (rmiHosts.getRMIHosts().isEmpty()) {
-            throw new RMIHostException("No RMI host available");
-        }
-        rmiHosts.getRMIHosts().get(0).registerService(serviceName, port, serviceObject);
-    }
-    
-    public Remote findService(String host, String port, String svcName) throws RMIHostException, RMIHostRuntimeException {
-        if (rmiHosts.getRMIHosts().isEmpty()) {
-            throw new RMIHostException("No RMI host available");
-        }
-        return rmiHosts.getRMIHosts().get(0).findService(host, port, svcName);
-    }
-    
-    public void registerService(String serviceName, Remote serviceObject) throws RMIHostException, RMIHostRuntimeException {
-        if (rmiHosts.getRMIHosts().isEmpty()) {
-            throw new RMIHostException("No RMI host available");
-        }
-        rmiHosts.getRMIHosts().get(0).registerService(serviceName, serviceObject);
-    }
-    
-    public void unregisterService(String serviceName) throws RMIHostException, RMIHostRuntimeException {
-        if (rmiHosts.getRMIHosts().isEmpty()) {
-            throw new RMIHostException("No RMI host available");
-        }
-        rmiHosts.getRMIHosts().get(0).unregisterService(serviceName);
-    }
-    
-    public void unregisterService(String serviceName, int port) throws RMIHostException, RMIHostRuntimeException {
-        if (rmiHosts.getRMIHosts().isEmpty()) {
-            throw new RMIHostException("No RMI host available");
-        }
-        rmiHosts.getRMIHosts().get(0).unregisterService(serviceName, port);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
deleted file mode 100644
index 59377de22a..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.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.host.rmi;
-
-import java.rmi.Remote;
-
-/**
- * RMI Service hosting interface to be implemented by host environments that allows SCA Components
- * to register RMI Services to handle inbound service requests over RMI to SCA Components
- *
- * @version $Rev$ $Date$
- */
-public interface RMIHost {
-    int RMI_DEFAULT_PORT = 1099;
-
-    /**
-     * Register an RMI service with the given name and port
-     * 
-     * @param serviceName against which the server is to be registered
-     * @param port the port against which the server is to be registered
-     * @param serviceObject the server object to be registered
-     * @throws RMIHostException
-     * @throws RMIHostRuntimeException
-     */ 
-    void registerService(String serviceName, int port, Remote serviceObject) throws RMIHostException,
-                                                                                    RMIHostRuntimeException;
-
-    /**
-     * Register an RMI service with the given name and default port (1099)
-     * 
-     * @param serviceName serviceName against which the server is to be registered
-     * @param serviceObject the server object to be registered
-     * @throws RMIHostException
-     * @throws RMIHostRuntimeException
-     */
-    void registerService(String serviceName, Remote serviceObject) throws RMIHostException,
-                                                                          RMIHostRuntimeException;
-
-    /**
-     * Unregister a service registered under the given service name and port number
-     * 
-     * @param serviceName serviceName against which the server is to be registered
-     * @param port the port against which the server is to be registered
-     * @throws RMIHostException
-     * @throws RMIHostRuntimeException
-     */
-    void unregisterService(String serviceName, int port) throws RMIHostException,
-                                                                RMIHostRuntimeException;
-
-    /**
-     * Unregister a service registered under the given service name and default port number (1099)
-     * 
-     * @param serviceName the name of the service that has to be unregistered
-     * @throws RMIHostException
-     * @throws RMIHostRuntimeException
-     */
-    void unregisterService(String serviceName) throws RMIHostException,
-                                                      RMIHostRuntimeException;
-
-
-    /**
-     * find a remote service hosted on the given host, port and service name
-     * 
-     * @param host the name of the host on which the RMI service to be unregistered is running
-     * @param port the port against which the server is to be unregistered is running
-     * @param svcName serviceName against which the server is to be unregistered is running
-     * @return the RMI server object 
-     * @throws RMIHostException
-     * @throws RMIHostRuntimeException
-     */
-    Remote findService(String host, String port, String svcName) throws RMIHostException,
-                                                                        RMIHostRuntimeException;
-
-}
diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
deleted file mode 100644
index 959eb72f6e..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.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.host.rmi;

-

-

-/**

- * This exception will relate to situations where the end applicaition's input is the cause of the exception

- *

- * @version $Rev: 486986 $ $Date: 2006-12-14 11:48:28 +0530 (Thu, 14 Dec 2006) $

- */

-public class RMIHostException extends RuntimeException {

- 

-    private static final long serialVersionUID = 3378300080918544410L;

-

-    public RMIHostException() {

-    }

-

-    public RMIHostException(String message) {

-        super(message);

-    }

-

-    public RMIHostException(Throwable e) {

-        super(e);

-    }

-

-    public RMIHostException(String message, Throwable cause) {

-        super(message, cause);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
deleted file mode 100644
index 40d6013940..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.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.rmi;
-
-import java.util.List;
-
-/**
- * An extension point for RMI hosts.
- * 
- * @version $Rev$ $Date$
- */
-public interface RMIHostExtensionPoint {
-
-    /**
-     * Adds a Servlet host extension.
-     * 
-     * @param rmiHost
-     */
-    void addRMIHost(RMIHost rmiHost);
-
-    /**
-     * Removes a Servlet host extension.
-     * 
-     * @param rmiHost
-     */
-    void removeRMIHost(RMIHost rmiHost);
-    
-    /**
-     * Returns a list of Servlet host extensions.
-     * 
-     * @return
-     */
-    List<RMIHost> getRMIHosts();
-
-}
diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
deleted file mode 100644
index 998287f998..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.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.host.rmi;

-

-

-/**

- * This exception relates to cases where there is a problem with the

- * Host runtime

- *

- * @version $Rev$ $Date$

- */

-public class RMIHostRuntimeException extends RuntimeException {

-   

-    private static final long serialVersionUID = -2639598547028423686L;

-

-    public RMIHostRuntimeException() {

-    }

-

-    public RMIHostRuntimeException(String message) {

-        super(message);

-    }

-    

-    public RMIHostRuntimeException(Throwable e) {

-        super(e);

-    }

-

-    public RMIHostRuntimeException(String message, Throwable cause) {

-        super(message, cause);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/tags/java/sca/1.3/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
deleted file mode 100644
index 014c5391b8..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ /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.rmi.DefaultRMIHostExtensionPoint

diff --git a/tags/java/sca/1.3/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/tags/java/sca/1.3/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
deleted file mode 100644
index 04d4d0f3cb..0000000000
--- a/tags/java/sca/1.3/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.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.host.rmi;

-

-import java.io.Serializable;

-import java.rmi.Remote;

-

-import junit.framework.TestCase;

-

-/**

- * Test cases for the RMI Host.

- *

- * @version $Rev$ $Date$

- */

-public class RMIHostImplTestCase extends TestCase {

-

-    public void testInit() {

-        new DefaultRMIHost();

-    }

-

-    public void testFindServiceBadHost() throws RMIHostRuntimeException, RMIHostException {

-        try {

-            new DefaultRMIHost().findService(null, "9994", "$BAD$");

-            fail();

-        } catch (RMIHostRuntimeException e) {

-            // expected

-        }

-    }

-

-    public void testRegisterService1() throws RMIHostRuntimeException, RMIHostException {

-        DefaultRMIHost host = new DefaultRMIHost();

-        host.registerService("foo1", 9996, new MockRemote());

-        host.unregisterService("foo1", 9996);

-    }

-

-    public void testExistingRegistry() throws RMIHostRuntimeException, RMIHostException {

-        DefaultRMIHost host1 = new DefaultRMIHost();

-        host1.registerService("foo1", 9995, new MockRemote());

-        DefaultRMIHost host2 = new DefaultRMIHost();

-        host2.registerService("foo2", 9995, new MockRemote());

-        host2.unregisterService("foo1", 9995);

-        host2.unregisterService("foo2", 9995);

-    }

-

-    public void testRegisterService2() throws RMIHostRuntimeException, RMIHostException {

-        DefaultRMIHost host = new DefaultRMIHost();

-        host.registerService("bar1", 9999, new MockRemote());

-        host.unregisterService("bar1", 9999);

-    }

-

-    public void testRegisterServiceAlreadyBound() throws RMIHostRuntimeException, RMIHostException {

-        DefaultRMIHost host = new DefaultRMIHost();

-        host.registerService("bar2", 9997, new MockRemote());

-        try {

-            host.registerService("bar2", 9997, new MockRemote());

-        } catch (RMIHostException e) {

-            // expected

-            host.unregisterService("bar2", 9997);

-        }

-    }

-

-    public void testUnRegisterService() throws RMIHostRuntimeException, RMIHostException {

-        DefaultRMIHost host = new DefaultRMIHost();

-        try {

-            host.unregisterService("bar3", 9998);

-            fail();

-        } catch (RMIHostRuntimeException e) {

-            // expected

-        }

-    }

-

-    private static class MockRemote implements Remote, Serializable {

-    }

-}

diff --git a/tags/java/sca/1.3/modules/host-tomcat/LICENSE b/tags/java/sca/1.3/modules/host-tomcat/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-tomcat/NOTICE b/tags/java/sca/1.3/modules/host-tomcat/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-tomcat/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/tags/java/sca/1.3/modules/host-tomcat/pom.xml b/tags/java/sca/1.3/modules/host-tomcat/pom.xml
deleted file mode 100644
index c000c133c2..0000000000
--- a/tags/java/sca/1.3/modules/host-tomcat/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.3</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>1.3</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>
-
-    <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.host.tomcat</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.http.tomcat*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
deleted file mode 100644
index a0b384d554..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
deleted file mode 100644
index 5d9b65503a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
deleted file mode 100644
index 52d6daf761..0000000000
--- a/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 {
-                connector = AccessController.doPrivileged(new PrivilegedExceptionAction<CustomConnector>() {
-                    public CustomConnector run() throws Exception {
-                       CustomConnector customConnector = new CustomConnector();
-                       customConnector.setPort(portNumber);
-                       customConnector.setContainer(engine);
-                       customConnector.initialize();
-                       customConnector.start();
-                       return customConnector;
-                   }
-                });
-            } 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/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/tags/java/sca/1.3/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
deleted file mode 100644
index 070dffdce6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index f0f4e17507..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/tags/java/sca/1.3/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
deleted file mode 100644
index 7ca5325ccb..0000000000
--- a/tags/java/sca/1.3/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-
-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 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 {
-        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();
-            }
-        }
-    }
-
-    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/tags/java/sca/1.3/modules/host-tomcat/src/test/resources/content/test.html b/tags/java/sca/1.3/modules/host-tomcat/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-webapp-junit/LICENSE b/tags/java/sca/1.3/modules/host-webapp-junit/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-webapp-junit/NOTICE b/tags/java/sca/1.3/modules/host-webapp-junit/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp-junit/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/tags/java/sca/1.3/modules/host-webapp-junit/pom.xml b/tags/java/sca/1.3/modules/host-webapp-junit/pom.xml
deleted file mode 100644
index fc13ac3560..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp-junit/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>1.3</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.2</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>
-
-    </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.host.webapp.junit</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.webapp.junit*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/tags/java/sca/1.3/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
deleted file mode 100644
index b2d3d0abf1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/tags/java/sca/1.3/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
deleted file mode 100644
index 72ec478cd6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/host-webapp/LICENSE b/tags/java/sca/1.3/modules/host-webapp/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/host-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/tags/java/sca/1.3/modules/host-webapp/NOTICE b/tags/java/sca/1.3/modules/host-webapp/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/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/tags/java/sca/1.3/modules/host-webapp/pom.xml b/tags/java/sca/1.3/modules/host-webapp/pom.xml
deleted file mode 100644
index 34dc5c91e8..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-host-webapp</artifactId>
-    <name>Apache Tuscany SCA Webapp Host</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-	        <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-	        <version>1.3</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>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</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.host.webapp</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.webapp*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
deleted file mode 100644
index d7ff73e31f..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.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.host.webapp;
-
-import java.io.File;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-
-import org.apache.tuscany.sca.host.embedded.impl.HotUpdatableSCADomain;
-
-/**
- * A WebApp ContextListener that starts a Tuscany runtime supporting multiple
- * SCA contribution jars. All contribution jars found in the repository
- * directory named "sca-contributions" will be contributed to the SCA 
- * domain. Any changes to the contributions in the repository will be 
- * automatically detected and the SCADomain updated accordingly.
- *
- * @version $Rev$ $Date$
- */
-public class HotUpdateContextListener extends TuscanyContextListener {
-
-    public static final String REPOSITORY_FOLDER_NAME = "sca-contributions";
-    
-    @Override
-    public void contextInitialized(ServletContextEvent event) {
-        ServletContext servletContext = event.getServletContext();
-        
-        // TODO better domaiURI, maybe based on webapp name?
-        String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.');
-
-        File repository = new File(servletContext.getRealPath(REPOSITORY_FOLDER_NAME));
-        HotUpdatableSCADomain scaDomain = new HotUpdatableSCADomain(domainURI, repository, 2000);        
-
-        servletContext.setAttribute(SCADomainHelper.SCA_DOMAIN_ATTRIBUTE, scaDomain);
-
-        super.contextInitialized(event);
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
deleted file mode 100644
index 2dbd7e9aa1..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.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.host.webapp;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Utility class to initialize the SCADomian associated with a webapp
- *
- * @version $Rev$ $Date$
- * @deprecated Not necessary anymore with TuscanyServletFilter 
- */
-@Deprecated
-public class SCADomainHelper {
-
-    static final String SCA_DOMAIN_ATTRIBUTE = "org.apache.tuscany.sca.SCADomain";
-
-    /**
-     * Initializes the SCADomian associated with a webapp context. If a SCADomain
-     * doesn't exist already then one is create based on the webapp config.
-     */
-    static SCADomain initSCADomain(ServletContext servletContext) {
-        SCADomain scaDomain = (SCADomain)servletContext.getAttribute(SCA_DOMAIN_ATTRIBUTE);
-        
-        String domainURI = "http://localhost/" + servletContext.getServletContextName().replace(' ', '.');
-        String contributionRoot = null;
-        
-        try {
-            URL rootURL = servletContext.getResource("/");
-            if (rootURL.getProtocol().equals("jndi")) {
-                //this is Tomcat case, we should use getRealPath
-                File warRootFile = new File(servletContext.getRealPath("/"));
-                contributionRoot = warRootFile.toURL().toString();
-            } else {
-                //this is Jetty case
-                contributionRoot  = rootURL.toString();
-            }
-        } catch(MalformedURLException mf) {
-            //ignore, pass null
-        }
-                
-        
-        if (scaDomain == null) {
-            scaDomain = SCADomain.newInstance(domainURI, contributionRoot);
-            servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
-        }
-        return scaDomain;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
deleted file mode 100644
index 593073b068..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.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.webapp;
-
-import java.util.Enumeration;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A ServletContextListener to create and close the SCADomain
- * when the webapp is initialized or destroyed.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyContextListener implements ServletContextListener {
-
-    public void contextInitialized(ServletContextEvent event) {
-        final ServletContext servletContext = event.getServletContext();
-        try {
-            WebAppServletHost.getInstance().init(new ServletConfig() {
-                public String getInitParameter(String name) {
-                    return servletContext.getInitParameter(name);
-                }
-
-                public Enumeration getInitParameterNames() {
-                    return servletContext.getInitParameterNames();
-                }
-
-                public ServletContext getServletContext() {
-                    return servletContext;
-                }
-
-                public String getServletName() {
-                    return null;
-                }
-            });
-        } catch (ServletException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void contextDestroyed(ServletContextEvent event) {
-        ServletContext servletContext = event.getServletContext();
-        SCADomain scaDomain = (SCADomain) servletContext.getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE);
-        if (scaDomain != null) {
-            scaDomain.close();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
deleted file mode 100644
index 559fef73cc..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.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.host.webapp;
-
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * A Servlet that forwards requests to the Servlets registered with the Tuscany
- * ServletHost.
- *
- * @version $Rev$ $Date$
- * @deprecated Not needed anymore, TuscanyServletFilter is sufficient
- */
-@Deprecated
-public class TuscanyServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    private transient WebAppServletHost servletHost;
-
-    @Override
-    public void init(ServletConfig config) throws ServletException {
-        ServletContext servletContext = config.getServletContext();
-        SCADomainHelper.initSCADomain(servletContext);
-
-        // TODO: must be a better way to get this than using a static
-        servletHost = WebAppServletHost.getInstance();
-        servletHost.init(config);
-    }
-
-    @Override
-    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-        String path = ((HttpServletRequest)req).getPathInfo();
-        RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path);
-        if (dispatcher == null) {
-            throw new IllegalStateException("No servlet registered for path: " + path);
-        }
-
-        dispatcher.forward(req, res);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
deleted file mode 100644
index a5a3745d7f..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.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.host.webapp;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-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;
-
-/**
- * A Servlet filter that forwards service requests to the Servlets registered with
- * the Tuscany ServletHost.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyServletFilter implements Filter {
-    private static final long serialVersionUID = 1L;
-    //private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName());
-
-    private WebAppServletHost servletHost;
-
-    public void init(final FilterConfig config) throws ServletException {
-        // TODO: must be a better way to get this than using a static
-        servletHost = WebAppServletHost.getInstance();
-
-        // Initialize the Servlet host
-        servletHost.init(new ServletConfig() {
-            public String getInitParameter(String name) {
-                return config.getInitParameter(name);
-            }
-
-            public Enumeration getInitParameterNames() {
-                return config.getInitParameterNames();
-            }
-
-            public ServletContext getServletContext() {
-                return config.getServletContext();
-            }
-
-            public String getServletName() {
-                return config.getFilterName();
-            }
-        });
-    }
-
-    public void destroy() {
-        WebAppServletHost.getInstance().destroy();
-    }
-
-    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 = servletHost.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);
-
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
deleted file mode 100644
index dbe8a523f9..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.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.host.webapp;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-
-/**
- * Activates the webapp host by registering the webapp ServletHost impl
- *
- * @version $Rev$ $Date$
- */
-public class WebAppModuleActivator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        ServletHostExtensionPoint servletHosts =
-            extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class);
-        
-        List<ServletHost> hosts = servletHosts.getServletHosts();
-        if (isRunningInWebapp()) {
-            if (hosts.size() > 0) {
-                hosts.removeAll(hosts);
-            }
-            servletHosts.addServletHost(WebAppServletHost.getInstance());
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-    }
-
-    /**
-     * TODO: this seems a bit of a hacky way to find if its running in a webapp
-     *       is there a better way?
-     */
-    private boolean isRunningInWebapp() {
-        for (StackTraceElement ste : new Exception().getStackTrace()) {
-            if (ste.getClassName().equals(WebSCADomain.class.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
deleted file mode 100644
index 5fcaa35d8f..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.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.host.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
- * Servlet registered with the Webapp Servlet host.
- *
- * @version $Rev$ $Date$
- */
-class WebAppRequestDispatcher implements RequestDispatcher {
-    private String servletPath;
-    private Servlet servlet;
-    
-    public WebAppRequestDispatcher(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
-     */
-    protected 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/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
deleted file mode 100644
index 97dc6bc622..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-import java.io.File;
-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.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletMappingException;
-
-/**
- * ServletHost implementation for use in a webapp environment.
- * 
- * FIXME: using a static singleton seems a big hack but how should it be shared?
- * Need some way for TuscanyServlet to pull it out.
- *
- * @version $Rev$ $Date$
- */
-public class WebAppServletHost implements ServletHost {
-    private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName());
-
-    public static final String SCA_DOMAIN_ATTRIBUTE = "org.apache.tuscany.sca.SCADomain";
-
-    private static final WebAppServletHost instance = new WebAppServletHost();
-
-    private Map<String, Servlet> servlets;
-    private SCADomain scaDomain;
-    private String contextPath = "/";
-    private int defaultPortNumber = 8080;
-    private String contributionRoot;
-
-    private WebAppServletHost() {
-        servlets = new HashMap<String, Servlet>();
-    }
-
-    public void setDefaultPort(int port) {
-        defaultPortNumber = port;
-    }
-
-    public int getDefaultPort() {
-        return defaultPortNumber;
-    }
-
-    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 = 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 (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 WebAppRequestDispatcher(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)) {
-                    // entry key is contextPath/servletPath, WebAppRequestDispatcher only wants servletPath
-                    return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue());
-                } else {
-                    if ((suri + "/").startsWith(servletPath)) {
-                        return new WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()), entry.getValue());
-                    }
-                }
-            }
-        }
-
-        // No Servlet found
-        return null;
-    }
-
-    public static WebAppServletHost getInstance() {
-        return instance;
-    }
-
-    public void init(ServletConfig config) throws ServletException {
-
-        ServletContext servletContext = config.getServletContext();
-        if (servletContext.getAttribute(SCA_DOMAIN_ATTRIBUTE) == null) {
-            initContextPath(config);
-            String domainURI = "http://localhost/" + contextPath;
-            contributionRoot = getContributionRoot(servletContext);
-            // logger.info("Contribution: " + contributionRoot);
-            System.setProperty(SCADomain.class.getName(), WebSCADomain.class.getName());
-            this.scaDomain = SCADomain.newInstance(domainURI, contributionRoot);
-            servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
-        }
-
-        // Initialize the registered Servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.init(config);
-        }
-    }
-
-    protected String getContributionRoot(ServletContext servletContext) {
-        String contributionRoot = null;
-        try {
-
-            InitialContext ic = new InitialContext();
-            URL repoURL = (URL)ic.lookup("java:comp/env/url/contributions");
-
-            contributionRoot = repoURL.toString();
-
-        } catch (NamingException e) {
-
-            // ignore exception and use default location
-
-            try {
-                
-                String root = servletContext.getInitParameter("contributionRoot");
-                if (root == null || root.length() < 1) {
-                    root = "/";
-                }
-                URL rootURL = servletContext.getResource(root);
-                if (rootURL.getProtocol().equals("jndi")) {
-                    //this is Tomcat case, we should use getRealPath
-                    File warRootFile = new File(servletContext.getRealPath(root));
-                    contributionRoot = warRootFile.toURL().toString();
-                } else {
-                    //this is Jetty case
-                    contributionRoot = rootURL.toString();
-                }
-
-            } catch (MalformedURLException mf) {
-                //ignore, pass null
-            }
-        }
-
-        return contributionRoot;
-    }
-
-    /**
-     * Initializes the contextPath
-     * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet
-     * containers use an init parameter.
-     */
-    @SuppressWarnings("unchecked")
-    public void initContextPath(ServletConfig config) {
-        
-        if (Collections.list(config.getInitParameterNames()).contains("contextPath")) {
-            contextPath = config.getInitParameter("contextPath");
-        } else {
-            // The getContextPath() is introduced since Servlet 2.5
-            ServletContext context = config.getServletContext();
-            try {
-                // Try to get the method anyway since some ServletContext impl has this method even before 2.5
-                Method m = context.getClass().getMethod("getContextPath", new Class[] {});
-                contextPath = (String)m.invoke(context, new Object[] {});
-            } catch (Exception e) {
-                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);
-    }
-
-    void destroy() {
-
-        // Destroy the registered Servlets
-        for (Servlet servlet : servlets.values()) {
-            servlet.destroy();
-        }
-
-        // Close the SCA domain
-        if (scaDomain != null) {
-            scaDomain.close();
-            if (scaDomain instanceof WebSCADomain) {
-                ((WebSCADomain)scaDomain).destroy();
-            }
-        }
-    }
-
-    public String getContextPath() {
-        return contextPath;
-    }
-
-    public void setContextPath(String path) {
-        //        if (!contextPath.equals(path)) {
-        //            throw new IllegalArgumentException("invalid context path for webapp, existing context path: " + contextPath + " new contextPath: " + path);
-        //        }
-    }
-
-    /**
-     * TODO: How context paths work is still up in the air so for now
-     *    this hacks in a path that gets some samples working
-     *    can't use setContextPath as NodeImpl calls that later
-     */
-    public void setContextPath2(String path) {
-        if (path != null && path.length() > 0) {
-            this.contextPath = path;
-        }
-    }
-
-    public String getContributionRoot() {
-        return contributionRoot;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
deleted file mode 100644
index be35733220..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.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.webapp;
-
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebSCADomain extends DefaultSCADomain {
-
-    /**
-     * @param runtimeClassLoader
-     * @param applicationClassLoader
-     * @param domainURI
-     * @param contributionLocation
-     * @param composites
-     */
-    public WebSCADomain(ClassLoader runtimeClassLoader,
-                        ClassLoader applicationClassLoader,
-                        String domainURI,
-                        String contributionLocation,
-                        String... composites) {
-        super(runtimeClassLoader, applicationClassLoader, domainURI, contributionLocation, composites);
-    }
-
-    @Override
-    public void close() {
-        // Disable the close() as a hack to keep the WebSCADomain open
-    }
-
-    public void destroy() {
-        super.close();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
deleted file mode 100644
index 0f77f2f2b4..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.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.host.webapp.jsp;
-
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
-
-/**
- * TagExtraInfo class for the SCA reference tags
- * <sca:reference name="service" type="test.MyService" scope="1" />
- *
- * @version $Rev$ $Date$
- */
-public class ReferenceTEI extends TagExtraInfo {
-
-    public VariableInfo[] getVariableInfo(TagData data) {
-        VariableInfo info1
-           = new VariableInfo(
-              data.getAttributeString("name"),
-              data.getAttributeString("type"),
-              true,
-              VariableInfo.AT_END);
-        VariableInfo[] info = { info1 } ;
-        return info;
-     }
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
deleted file mode 100644
index 20545e88c3..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.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.host.webapp.jsp;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.webapp.WebAppServletHost;
-
-/**
- * Tag to handle SCA references
- * <sca:reference name="service" type="test.MyService" scope="1" />
- *
- * @version $Rev$ $Date$
- */
-public class ReferenceTag extends TagSupport {
-    private static final long serialVersionUID = 1L;
-
-    protected String name;
-    protected String type;
-    protected Integer scope = PageContext.PAGE_SCOPE;
-
-    public int doStartTag() throws JspException {
-        return SKIP_BODY;
-    }
-
-    public int doEndTag() throws JspException {
-
-        try {
-            WebAppServletHost.getInstance().init(pageContext.getServletConfig());
-        } catch (ServletException e) {
-            throw new JspException("Exception initializing Tuscany webapp: " + e, e);
-        }
- 
-        ServletContext servletContext = pageContext.getServletContext();
-        SCADomain scaDomain = (SCADomain)servletContext.getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE);
-        if (scaDomain == null) {
-            throw new JspException("SCADomain is null. Check Tuscany configuration in web.xml");
-        }
-
-        Class<?> typeClass;
-        try {
-            typeClass = Class.forName(type, true, Thread.currentThread().getContextClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new JspException("Reference '" + name + "' type class not found: " + type);
-        }
-
-        Object o;
-        try {
-            o = scaDomain.getService(typeClass, name);
-        } catch (Exception e) {
-            throw new JspException("Exception getting service for reference'" + name + "': " + e, e);
-        }
-        if (o == null) {
-            throw new JspException("Reference '" + name + "' not found");
-        }
-
-        pageContext.setAttribute(name, o, scope);
-
-        return EVAL_PAGE;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getScope() {
-        return scope;
-    }
-
-    public void setScope(Integer scope) {
-        this.scope = scope;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/resources/META-INF/sca.tld b/tags/java/sca/1.3/modules/host-webapp/src/main/resources/META-INF/sca.tld
deleted file mode 100644
index 22a9dc3414..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/src/main/resources/META-INF/sca.tld
+++ /dev/null
@@ -1,59 +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 taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">

-

-<taglib version="2.1">

-

-  <tlib-version>1.0</tlib-version>

-  <short-name>SCA-JSP</short-name>

-  <uri>http://www.osoa.org/sca/sca_jsp.tld</uri>

-  <description>A tag library for integrating sca components with jsp</description>

-

-  <tag>

-

-    <name>reference</name>

-

-    <tag-class>org.apache.tuscany.sca.host.webapp.jsp.ReferenceTag</tag-class>

-    <tei-class>org.apache.tuscany.sca.host.webapp.jsp.ReferenceTEI</tei-class>

-    

-    <attribute>

-      <name>name</name>

-      <required>true</required>

-      <type>java.lang.String</type>

-    </attribute>

-

-    <attribute>

-      <name>type</name>

-      <required>true</required>

-      <type>java.lang.String</type>

-    </attribute>

-

-    <attribute>

-      <name>scope</name>

-      <required>false</required>

-      <type>java.lang.Integer</type>

-    </attribute>

-

-    <body-content>empty</body-content>

-

-  </tag>

-

-</taglib>

diff --git a/tags/java/sca/1.3/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index d99fdf257e..0000000000
--- a/tags/java/sca/1.3/modules/host-webapp/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.host.webapp.WebAppModuleActivator

diff --git a/tags/java/sca/1.3/modules/implementation-bpel-ode/LICENSE b/tags/java/sca/1.3/modules/implementation-bpel-ode/LICENSE
deleted file mode 100644
index baba9ca048..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/NOTICE b/tags/java/sca/1.3/modules/implementation-bpel-ode/NOTICE
deleted file mode 100644
index a2f696be26..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/NOTICE
+++ /dev/null
@@ -1,17 +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/).

-

-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/tags/java/sca/1.3/modules/implementation-bpel-ode/pom.xml b/tags/java/sca/1.3/modules/implementation-bpel-ode/pom.xml
deleted file mode 100644
index 8f13efeddf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/pom.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * 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.3</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>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-implementation-bpel</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-core</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-interface</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-assembly-xml</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-contribution-impl</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-sca-api</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-databinding</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-databinding-sdo</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-implementation-java-runtime</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-host-embedded</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.3</version>

-		</dependency>

-		<dependency>

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

-			<artifactId>tuscany-sdo-impl</artifactId>

-			<version>1.1-incubating</version>

-			<scope>compile</scope>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>3.8.1</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.easymock</groupId>

-			<artifactId>easymock</artifactId>

-			<version>2.2</version>

-			<scope>test</scope>

-		</dependency>

-		

-		<!-- ODE Jars -->

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-epr</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-store</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-dao</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-dao</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-dao-jpa</artifactId>

-			<version>1.1</version>

-		</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.ode</groupId>

-			<artifactId>ode-bpel-runtime</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-api</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-scheduler-simple</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-utils</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-compiler</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-schemas</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-bpel-obj</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-jacob</artifactId>

-			<version>1.1</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.ode</groupId>

-			<artifactId>ode-jacob-ap</artifactId>

-			<version>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>

-			</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>

-		</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</version>

-									<type>zip</type>

-									<overWrite>true</overWrite>

-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>

-								</artifactItem>

-							</artifactItems>

-						</configuration>

-					</execution>

-				</executions>

-			</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.implementation.bpel</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.implementation.bpel*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-		</plugins>

-	</build>

-</project>

diff --git a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
deleted file mode 100644
index dc77c5ecc6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.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.bpel.ode;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;

-import org.apache.tuscany.sca.assembly.ComponentType;

-import org.apache.tuscany.sca.assembly.Service;

-import org.apache.tuscany.sca.assembly.Reference;

-

-import java.io.File;

-import java.io.PrintStream;

-import java.io.IOException;

-import java.io.FileOutputStream;

-import java.net.URL;

-

-import javax.xml.namespace.QName;

-import java.util.List;

-

-/**

- * 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() {

-        URL fileURL = implementation.getProcessDefinition().getLocation();

-        try {

-            File theProcess = new File( fileURL.toURI());

-            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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
deleted file mode 100644
index 84c40defd9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.ProcessConf;
-import org.apache.ode.bpel.iapi.ProcessStore;
-import org.apache.ode.bpel.iapi.ProcessStoreEvent;
-import org.apache.ode.bpel.iapi.ProcessStoreListener;
-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.store.ProcessStoreImpl;
-import org.apache.ode.utils.GUID;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-//-------------- Added by Mike Edwards 16/05/2008
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
-//-------------- End of Mike Edwards additions
-
-/**
- * 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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
deleted file mode 100644
index 11af0f8b50..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
deleted file mode 100644
index 3f2db7b244..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
deleted file mode 100644
index ae75570352..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.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.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;
-    }
-
-    public String toString() {
-        return "Deployment#" + deployDir;
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
deleted file mode 100644
index b03f69d9aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
deleted file mode 100644
index 15e9229601..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
deleted file mode 100644
index 2fa91e4e86..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
deleted file mode 100644
index 1ec82390cf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
deleted file mode 100644
index a928379ba9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
deleted file mode 100644
index 328403e626..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
deleted file mode 100644
index 8f8f608217..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
deleted file mode 100644
index 67cb952800..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-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");
-        URL processURL = implementation.getProcessDefinition().getLocation();
-        try {
-            return getRelativePath( getDirectory(), new File( processURL.toURI() ));
-        } catch (Exception e) {
-            if(__log.isWarnEnabled()) {
-                __log.warn("Unable to resolve relative path of BPEL process" + processURL, 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() {
-        URL fileURL = implementation.getProcessDefinition().getLocation();
-        try {
-            File theProcess = new File( fileURL.toURI());
-            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) {
-        // TODO Auto-generated method stub
-        return null;
-    }*/
-    // end of other public APIs
-    //-----------------------------------------------------------------------------
-
-} // end class TuscanyProcessConfImpl
diff --git a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
deleted file mode 100644
index a48d5cb20a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.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.provider;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.transaction.TransactionManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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;
-    }
-
-    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();
-            }
-
-            URL deployURL = this.implementation.getProcessDefinition().getLocation();
-            
-            File deploymentDir = new File(deployURL.toURI().getPath()).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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
deleted file mode 100644
index 4233db44e7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/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.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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELInvoker.java
deleted file mode 100644
index df194dd68d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/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.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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index b6481b1512..0000000000
--- a/tags/java/sca/1.3/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.provider.BPELImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation

diff --git a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
deleted file mode 100644
index ac21d47962..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.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.implementation.bpel;
-
-import java.io.File;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.concurrent.Future;
-
-import javax.transaction.TransactionManager;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-import org.apache.ode.bpel.iapi.Message;
-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.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.implementation.bpel.ode.EmbeddedODEServer;
-import org.apache.tuscany.sca.implementation.bpel.ode.GeronimoTxFactory;
-import org.apache.tuscany.sca.implementation.bpel.ode.ODEDeployment;
-import org.w3c.dom.Element;
-
-/**
- * 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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/deploy.xml
deleted file mode 100644
index 571aa37d58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
deleted file mode 100644
index bcd3ea6afa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 1d71727b2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/tags/java/sca/1.3/modules/implementation-bpel-ode/src/test/resources/log4j.properties
deleted file mode 100644
index a3aa39127c..0000000000
--- a/tags/java/sca/1.3/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.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/tags/java/sca/1.3/modules/implementation-bpel/LICENSE b/tags/java/sca/1.3/modules/implementation-bpel/LICENSE
deleted file mode 100644
index baba9ca048..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel/NOTICE b/tags/java/sca/1.3/modules/implementation-bpel/NOTICE
deleted file mode 100644
index a2f696be26..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel/NOTICE
+++ /dev/null
@@ -1,17 +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/).

-

-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/tags/java/sca/1.3/modules/implementation-bpel/pom.xml b/tags/java/sca/1.3/modules/implementation-bpel/pom.xml
deleted file mode 100644
index 97bcbd8648..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel/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>1.3</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>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-assembly-xml</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-interface</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-interface-wsdl</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-interface-java</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-interface-wsdl-xml</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

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

-			<artifactId>tuscany-databinding</artifactId>

-			<version>1.3</version>

-		</dependency>

-

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>3.8.1</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.implementation.bpel</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.implementation.bpel*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-		</plugins>

-	</build>

-</project>

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

-

-import javax.xml.namespace.QName;

-

-import javax.wsdl.PortType;

-

-/**

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

- * - this has attributes:

- *      name

- *      partnerLinkType

- *      myRole

- *      partnerRole

- * - plus zero or more property elements as children

- * 

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

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

- *

- * @version $Rev$ $Date$

- */

-public class BPELPartnerLinkElement {

-

-    private String 	REFERENCE_TYPE = "reference";

-    private String 	SERVICE_TYPE = "service";

-	private String 	name;

-	private QName	partnerLinkType;

-    private BPELPartnerLinkTypeElement 	pLinkType = null;

-    private String 	myRole;

-    private String 	partnerRole;

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

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

-    

-    public BPELPartnerLinkElement(String name, 

-    							  QName partnerLinkType,

-    							  String myRole, 

-    							  String partnerRole ) {

-        this.name = name;

-        this.partnerLinkType = partnerLinkType;

-        this.myRole = myRole;

-        this.partnerRole = partnerRole;

-        

-        scaName = null;

-    }

-

-    public QName getPartnerLinkType() {

-        return partnerLinkType;

-    }

-    

-    public void setPartnerLinkType( BPELPartnerLinkTypeElement pLinkType ) {

-    	this.pLinkType = pLinkType;

-    }

-    

-    

-    public PortType getMyRolePortType() {

-    	return getRolePortType( myRole );

-    }

-    

-    public PortType getPartnerRolePortType() {

-    	return getRolePortType( partnerRole );

-    }

-    

-    private PortType getRolePortType( String theRole ) {

-    	if( theRole == null ) return null;

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

-    		return pLinkType.getRole1pType();

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

-    		return pLinkType.getRole2pType();

-    	} // end if 

-    	return null;

-    } // end getRolePortType

-

-    public String getName() {

-        return name;

-    }

-    

-    public String getMyRole() {

-    	return myRole;

-    }

-    

-    public String getPartnerRole() {

-    	return partnerRole;

-    }

-    

-    public void setSCAName( String name ) {

-    	scaName = name;

-    }

-    

-    public String getSCAName() {

-    	return scaName;

-    }

-    

-    public boolean isSCATyped() {

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

-    }

-    

-    public void setAsReference( String name ) {

-    	scaType = REFERENCE_TYPE;

-    	scaName = name;

-    }

-    

-    public void setAsService( String name ) {

-    	scaType = SERVICE_TYPE;

-    	scaName = name;

-    }

-    

-    public String querySCAType() {

-    	return scaType;

-    }

-

-} // end class BPELPartnerLinkElement

diff --git a/tags/java/sca/1.3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/tags/java/sca/1.3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
deleted file mode 100644
index e013215f5e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.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.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/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 4763c69768..0000000000
--- a/tags/java/sca/1.3/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.impl.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/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 066fdc864b..0000000000
--- a/tags/java/sca/1.3/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.impl.BPELDocumentProcessor;type=.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
deleted file mode 100644
index 53ffd1b72a..0000000000
--- a/tags/java/sca/1.3/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.DefaultBPELFactory

diff --git a/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
deleted file mode 100644
index b6d8bdc0f1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
deleted file mode 100644
index 76644e5209..0000000000
--- a/tags/java/sca/1.3/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, bpelProcessDefinition.getLocation());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
deleted file mode 100644
index 14500f6e14..0000000000
--- a/tags/java/sca/1.3/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.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.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.assembly.xml.Constants;
-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.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BPELImplementationProcessorTestCase extends TestCase {
-    
-    protected static final QName IMPLEMENTATION_BPEL = new QName(Constants.SCA10_NS, "implementation.bpel");
-
-    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 DefaultMonitorFactoryImpl();  
-        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));
-        /*try {
-            staxProcessor.read(reader);            
-            fail("InvalidException should have been thrown");
-        } catch(Exception e) {
-            assertTrue(true);
-        }*/
-        staxProcessor.read(reader);
-        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();           
-        assertNotNull(problem);
-        assertEquals("AttributeProcessMissing", problem.getMessageId());
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
deleted file mode 100644
index 8cf91adc2c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.3/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
deleted file mode 100644
index 1d71727b2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/LICENSE b/tags/java/sca/1.3/modules/implementation-ejb/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/NOTICE b/tags/java/sca/1.3/modules/implementation-ejb/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-ejb/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/tags/java/sca/1.3/modules/implementation-ejb/pom.xml b/tags/java/sca/1.3/modules/implementation-ejb/pom.xml
deleted file mode 100644
index 739c0cab12..0000000000
--- a/tags/java/sca/1.3/modules/implementation-ejb/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope> 
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.ejb</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.ejb*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
deleted file mode 100644
index 0d3b05f0c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
deleted file mode 100644
index bf9e13069b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
deleted file mode 100644
index 050d0cf17a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
deleted file mode 100644
index bf2e6354d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
deleted file mode 100644
index b28766f387..0000000000
--- a/tags/java/sca/1.3/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.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.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.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.implementation.ejb.EJBImplementation;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-
-/**
- * Implements a StAX artifact processor for EJB implementations.
- *
- * @version $Rev$ $Date$
- */
-public class EJBImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<EJBImplementation> {
-    private static final QName IMPLEMENTATION_EJB = new QName(Constants.SCA10_NS, "implementation.ejb");
-    
-    private AssemblyFactory assemblyFactory;
-    private EJBImplementationFactory implementationFactory;
-    private Monitor monitor;
-    
-    public EJBImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.implementationFactory = modelFactories.getFactory(EJBImplementationFactory.class);
-        this.monitor = monitor;
-    }
-
-    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);
-            }
-        }
-
-        // 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/tags/java/sca/1.3/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ae6db609a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/tags/java/sca/1.3/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
deleted file mode 100644
index fb828707a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
deleted file mode 100644
index b692ab3f5a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.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.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.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.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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.ejb.EJBImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * 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);
-        
-        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);
-    }
-
-    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);
-        
-        assertTrue(((EJBImplementation) composite.getComponents().get(0).getImplementation()).getEJBLink().equals("module.jar#TestEJB"));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
deleted file mode 100644
index 8ba43dd635..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/tags/java/sca/1.3/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
deleted file mode 100644
index 0c1368c4dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-java-runtime/LICENSE b/tags/java/sca/1.3/modules/implementation-java-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-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/tags/java/sca/1.3/modules/implementation-java-runtime/NOTICE b/tags/java/sca/1.3/modules/implementation-java-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-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/tags/java/sca/1.3/modules/implementation-java-runtime/pom.xml b/tags/java/sca/1.3/modules/implementation-java-runtime/pom.xml
deleted file mode 100644
index b85eeb064c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-java-runtime</artifactId>
-    <name>Apache Tuscany SCA Java Implementation Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</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.implementation.java.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.java*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
deleted file mode 100644
index ac8af3ed64..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.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.java.context;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-
-/**
- * Interface for a factory that returns an injected component instance.
- * This is used by a Component implementation to create new instances of
- * application implementation objects as determined by the component scope's
- * lifecycle.
- * <p/>
- * The implementation of this interface may be supplied by the user,
- * may be generated during deployment, or may be dynamic.
- *
- * @version $Rev$ $Date$
- * @param <T> Type of the instance generated by the factory.
- */
-public interface InstanceFactory<T> {
-    /**
-     * Creates a new instance of the component.
-     * All injected values must be set but any @Init methods must not have been invoked.
-     * 
-     * @return A wrapper for the created component instance.
-     */
-    InstanceWrapper<T> newInstance();
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
deleted file mode 100644
index a93710d266..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.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.java.context;
-
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface InstanceFactoryProvider<T> {
-    /**
-     * Return the implementation class.
-     *
-     * @return the implementation class.
-     */
-    Class<T> getImplementationClass();
-
-    /**
-     * Sets an object factory for an injection site
-     *
-     * @param element          the injection site name
-     * @param objectFactory the object factory
-     */
-    void setObjectFactory(JavaElementImpl element, ObjectFactory<?> objectFactory);
-
-    /**
-     * Create an instance factory that can be used to create component instances.
-     *
-     * @return a new instance factory
-     */
-    InstanceFactory<T> createFactory();
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
deleted file mode 100644
index b5d3254fa0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.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.implementation.java.context;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-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.implementation.java.injection.Injector;
-import org.apache.tuscany.sca.implementation.java.invocation.EventInvoker;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReflectiveInstanceFactory<T> implements InstanceFactory<T> {
-    private final Constructor<T> ctr;
-    private final ObjectFactory<?>[] ctrArgs;
-    private final Injector<T>[] injectors;
-    private final EventInvoker<T> initInvoker;
-    private final EventInvoker<T> destroyInvoker;
-
-    public ReflectiveInstanceFactory(Constructor<T> ctr,
-                                     ObjectFactory<?>[] ctrArgs,
-                                     Injector<T>[] injectors,
-                                     EventInvoker<T> initInvoker,
-                                     EventInvoker<T> destroyInvoker) {
-        this.ctr = ctr;
-        this.ctrArgs = ctrArgs;
-        this.injectors = injectors;
-        this.initInvoker = initInvoker;
-        this.destroyInvoker = destroyInvoker;
-    }
-
-    public InstanceWrapper<T> newInstance() {
-        T instance;
-        try {
-            if (ctrArgs != null) {
-                Object[] args = new Object[ctrArgs.length];
-                for (int i = 0; i < args.length; i++) {
-                    args[i] = ctrArgs[i].getInstance();
-                }
-                instance = ctr.newInstance(args);
-            } else {
-                instance = ctr.newInstance();
-            }
-        } catch (InstantiationException e) {
-            String name = ctr.getDeclaringClass().getName();
-            throw new AssertionError("Class is not instantiable [" + name + "]");
-        } catch (IllegalAccessException e) {
-            String name = ctr.getName();
-            throw new AssertionError("Constructor is not accessible [" + name + "]");
-        } catch (
-            InvocationTargetException e) {
-            String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
-        }
-
-        if (injectors != null) {
-            for (Injector<T> injector : injectors) {
-                //FIXME Injectors should never be null
-                if (injector != null)
-                    injector.inject(instance);
-            }
-        }
-
-        return new ReflectiveInstanceWrapper<T>(instance, initInvoker, destroyInvoker);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
deleted file mode 100644
index 5285caa481..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.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.implementation.java.context;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetInitializationException;
-import org.apache.tuscany.sca.implementation.java.invocation.EventInvoker;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReflectiveInstanceWrapper<T> implements InstanceWrapper<T> {
-    private final EventInvoker<T> initInvoker;
-    private final EventInvoker<T> destroyInvoker;
-    private final T instance;
-
-    public ReflectiveInstanceWrapper(T instance, EventInvoker<T> initInvoker, EventInvoker<T> destroyInvoker) {
-        this.instance = instance;
-        this.initInvoker = initInvoker;
-        this.destroyInvoker = destroyInvoker;
-    }
-    
-    public T getInstance() {
-        return instance;
-    }
-
-    public void start() throws TargetInitializationException {
-        if (initInvoker != null) {
-            initInvoker.invokeEvent(instance);
-        }
-    }
-
-
-    public void stop() throws TargetDestructionException {
-        if (destroyInvoker != null) {
-            destroyInvoker.invokeEvent(instance);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
deleted file mode 100644
index 2513c63e38..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.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.java.injection;
-
-import java.lang.reflect.Array;
-import java.util.List;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Resolves targets configured in a multiplicity by delegating to object factories and returning an <code>Array</code>
- * containing object instances
- *
- * @version $Rev$ $Date$
- */
-public class ArrayMultiplicityObjectFactory implements ObjectFactory<Object> {
-
-    private ObjectFactory[] factories;
-
-    private Class interfaceType;
-
-    public ArrayMultiplicityObjectFactory(Class interfaceType, List<ObjectFactory<?>> factories) {
-        assert interfaceType != null : "Interface type was null";
-        assert factories != null : "Object factories were null";
-        this.interfaceType = interfaceType;
-        this.factories = factories.toArray(new ObjectFactory[factories.size()]);
-    }
-
-    public Object getInstance() throws ObjectCreationException {
-        Object array = Array.newInstance(interfaceType, factories.length);
-        for (int i = 0; i < factories.length; i++) {
-            Array.set(array, i, factories[i].getInstance());
-        }
-        return array;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
deleted file mode 100644
index d8eef18c74..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.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.java.injection;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-
-/**
- * Implementations inject a pre-configured context type (interface) on an instance.
- *
- * @version $Rev$ $Date$
- */
-public interface ContextInjector<S, T> extends Injector<T> {
-
-    void setContext(S context) throws ObjectCreationException;
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
deleted file mode 100644
index ffce7ce467..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.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.java.injection;

-

-import org.apache.tuscany.sca.core.factory.ObjectFactory;

-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;

-

-/**

- * Object Factory that is used to retrieve the ConversationID from the

- * Message on the ThreadMessageContext.

- *

- * @version $Rev$ $Date$

- */

-public class ConversationIDObjectFactory implements ObjectFactory {

-

-    public ConversationIDObjectFactory() {

-    }

-

-    public Object getInstance() {

-        return ThreadMessageContext.getMessageContext().getFrom().getReferenceParameters().getConversationID();

-

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
deleted file mode 100644
index dd454be7c5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.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.java.injection;
-
-import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Injects a value created by an {@link org.apache.tuscany.sca.core.factory.ObjectFactory} on a given field
- *
- * @version $Rev$ $Date$
- */
-public class FieldInjector<T> implements Injector<T> {
-
-    private final Field field;
-
-    private final ObjectFactory<?> objectFactory;
-
-    /**
-     * Create an injector and have it use the given <code>ObjectFactory</code> to inject a value on the instance using
-     * the reflected <code>Field</code>
-     */
-    public FieldInjector(Field pField, ObjectFactory<?> objectFactory) {
-        field = pField;
-        // Allow privileged access to set accessibility. Requires ReflectPermission
-        // in security policy.
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                field.setAccessible(true); // ignore Java accessibility
-                return null;
-            }
-        });
-        
-        this.objectFactory = objectFactory;
-    }
-
-    /**
-     * Inject a new value on the given instance
-     */
-    public void inject(T instance) throws ObjectCreationException {
-        try {
-            field.set(instance, objectFactory.getInstance());
-        } catch (IllegalAccessException e) {
-            throw new ObjectCreationException("Field is not accessible [" + field + "]", e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
deleted file mode 100644
index 4a8c8f31b8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.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.java.injection;
-
-
-/**
- * Root unchecked exception for the injection package
- *
- * @version $Rev$ $Date$
- */
-public abstract class InjectionRuntimeException extends RuntimeException {
-
-    public InjectionRuntimeException() {
-        super();
-    }
-
-    public InjectionRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InjectionRuntimeException(String message) {
-        super(message);
-    }
-
-    public InjectionRuntimeException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
deleted file mode 100644
index 4d062859b9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.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.java.injection;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-
-/**
- * Implementations inject a pre-configured value on an instance
- *
- * @version $Rev$ $Date$
- */
-public interface Injector<T> {
-
-    /**
-     * Inject a value on the given instance
-     */
-    void inject(T instance) throws ObjectCreationException;
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
deleted file mode 100644
index 5aeebcca36..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.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.java.injection;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InvalidAccessorException extends InjectionRuntimeException {
-    private static final long serialVersionUID = 9196299279363310978L;
-
-    public InvalidAccessorException() {
-        super();
-    }
-
-    public InvalidAccessorException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InvalidAccessorException(String message) {
-        super(message);
-    }
-
-    public InvalidAccessorException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
deleted file mode 100644
index 695dea3343..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.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.java.injection;

-

-import java.lang.reflect.Array;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.StringTokenizer;

-

-import org.apache.tuscany.sca.assembly.ComponentProperty;

-import org.apache.tuscany.sca.assembly.Property;

-import org.apache.tuscany.sca.context.PropertyValueFactory;

-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.DOMHelper;

-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;

-import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;

-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;

-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;

-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;

-import org.w3c.dom.NodeList;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class JavaPropertyValueObjectFactory implements PropertyValueFactory {

-    private Mediator mediator = null;

-    private boolean isSimpleType;

-

-    public JavaPropertyValueObjectFactory(Mediator mediator) {

-        this.mediator = mediator;

-    }

-    

-    public ObjectFactory createValueFactory(Property property, Object propertyValue, JavaElementImpl javaElement) {

-        isSimpleType = isSimpleType(property);

-        Document doc = (Document)propertyValue;

-        Class javaType = JavaIntrospectionHelper.getBaseType(javaElement.getType(), javaElement.getGenericType());

-        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);

-                if ( javaElement.getType().isArray() ) {

-                    return new ArrayObjectFactoryImpl(property, values, isSimpleType, javaType);

-                } else {

-                    return new ListObjectFactoryImpl(property, values, isSimpleType, javaType);

-                }

-            } else {

-                if ( javaElement.getType().isArray() ) {

-                    return new ArrayObjectFactoryImpl(property, getComplexPropertyValues(doc), 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 {

-                List<Node> nodes = getComplexPropertyValues(doc);

-                Object value = null;

-                if (!nodes.isEmpty()) {

-                    value = nodes.get(0);

-                }

-                return new ObjectFactoryImpl(property, value, isSimpleType, javaType);

-            }

-

-        }

-    }

-

-    public ObjectFactory createValueFactory(Property property, Object propertyValue, Class javaType) {

-        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 {

-                List<Node> nodes = getComplexPropertyValues(doc);

-                Object value = null;

-                if (!nodes.isEmpty()) {

-                    value = nodes.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() == Element.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>();

-        NodeList nodes = rootElement.getChildNodes();

-        for (int count = 0; count < nodes.getLength(); ++count) {

-            if (nodes.item(count).getNodeType() == Document.ELEMENT_NODE) {

-                propValues.add(DOMHelper.promote(nodes.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);

-                mediator.getDataBindings().introspectType(targetDataType, null);

-            }

-        }

-    }

-

-    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) {

-                try {

-                    return simpleTypeMapper.toJavaObject(property.getXSDType(), (String)propertyValue, null);

-                } catch (NumberFormatException ex) {

-                    throw new ObjectCreationException("Failed to create instance for property " 

-                            + property.getName() + " with value " + propertyValue, ex);

-                } catch (IllegalArgumentException ex) {

-                    throw new ObjectCreationException("Failed to create instance for property " 

-                            + property.getName() + " with value " + propertyValue, ex);

-                }

-            } else {

-                return mediator.mediate(propertyValue, sourceDataType, targetDataType, null);

-                // 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) {

-                    try {

-                        values.add(simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null));

-                    } catch (NumberFormatException ex) {

-                        throw new ObjectCreationException("Failed to create instance for property " 

-                                + property.getName() + " with value " + aValue 

-                                + " from value list of " + propertyValue, ex);

-                    } catch (IllegalArgumentException ex) {

-                        throw new ObjectCreationException("Failed to create instance for property " 

-                                + property.getName() + " with value " + aValue 

-                                + " from value list of " + propertyValue, ex);

-                    }

-                }

-                return values;

-            } else {

-                List instances = new ArrayList();

-                for (Node aValue : (List<Node>)propertyValue) {

-                    instances.add(mediator.mediate(aValue, sourceDataType, targetDataType, null));

-                }

-                return instances;

-            }

-        }

-    }

-    

-    public class ArrayObjectFactoryImpl extends ObjectFactoryImplBase {

-        public ArrayObjectFactoryImpl(Property property, List<?> propertyValues, boolean isSimpleType, Class javaType) {

-            super(property, propertyValues, isSimpleType, javaType);

-        }

-

-        @SuppressWarnings("unchecked")

-        public Object getInstance() throws ObjectCreationException {

-            if (isSimpleType) {

-                int count = 0;

-                Object values = Array.newInstance(javaType, ((List<Object>)propertyValue).size());

-                for (String aValue : (List<String>)propertyValue) {

-                    try {

-                        Array.set(values, count++, simpleTypeMapper.toJavaObject(property.getXSDType(), aValue, null));

-                    } catch (NumberFormatException ex) {

-                        throw new ObjectCreationException("Failed to create instance for property " 

-                                + property.getName() + " with value " + aValue

-                                + " from value list of " + propertyValue, ex);

-                    } catch (IllegalArgumentException ex) {

-                        throw new ObjectCreationException("Failed to create instance for property " 

-                                + property.getName() + " with value " + aValue

-                                + " from value list of " + propertyValue, ex);

-                    }

-                }

-                return values;

-            } else {

-                Object instances = Array.newInstance(javaType, ((List<Object>)propertyValue).size());

-                int count = 0;

-                for (Node aValue : (List<Node>)propertyValue) {

-                    Array.set(instances, count++, mediator.mediate(aValue, sourceDataType, targetDataType, null));

-                }

-                return instances;

-            }

-        }

-    }

-

-    /**

-     * This method will create an instance of the value for the specified Property.

-     * 

-     * @param property The Property from which to retrieve the property value

-     * @param type The type of the property value being retrieved from the Property

-     * @param <B> Type type of the property value being looked up

-     * 

-     * @return the value for the Property

-     */

-    public <B> B createPropertyValue(ComponentProperty property, Class<B> type)

-    {

-        ObjectFactory<B> factory = this.createValueFactory(property, property.getValue(), type);

-        return factory.getInstance();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
deleted file mode 100644
index 9f587f58de..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.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.implementation.java.injection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Resolves targets configured in a multiplicity by delegating to object factories and returning an <code>List</code>
- * containing object instances
- *
- * @version $Rev$ $Date$
- */
-public class ListMultiplicityObjectFactory implements ObjectFactory<List> {
-
-    private ObjectFactory[] factories;
-
-    public ListMultiplicityObjectFactory(List<ObjectFactory<?>> factories) {
-        assert factories != null : "Object factories were null";
-        this.factories = factories.toArray(new ObjectFactory[factories.size()]);
-    }
-
-    public List getInstance() throws ObjectCreationException {
-        List<Object> list = new ArrayList<Object>();
-        for (ObjectFactory factory : factories) {
-            list.add(factory.getInstance());
-        }
-        return list;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
deleted file mode 100644
index baf9eb9cc1..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.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.java.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Injects a value created by an {@link org.apache.tuscany.sca.core.factory.ObjectFactory} using a given method
- *
- * @version $Rev$ $Date$
- */
-public class MethodInjector<T> implements Injector<T> {
-    private final Method method;
-    private final ObjectFactory<?> objectFactory;
-
-    public MethodInjector(Method aMethod, ObjectFactory<?> objectFactory) {
-        assert aMethod != null;
-        assert objectFactory != null;
-        this.method = aMethod;
-        // Allow privileged access to set accessibility. Requires ReflectPermission in security
-        // policy.
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                method.setAccessible(true);
-                return null;
-            }
-        });           
-        this.objectFactory = objectFactory;
-    }
-
-    public void inject(T instance) throws ObjectCreationException {
-        try {
-            method.invoke(instance, objectFactory.getInstance());
-        } catch (IllegalAccessException e) {
-            throw new ObjectCreationException("Method is not accessible [" + method + "]", e);
-        } catch (IllegalArgumentException e) {
-            throw new ObjectCreationException("Exception thrown by setter: " + method.getName(), e);
-        } catch (InvocationTargetException e) {
-            throw new ObjectCreationException("Exception thrown by setter: " + method.getName(), e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
deleted file mode 100644
index ca9c08fe63..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.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.java.injection;
-
-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.ProxyFactory;
-import org.osoa.sca.RequestContext;
-
-/**
- * Creates instances of
- * {@link org.apache.tuscany.sca.core.context.RequestContextImpl} for
- * injection on component implementation instances
- * 
- * @version $Rev$ $Date$
- */
-public class RequestContextObjectFactory implements ObjectFactory<RequestContext> {
-    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/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
deleted file mode 100644
index 70c368a0e6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.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.implementation.java.injection;
-
-/**
- * Interface implemented by host environments that allow for resolution of component implementation resources, e.g.
- * items bound in a JNDI tree.
- *
- * @version $Rev$ $Date$
- */
-public interface ResourceHost {
-
-    /**
-     * Resolve a resource matching the given type
-     *
-     * @param type the type of the resources
-     * @throws ResourceResolutionException if an error is encountered during resolution
-     */
-    <T> T resolveResource(Class<T> type) throws ResourceResolutionException;
-
-    /**
-     * Resolve a resource matching the given type and name
-     *
-     * @param type       the type of the resources
-     * @param mappedName the mapped name of the resource
-     * @throws ResourceResolutionException if an error is encountered during resolution
-     */
-    <T> T resolveResource(Class<T> type, String mappedName) throws ResourceResolutionException;
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
deleted file mode 100644
index 17450f43cb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.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.java.injection;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-
-/**
- * Denotes an exception thrown when a runtime resource is not found
- *
- * @version $Rev$ $Date$
- */
-public class ResourceNotFoundException extends ObjectCreationException {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1L;
-
-    public ResourceNotFoundException() {
-        super();
-    }
-
-    public ResourceNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ResourceNotFoundException(String message) {
-        super(message);
-    }
-
-    public ResourceNotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
deleted file mode 100644
index 5d4d999453..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.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.implementation.java.injection;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Resolves a runtime resource to be injected on a field or method of a Java component type marked with {@link
- * javax.annotation.Resource}. If the mapped name of the resource is an absolute URI such as
- * <code>sca://localhost</code> or <code>jndi://localhost</code> the host container namespace is searched; otherwise the
- * URI is assumed to be relative and the parent composite is searched. If a mapped name is not provided, i.e. resolution
- * is by type, the parent composite is first searched followed by the host namespace.
- *
- * @version $Rev$ $Date$
- */
-public class ResourceObjectFactory<T> implements ObjectFactory<T> {
-
-    private Class<T> type;
-    private String mappedName;
-    private ResourceHost host;
-    private boolean optional;
-
-    /**
-     * Instantiates a factory that resolves resources by type
-     *
-     * @param type     the type of the resource to inject
-     * @param optional true if an error should be thrown if the resource is not found
-     * @param host     the runtime resource provider
-     */
-    public ResourceObjectFactory(Class<T> type, boolean optional, ResourceHost host) {
-        this(type, null, optional, host);
-    }
-
-    /**
-     * Instantiates a factory that resolves resources by mapped name
-     *
-     * @param type       the type of the resource to inject
-     * @param mappedName the resource name
-     * @param optional   true if an error should be thrown if the resource is not found
-     * @param host       the runtime resource provider
-     */
-    public ResourceObjectFactory(Class<T> type, String mappedName, boolean optional, ResourceHost host) {
-        this.type = type;
-        this.host = host;
-        this.mappedName = mappedName;
-        this.optional = optional;
-    }
-
-    @SuppressWarnings({"unchecked"})
-    public T getInstance() throws ObjectCreationException {
-        try {
-            T resource;
-            if (mappedName == null) {
-                resource = host.resolveResource(type);
-                if (!optional && resource == null) {
-                    throw new ResourceNotFoundException("Resource not found: " + type.getName());
-                }
-            } else {
-                resource = host.resolveResource(type, mappedName);
-                if (!optional && resource == null) {
-                    throw new ResourceNotFoundException("Resource not found: " + mappedName);
-                }
-            }
-            return resource;
-        } catch (ResourceResolutionException e) {
-            throw new ObjectCreationException(e);
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
deleted file mode 100644
index f94b24762a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.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.java.injection;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class ResourceResolutionException extends Exception {
-    private static final long serialVersionUID = 13421352711315479L;
-
-    public ResourceResolutionException() {
-        super();
-    }
-
-    public ResourceResolutionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ResourceResolutionException(String message) {
-        super(message);
-    }
-
-    public ResourceResolutionException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
deleted file mode 100644
index 25c09231c5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.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.java.invocation;
-
-import org.apache.tuscany.sca.implementation.java.injection.InjectionRuntimeException;
-
-/**
- * Denotes an error when invoking an event on an object
- *
- * @version $Rev$ $Date$
- */
-public class EventInvocationException extends InjectionRuntimeException {
-    private static final long serialVersionUID = 1480018831708211581L;
-
-    public EventInvocationException() {
-        super();
-    }
-
-    public EventInvocationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public EventInvocationException(String message) {
-        super(message);
-    }
-
-    public EventInvocationException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
deleted file mode 100644
index e6ebb5abc3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.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.java.invocation;
-
-/**
- * Performs an invocation on an instance
- *
- * @version $Rev$ $Date$
- */
-public interface EventInvoker<T> {
-
-    /**
-     * Performs the invocation on a given instance
-     *
-     * @throws EventInvocationException
-     */
-    void invokeEvent(T instance) throws EventInvocationException;
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
deleted file mode 100644
index 135fde09ff..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.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.implementation.java.invocation;
-
-import org.apache.tuscany.sca.core.invocation.TargetInvocationException;
-
-/**
- * Denotes an unknown operation sequence in a conversation
- *
- * @version $Rev$ $Date$
- */
-public class InvalidConversationSequenceException extends TargetInvocationException {
-    private static final long serialVersionUID = -5744028391493899147L;
-
-    public InvalidConversationSequenceException() {
-        super();
-    }
-
-    public InvalidConversationSequenceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InvalidConversationSequenceException(String message) {
-        super(message);
-    }
-
-    public InvalidConversationSequenceException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
deleted file mode 100644
index ef4e67d79a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.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.java.invocation;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.core.invocation.CallbackInterfaceInterceptor;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Phase;
-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.RuntimeWire;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaCallbackRuntimeWireProcessor implements RuntimeWireProcessor {
-    private static final Logger logger = Logger.getLogger(JavaCallbackRuntimeWireProcessor.class.getName());
-    private InterfaceContractMapper interfaceContractMapper;
-    private JavaInterfaceFactory javaInterfaceFactory;
-
-    /**
-     * @param interfaceContractMapper
-     * @param javaInterfaceFactory
-     */
-    public JavaCallbackRuntimeWireProcessor(InterfaceContractMapper interfaceContractMapper,
-                                            JavaInterfaceFactory javaInterfaceFactory) {
-        super();
-        this.interfaceContractMapper = interfaceContractMapper;
-        this.javaInterfaceFactory = javaInterfaceFactory;
-    }
-
-    public void process(RuntimeWire wire) {
-        addCallbackInterfaceInterceptors(wire);
-    }
-
-    private void addCallbackInterfaceInterceptors(RuntimeWire wire) {
-        Contract contract = wire.getSource().getContract();
-        if (!(contract instanceof RuntimeComponentReference)) {
-            return;
-        }
-        RuntimeComponent component = wire.getSource().getComponent();
-        Implementation implementation = component.getImplementation();
-        if (!(implementation instanceof JavaImplementation)) {
-            return;
-        }
-        JavaImplementation javaImpl = (JavaImplementation)implementation;
-        EndpointReference callbackEndpoint = wire.getSource().getCallbackEndpoint();
-        if (callbackEndpoint != null) {
-            Interface iface = callbackEndpoint.getContract().getInterfaceContract().getInterface();
-            if (!supportsCallbackInterface(iface, javaImpl)) {
-                // callback to this impl is not possible, so ensure a callback object is set
-                for (InvocationChain chain : wire.getInvocationChains()) {
-                    chain.addInterceptor(Phase.REFERENCE, new CallbackInterfaceInterceptor());
-                }
-            }
-        }
-    }
-
-    private boolean supportsCallbackInterface(Interface iface, JavaImplementation impl) {
-        if (iface instanceof JavaInterface) {
-            Class<?> ifaceClass = ((JavaInterface)iface).getJavaClass();
-            if (ifaceClass.isAssignableFrom(impl.getJavaClass())) {
-                return true;
-            }
-        }
-        try {
-            Interface implType = javaInterfaceFactory.createJavaInterface(impl.getJavaClass());
-            // Ignore the remotable/conversational testing
-            implType.setRemotable(iface.isRemotable());
-            implType.setConversational(iface.isConversational());
-            return interfaceContractMapper.isCompatible(iface, implType);
-        } catch (InvalidInterfaceException e) {
-            logger.log(Level.WARNING, e.getMessage(), e);
-            return false;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
deleted file mode 100644
index 2903cc6fc8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.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.java.invocation;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.osoa.sca.ComponentContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaComponentContextFactory implements ObjectFactory<ComponentContext> {
-    private final JavaComponentContextProvider component;
-
-
-    public JavaComponentContextFactory(JavaComponentContextProvider component) {
-        this.component = component;
-    }
-
-
-    public ComponentContext getInstance() throws ObjectCreationException {
-        return component.getComponent().getComponentContext();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
deleted file mode 100644
index e585b3d46f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.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.implementation.java.invocation;
-
-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.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-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.Reference;
-import org.apache.tuscany.sca.context.ComponentContextFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.context.ComponentContextImpl;
-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.CallableReferenceObjectFactory;
-import org.apache.tuscany.sca.core.invocation.CallbackReferenceObjectFactory;
-import org.apache.tuscany.sca.core.invocation.CallbackWireObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.invocation.WireObjectFactory;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.TargetResolutionException;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-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.ConversationIDObjectFactory;
-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.introspect.impl.JavaIntrospectionHelper;
-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.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.ConversationID;
-
-/**
- * The runtime instantiation of Java component implementations
- * 
- * @version $Rev$ $Date$
- */
-public class JavaComponentContextProvider {
-    private JavaPropertyValueObjectFactory propertyValueFactory;
-    private DataBindingExtensionPoint dataBindingRegistry;
-    private RuntimeComponent component;
-    private JavaInstanceFactoryProvider<?> instanceFactoryProvider;
-    private ProxyFactory proxyFactory;
-
-    public JavaComponentContextProvider(RuntimeComponent component,
-                                        JavaInstanceFactoryProvider configuration,
-                                        DataBindingExtensionPoint dataBindingExtensionPoint,
-                                        JavaPropertyValueObjectFactory propertyValueObjectFactory,
-                                        ComponentContextFactory componentContextFactory,
-                                        RequestContextFactory requestContextFactory) {
-        super();
-        this.instanceFactoryProvider = configuration;
-        this.proxyFactory = configuration.getProxyFactory();
-        //        if (componentContextFactory != null) {
-        //            this.componentContext = componentContextFactory.createComponentContext(component, requestContextFactory);
-        //        } else {
-        //            this.componentContext = new ComponentContextImpl(this, requestContextFactory, this.proxyService);
-        //        }
-        this.component = component;
-        this.dataBindingRegistry = dataBindingExtensionPoint;
-        this.propertyValueFactory = propertyValueObjectFactory;
-    }
-
-    InstanceWrapper<?> createInstanceWrapper() throws ObjectCreationException {
-        return instanceFactoryProvider.createFactory().newInstance();
-    }
-
-    void configureProperties(List<ComponentProperty> definedProperties) {
-        for (ComponentProperty p : definedProperties) {
-            configureProperty(p);
-        }
-    }
-
-    private void configureProperty(ComponentProperty configuredProperty) {
-        JavaElementImpl element =
-            instanceFactoryProvider.getImplementation().getPropertyMembers().get(configuredProperty.getName());
-
-        if (element != null && configuredProperty.getValue() != null) {
-            if (!(element.getAnchor() instanceof Constructor)) {
-                if(element.getElementType() == ElementType.FIELD) {
-                    // Field field = (Field)element.getAnchor();
-                    instanceFactoryProvider.getInjectionSites().add(element);
-                    /*
-                    if(Modifier.isPublic(field.getModifiers())) {
-                        instanceFactoryProvider.getInjectionSites().add(element);
-                    } else if(field.getAnnotation(org.osoa.sca.annotations.Property.class) != null) {
-                        instanceFactoryProvider.getInjectionSites().add(element);
-                    }
-                    */
-                } else {
-                    instanceFactoryProvider.getInjectionSites().add(element);
-                }
-            }
-
-            //Class propertyJavaType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-            ObjectFactory<?> propertyObjectFactory =
-                createPropertyValueFactory(configuredProperty, configuredProperty.getValue(), element);
-            instanceFactoryProvider.setObjectFactory(element, propertyObjectFactory);
-            
-            JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor();
-            for(JavaElementImpl p: constructor.getParameters()){
-                if(element.getName().equals(p.getName())) {
-                    instanceFactoryProvider.setObjectFactory(p, propertyObjectFactory);
-                }
-            }
-        }
-    }
-
-    void start() {
-        if (!instanceFactoryProvider.getImplementation().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 : instanceFactoryProvider.getImplementation()
-                .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()) {
-                    Class<?> businessInterface = element.getType();
-                    ObjectFactory<?> factory = null;
-                    if (CallableReference.class.isAssignableFrom(element.getType())) {
-                        businessInterface =
-                            JavaIntrospectionHelper.getBusinessInterface(element.getType(), element.getGenericType());
-                        factory =
-                            new CallbackReferenceObjectFactory(businessInterface, proxyFactory, wires);
-                    } else {
-                        factory = new CallbackWireObjectFactory(businessInterface, proxyFactory, wires);
-                    }
-                    if (!(element.getAnchor() instanceof Constructor)) {
-                        instanceFactoryProvider.getInjectionSites().add(element);
-                    }
-                    instanceFactoryProvider.setObjectFactory(element, factory);
-                }
-            }
-        }
-        for (Reference ref : instanceFactoryProvider.getImplementation().getReferences()) {
-            JavaElementImpl element =
-                instanceFactoryProvider.getImplementation().getReferenceMembers().get(ref.getName());
-            if (element != null) {
-                if (!(element.getAnchor() instanceof Constructor)) {
-                    if(element.getElementType() == ElementType.FIELD) {
-                        Field field = (Field)element.getAnchor();
-                        if(Modifier.isPublic(field.getModifiers())) {
-                            instanceFactoryProvider.getInjectionSites().add(element);
-                        } else if(field.getAnnotation(org.osoa.sca.annotations.Reference.class) != null) {
-                            instanceFactoryProvider.getInjectionSites().add(element);
-                        }
-                    } else {
-                        instanceFactoryProvider.getInjectionSites().add(element);
-                    }
-                }
-                ComponentReference componentReference = null;
-                List<RuntimeWire> wireList = null;
-                for (ComponentReference reference : component.getReferences()) {
-                    if (reference.getName().equals(ref.getName())) {
-                        wireList = ((RuntimeComponentReference)reference).getRuntimeWires();
-                        componentReference = reference;
-                        break;
-                    }
-                }
-                if (ref.getMultiplicity() == Multiplicity.ONE_N || ref.getMultiplicity() == Multiplicity.ZERO_N) {
-                    List<ObjectFactory<?>> factories = new ArrayList<ObjectFactory<?>>();
-                    Class<?> baseType =
-                        JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-                    for (int i = 0; i < wireList.size(); i++) {
-                        ObjectFactory<?> factory = null;
-                        if (CallableReference.class.isAssignableFrom(baseType)) {
-                            Type callableRefType = JavaIntrospectionHelper.getParameterType(element.getGenericType());
-                            // Type businessType = JavaIntrospectionHelper.getParameterType(callableRefType);
-                            Class<?> businessInterface =
-                                JavaIntrospectionHelper.getBusinessInterface(baseType, callableRefType);
-                            factory =
-                                new CallableReferenceObjectFactory(businessInterface, component,
-                                                                   (RuntimeComponentReference)wireList.get(i)
-                                                                       .getSource().getContract(), wireList.get(i)
-                                                                       .getSource().getBinding());
-                        } else {
-                            factory = createObjectFactory(baseType, wireList.get(i));
-                        }
-                        factories.add(factory);
-                    }
-                    instanceFactoryProvider.setObjectFactories(element, factories);
-                    JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor();
-                    for(JavaElementImpl p: constructor.getParameters()){
-                        if(element.getName().equals(p.getName())) {
-                            instanceFactoryProvider.setObjectFactories(p, factories);
-                        }
-                    }
-                } else {
-                    if (wireList == null && ref.getMultiplicity() == Multiplicity.ONE_ONE) {
-                        throw new IllegalStateException("Required reference is missing: " + ref.getName());
-                    }
-                    if (wireList != null && !wireList.isEmpty()) {
-                        ObjectFactory<?> factory = null;
-                        if (CallableReference.class.isAssignableFrom(element.getType())) {
-                            Class<?> businessInterface =
-                                JavaIntrospectionHelper.getBusinessInterface(element.getType(), element
-                                    .getGenericType());
-                            factory =
-                                new CallableReferenceObjectFactory(businessInterface, component,
-                                                                   (RuntimeComponentReference)componentReference, null);
-                        } else {
-                            factory = createObjectFactory(element.getType(), wireList.get(0));
-                        }
-                        instanceFactoryProvider.setObjectFactory(element, factory);
-                        JavaConstructorImpl constructor = instanceFactoryProvider.getImplementation().getConstructor();
-                        for(JavaElementImpl p: constructor.getParameters()){
-                            if(element.getName().equals(p.getName())) {
-                                instanceFactoryProvider.setObjectFactory(p, factory);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // We need to set the PropertyValueFactory on the ComponentContextImpl
-        // so the ComponentContext can "de-marshal" the property type to a value 
-        // when the getProperty() method is called
-        ComponentContextImpl ccImpl = (ComponentContextImpl)component.getComponentContext();
-        ccImpl.setPropertyValueFactory(propertyValueFactory);
-
-        //setUpPolicyHandlers();
-    }
-
-    void addResourceFactory(String name, ObjectFactory<?> factory) {
-        JavaResourceImpl resource = instanceFactoryProvider.getImplementation().getResources().get(name);
-
-        if (resource != null && !(resource.getElement().getAnchor() instanceof Constructor)) {
-            instanceFactoryProvider.getInjectionSites().add(resource.getElement());
-        }
-
-        instanceFactoryProvider.setObjectFactory(resource.getElement(), factory);
-    }
-
-    void addConversationIDFactories(List<Member> names) {
-        ObjectFactory<String> factory = new ConversationIDObjectFactory();
-        for (Member name : names) {
-            if (name instanceof Field) {
-                JavaElementImpl element = new JavaElementImpl((Field)name);
-                element.setClassifer(ConversationID.class);
-                instanceFactoryProvider.setObjectFactory(element, factory);
-            } else if (name instanceof Method) {
-                JavaElementImpl element = new JavaElementImpl((Method)name, 0);
-                element.setName(JavaIntrospectionHelper.toPropertyName(name.getName()));
-                element.setClassifer(ConversationID.class);
-                instanceFactoryProvider.setObjectFactory(element, factory);
-            } else {
-                throw new InvalidAccessorException("Member must be a field or method: " + name.getName());
-            }
-        }
-    }
-
-    Object createInstance() throws ObjectCreationException {
-        return createInstanceWrapper().getInstance();
-    }
-
-    JavaInstanceFactoryProvider<?> getInstanceFactoryProvider() {
-        return instanceFactoryProvider;
-    }
-
-    void stop() {
-        //cleanUpPolicyHandlers();
-    }
-
-    Invoker createInvoker(Operation operation) throws NoSuchMethodException {
-        Class<?> implClass = instanceFactoryProvider.getImplementationClass();
-
-        Method method = JavaInterfaceUtil.findMethod(implClass, operation);
-        return new JavaImplementationInvoker(operation, method, component);
-    }
-
-    private static class OptimizedObjectFactory<T> implements ObjectFactory<T> {
-        private ScopeContainer scopeContainer;
-
-        public OptimizedObjectFactory(ScopeContainer scopeContainer) {
-            super();
-            this.scopeContainer = scopeContainer;
-        }
-
-        public T getInstance() throws ObjectCreationException {
-            try {
-                return (T)scopeContainer.getWrapper(null).getInstance();
-            } catch (TargetResolutionException e) {
-                throw new ObjectCreationException(e);
-            }
-        }
-
-    }
-
-    private <B> ObjectFactory<B> createObjectFactory(Class<B> interfaze, RuntimeWire wire) {
-        // FIXME: [rfeng] Disable the optimization for new as it needs more discussions
-        /*
-        boolean conversational = wire.getSource().getInterfaceContract().getInterface().isConversational();
-        Binding binding = wire.getSource().getBinding();
-        // Check if it's wireable binding for optimization
-        if (!conversational && binding instanceof OptimizableBinding) {
-            OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
-            Component component = optimizableBinding.getTargetComponent();
-            if (component != null) {
-                Implementation implementation = component.getImplementation();
-                // Check if the target component is java component
-                if (implementation instanceof JavaImplementation) {
-                    JavaImplementation javaImplementation = (JavaImplementation)implementation;
-                    if (interfaze.isAssignableFrom(javaImplementation.getJavaClass())) {
-                        ScopedRuntimeComponent scopedComponent = (ScopedRuntimeComponent)component;
-                        ScopeContainer scopeContainer = scopedComponent.getScopeContainer();
-                        Scope scope = scopeContainer.getScope();
-                        if (scope == Scope.COMPOSITE || scope == Scope.STATELESS || scope == Scope.SYSTEM) {
-                            boolean optimizable = true;
-                            for (InvocationChain chain : wire.getInvocationChains()) {
-                                if (chain.getHeadInvoker() != chain.getTailInvoker()) {
-                                    optimizable = false;
-                                    break;
-                                }
-                            }
-                            if (optimizable) {
-                                return new OptimizedObjectFactory<B>(scopeContainer);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        */
-        return new WireObjectFactory<B>(interfaze, wire, proxyFactory);
-    }
-
-    private ObjectFactory<?> createPropertyValueFactory(ComponentProperty property,
-                                                        Object propertyValue,
-                                                        JavaElementImpl javaElement) {
-        return propertyValueFactory.createValueFactory(property, propertyValue, javaElement);
-    }
-
-    /**
-     * @return the component
-     */
-    RuntimeComponent getComponent() {
-        return component;
-    }
-
-    /*private void setUpPolicyHandlers() {
-        for (PolicyHandler policyHandler : policyHandlers.values()) {
-            policyHandler.setUp(component.getImplementation());
-        }
-    }
-
-    private void cleanUpPolicyHandlers() {
-        for (PolicyHandler policyHandler : policyHandlers.values() ) {
-            policyHandler.cleanUp(this);
-        }
-    }*/
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
deleted file mode 100644
index 4a5ad98e5b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.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.java.invocation;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaComponentNameFactory implements ObjectFactory<String> {
-    private final JavaComponentContextProvider componentContextProvider;
-
-
-    public JavaComponentNameFactory(JavaComponentContextProvider component) {
-        this.componentContextProvider = component;
-    }
-
-
-    public String getInstance() throws ObjectCreationException {
-        String uri = componentContextProvider.getComponent().getURI();
-        return uri.substring(uri.lastIndexOf('/')+1);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
deleted file mode 100644
index 25d538cff4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.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.java.invocation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopeContainer;
-import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
-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.RuntimeComponent;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * Responsible for synchronously dispatching an invocation to a Java component
- * implementation instance
- * 
- * @version $Rev$ $Date$
- */
-public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics {
-    protected Operation operation;
-    protected Method method;
-    protected boolean allowsPBR;
-
-    @SuppressWarnings("unchecked")
-    protected final ScopeContainer scopeContainer;
-
-    public JavaImplementationInvoker(Operation operation, Method method, RuntimeComponent component) {
-        assert method != null : "Operation method cannot be null";
-        this.method = method;
-        this.operation = operation;
-        this.scopeContainer = ((ScopedRuntimeComponent)component).getScopeContainer();
-        this.allowsPBR = ((JavaImplementation)component.getImplementation()).isAllowsPassByReference(method);
-    }
-
-    public JavaImplementationInvoker(Operation operation, RuntimeComponent component) {
-        // used if the method can't be computed statically in advance 
-        this.operation = operation;
-        this.scopeContainer = ((ScopedRuntimeComponent)component).getScopeContainer();
-    }
-
-    @SuppressWarnings("unchecked")
-    public Message invoke(Message msg) {
-        Operation op = msg.getOperation();
-        if (op == null) {
-            op = this.operation;
-        }
-        ConversationSequence sequence = op.getConversationSequence();
-        Object payload = msg.getBody();
-
-        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 {
-            // The following call might create a new conversation, as a result, the msg.getConversationID() might 
-            // return a new value
-            InstanceWrapper wrapper = scopeContainer.getWrapper(contextId);
-
-            // 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;
-            }
-
-            Object instance = wrapper.getInstance();
-
-            // If the method couldn't be computed statically, or the instance being
-            // invoked is a user-specified callback object that doesn't implement
-            // the service interface from which the reflective method was obtained,
-            // compute the method object dynamically for this invocation.
-            Method imethod = method;
-            if (imethod == null || !imethod.getDeclaringClass().isInstance(instance)) {
-                try {
-                    imethod = JavaInterfaceUtil.findMethod(instance.getClass(), operation);
-                } catch (NoSuchMethodException e) {
-                    throw new IllegalArgumentException("Callback object does not provide method " + e.getMessage());
-                }
-            }
-            
-            Object ret;
-            if (payload != null && !payload.getClass().isArray()) {
-                ret = imethod.invoke(instance, payload);
-            } else {
-                ret = imethod.invoke(instance, (Object[])payload);
-            }
-
-            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);
-            }
-            msg.setBody(ret);
-        } catch (InvocationTargetException e) {
-            Throwable cause = e.getTargetException();
-            boolean isChecked = false;
-            for (DataType<?> d : operation.getFaultTypes()) {
-                if (d.getPhysical().isInstance(cause)) {
-                    isChecked = true;
-                    msg.setFaultBody(cause);
-                    break;
-                }
-            }
-
-            
-            if (sequence != ConversationSequence.CONVERSATION_NONE ){
-                try {
-//                    // If the exception is not a business exception then end the conversation
-//                    boolean businessException = false;
-//                    
-//                    for (DataType dataType : operation.getFaultTypes()){
-//                        if ((dataType.getPhysical() == e.getCause().getClass()) &&
-//                            (contextId != null) ){
-//                            businessException = true;
-//                            break;
-//                        }
-//                    }
-                    
-                    if (!isChecked && contextId != null) {
-                        scopeContainer.remove(contextId);
-                        parameters.setConversationID(null);
-                    }
-                } catch (Exception ex){
-                    // TODO - sure what the best course of action is here. We have
-                    //        a system exception in the middle of a business exception 
-                }
-            }
-            if (!isChecked) {
-                if (cause instanceof RuntimeException) {
-                    throw (RuntimeException)cause;
-                }
-                if (cause instanceof Error) {
-                    throw (Error)cause;
-                } else {
-                    throw new ServiceRuntimeException(cause.getMessage(), cause);
-                }
-            }            
-                
-        } catch (Exception e) {
-            msg.setFaultBody(e);           
-        }
-        return msg;
-    }
-
-    public boolean allowsPassByReference() {
-        return allowsPBR;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
deleted file mode 100644
index 821a0999af..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.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.implementation.java.invocation;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.context.ComponentContextFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.context.InstanceWrapper;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.core.scope.Scope;
-import org.apache.tuscany.sca.core.scope.ScopedImplementationProvider;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.RequestContextObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.ResourceHost;
-import org.apache.tuscany.sca.implementation.java.injection.ResourceObjectFactory;
-import org.apache.tuscany.sca.interfacedef.Interface;
-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.invocation.Invoker;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaImplementationProvider implements ScopedImplementationProvider {
-    private JavaImplementation implementation;
-    private JavaComponentContextProvider componentContextProvider;
-    private RequestContextFactory requestContextFactory;
-    
-    public JavaImplementationProvider(RuntimeComponent component,
-                                      JavaImplementation implementation,
-                                      ProxyFactory proxyService,
-                                      DataBindingExtensionPoint dataBindingRegistry,
-                                      JavaPropertyValueObjectFactory propertyValueObjectFactory,
-                                      ComponentContextFactory componentContextFactory,
-                                      RequestContextFactory requestContextFactory,
-                                      Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
-        super();
-        this.implementation = implementation;
-        this.requestContextFactory = requestContextFactory;
-        this.implementation.setPolicyHandlerClassNames(policyHandlerClassNames);
-        
-        try {
-            JavaInstanceFactoryProvider configuration = new JavaInstanceFactoryProvider(implementation);
-            configuration.setProxyFactory(proxyService);
-            componentContextProvider =
-                new JavaComponentContextProvider(component, 
-                                                 configuration, 
-                                                 dataBindingRegistry,
-                                                 propertyValueObjectFactory,
-                                                 componentContextFactory, 
-                                                 requestContextFactory);
-
-            Scope scope = getScope();
-
-            if (scope == Scope.SYSTEM || scope == Scope.COMPOSITE) {
-                // Nothing
-            } else {
-                // Check for conversational contract if conversational scope
-                if (scope == Scope.CONVERSATION) {
-                    boolean hasConversationalContract = false;
-                    for (Service serviceDef : implementation.getServices()) {
-                        if (serviceDef.getInterfaceContract().getInterface().isConversational()) {
-                            hasConversationalContract = true;
-                            break;
-                        }
-                    }
-                    if (!hasConversationalContract) {
-                        String name = implementation.getJavaClass().getName();
-                        throw new NoConversationalContractException(name);
-                    }
-                }
-            }
-
-            if (implementation.getConversationIDMembers().size() > 0) {
-                componentContextProvider.addConversationIDFactories(implementation.getConversationIDMembers());
-            }
-
-            componentContextProvider.configureProperties(component.getProperties());
-            handleResources(implementation, proxyService);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-        
-    }
-    
-    private void handleResources(JavaImplementation componentType, ProxyFactory proxyService) {
-        for (JavaResourceImpl resource : componentType.getResources().values()) {
-            String name = resource.getName();
-
-            ObjectFactory<?> objectFactory =
-                (ObjectFactory<?>)componentContextProvider.getInstanceFactoryProvider().getFactories().get(resource.getElement());
-            if (objectFactory == null) {
-                Class<?> type = resource.getElement().getType();
-                if (ComponentContext.class.equals(type)) {
-                    objectFactory = new JavaComponentContextFactory(componentContextProvider);
-                } else if (RequestContext.class.equals(type)) {
-                    objectFactory = new RequestContextObjectFactory(requestContextFactory, proxyService);
-                } else if (String.class.equals(type)) {
-                    objectFactory = new JavaComponentNameFactory(componentContextProvider);
-                } else {
-                    boolean optional = resource.isOptional();
-                    String mappedName = resource.getMappedName();
-                    objectFactory = createResourceObjectFactory(type, mappedName, optional, null);
-                }
-            }
-            componentContextProvider.addResourceFactory(name, objectFactory);
-        }
-    }
-
-    private <T> ResourceObjectFactory<T> createResourceObjectFactory(Class<T> type,
-                                                                     String mappedName,
-                                                                     boolean optional,
-                                                                     ResourceHost host) {
-        return new ResourceObjectFactory<T>(type, mappedName, optional, host);
-    }
-
-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
-        try {
-            return componentContextProvider.createInvoker(operation);
-        } catch (NoSuchMethodException e) {
-            // It's possible that the instance being invoked is a user-specified
-            // callback object that isn't an instance of the component implementation
-            // class.  As an attempt to deal with this, look up a method object from
-            // the service interface.  This isn't foolproof, as it's possible that
-            // the service interface isn't a Java interface, or that the callback
-            // object has the right method signature without implementing the
-            // callback interface.  There is code in JavaImplementationInvoker
-            // to deal with these possibilities.
-            Interface iface = service.getInterfaceContract().getInterface();
-            if (iface instanceof JavaInterface) {
-                try {
-                    Method method = JavaInterfaceUtil.findMethod(((JavaInterface)iface).getJavaClass(), operation);
-                    return new JavaImplementationInvoker(operation, method, componentContextProvider.getComponent());
-                } catch (NoSuchMethodException e1) {
-                    throw new IllegalArgumentException(e1);
-                }
-            } else {
-                return new JavaImplementationInvoker(operation, componentContextProvider.getComponent());
-            }
-        }
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public Scope getScope() {
-        return new Scope(implementation.getJavaScope().getScope());
-    }
-
-    public void start() {
-        componentContextProvider.start();
-    }
-
-    public void stop() {
-        componentContextProvider.stop();
-    }
-
-    public InstanceWrapper createInstanceWrapper() {
-        return componentContextProvider.createInstanceWrapper();
-    }
-
-    public boolean isEagerInit() {
-        return implementation.isEagerInit();
-    }
-
-    public long getMaxAge() {
-        return implementation.getMaxAge();
-    }
-
-    public long getMaxIdleTime() {
-        return implementation.getMaxIdleTime();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
deleted file mode 100644
index fd0fc94770..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.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.java.invocation;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.context.ComponentContextFactory;
-import org.apache.tuscany.sca.context.RequestContextFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaImplementationProviderFactory implements ImplementationProviderFactory<JavaImplementation> {
-    private JavaPropertyValueObjectFactory propertyValueObjectFactory;
-    private DataBindingExtensionPoint dataBindingRegistry;
-    private ProxyFactory proxyService;
-    private ComponentContextFactory componentContextFactory;
-    private RequestContextFactory requestContextFactory;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
-
-    public JavaImplementationProviderFactory(ProxyFactory proxyService,
-                                             DataBindingExtensionPoint dataBindingRegistry,
-                                             JavaPropertyValueObjectFactory propertyValueObjectFactory,
-                                             ComponentContextFactory componentContextFactory,
-                                             RequestContextFactory requestContextFactory,
-                                             Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
-        super();
-        this.proxyService = proxyService;
-        this.dataBindingRegistry = dataBindingRegistry;
-        this.propertyValueObjectFactory = propertyValueObjectFactory;
-        this.componentContextFactory = componentContextFactory;
-        this.requestContextFactory = requestContextFactory;
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    }
-
-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,
-                                                               JavaImplementation implementation) {
-        return new JavaImplementationProvider(component, 
-                                              implementation, 
-                                              proxyService, 
-                                              dataBindingRegistry,
-                                              propertyValueObjectFactory, 
-                                              componentContextFactory, 
-                                              requestContextFactory,
-                                              policyHandlerClassNames);
-    }
-
-    public Class<JavaImplementation> getModelType() {
-        return JavaImplementation.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
deleted file mode 100644
index 95a9f63688..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.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.implementation.java.invocation;
-
-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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.context.InstanceFactory;
-import org.apache.tuscany.sca.implementation.java.context.InstanceFactoryProvider;
-import org.apache.tuscany.sca.implementation.java.context.ReflectiveInstanceFactory;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.injection.ArrayMultiplicityObjectFactory;
-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.ListMultiplicityObjectFactory;
-import org.apache.tuscany.sca.implementation.java.injection.MethodInjector;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-
-/**
- * Encapsulates configuration for a Java-based atomic component
- * 
- * @version $Rev$ $Date$
- */
-public class JavaInstanceFactoryProvider<T> implements InstanceFactoryProvider<T> {
-    private JavaImplementation definition;
-    private ProxyFactory proxyService;
-
-    private final List<JavaElementImpl> injectionSites;
-    private final EventInvoker<T> initInvoker;
-    private final EventInvoker<T> destroyInvoker;
-    private final Map<JavaElementImpl, Object> factories = new HashMap<JavaElementImpl, Object>();
-
-    public JavaInstanceFactoryProvider(JavaImplementation definition) {
-        this.definition = definition;
-        this.initInvoker = definition.getInitMethod() == null ? null : new MethodEventInvoker<T>(definition
-            .getInitMethod());
-        this.destroyInvoker = definition.getDestroyMethod() == null ? null : new MethodEventInvoker<T>(definition
-            .getDestroyMethod());
-        injectionSites = new ArrayList<JavaElementImpl>();
-    }
-
-    ProxyFactory getProxyFactory() {
-        return proxyService;
-    }
-
-    void setProxyFactory(ProxyFactory proxyService) {
-        this.proxyService = proxyService;
-    }
-
-    /**
-     * @return the definition
-     */
-    JavaImplementation getImplementation() {
-        return definition;
-    }
-
-    @SuppressWarnings("unchecked")
-    public InstanceFactory<T> createFactory() {
-        ObjectFactory<?>[] initArgs = getConstructorArgs();
-        Injector<T>[] injectors = getInjectors();
-        return new ReflectiveInstanceFactory<T>((Constructor<T>)definition.getConstructor().getConstructor(),
-                                                initArgs, injectors, initInvoker, destroyInvoker);
-    }
-
-    private ObjectFactory<?>[] getConstructorArgs() {
-        JavaConstructorImpl<?> constructor = definition.getConstructor();
-        ObjectFactory<?>[] initArgs = new ObjectFactory<?>[constructor.getParameters().length];
-        for (int i = 0; i < initArgs.length; i++) {
-            ObjectFactory<?> factory = (ObjectFactory<?>)factories.get(constructor.getParameters()[i]);
-            assert factory != null;
-            initArgs[i] = factory;
-        }
-        return initArgs;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Injector<T>[] getInjectors() {
-        // work around JDK1.5 issue with allocating generic arrays
-        @SuppressWarnings("unchecked")
-        Injector<T>[] injectors = 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<T>((Field)member, factory);
-                    } else if (element.getElementType() == ElementType.PARAMETER && member instanceof Method) {
-                        injectors[i++] = new MethodInjector<T>((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;
-    }
-
-    private Injector<T> 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<T>(field, new ArrayMultiplicityObjectFactory(interfaceType, factories));
-            } else {
-                return new FieldInjector<T>(field, new ListMultiplicityObjectFactory(factories));
-            }
-        } else if (element.getAnchor() instanceof Method) {
-            Method method = (Method)element.getAnchor();
-            if (method.getParameterTypes()[0].isArray()) {
-                return new MethodInjector<T>(method, new ArrayMultiplicityObjectFactory(interfaceType, factories));
-            } else {
-                return new MethodInjector<T>(method, new ListMultiplicityObjectFactory(factories));
-            }
-        } else {
-            throw new InvalidAccessorException("Member must be a field or method: " + element.getName());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public Class<T> getImplementationClass() {
-        return (Class<T>)definition.getJavaClass();
-    }
-
-    public void setObjectFactory(JavaElementImpl element, ObjectFactory<?> objectFactory) {
-        factories.put(element, objectFactory);
-    }
-
-    public void setObjectFactories(JavaElementImpl element, List<ObjectFactory<?>> objectFactory) {
-        factories.put(element, objectFactory);
-    }
-
-    /**
-     * @return the injectionSites
-     */
-    List<JavaElementImpl> getInjectionSites() {
-        return injectionSites;
-    }
-
-    /**
-     * @return the factories
-     */
-    Map<JavaElementImpl, Object> getFactories() {
-        return factories;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
deleted file mode 100644
index ee3507ef80..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.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.implementation.java.invocation;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.logging.Logger;

-

-import org.apache.tuscany.sca.assembly.ComponentReference;

-import org.apache.tuscany.sca.assembly.ConfiguredOperation;

-import org.apache.tuscany.sca.assembly.OperationsConfigurator;

-import org.apache.tuscany.sca.implementation.java.JavaImplementation;

-import org.apache.tuscany.sca.invocation.InvocationChain;

-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.policy.util.PolicyHandlerUtils;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;

-

-/**

- * Processor to inject policy handling interceptor whenever PolicySets are specified in a Java Implementation 

- *

- * @version $Rev$ $Date$

- */

-public class JavaPolicyHandlingRuntimeWireProcessor implements RuntimeWireProcessor {

-    private static final Logger logger = Logger.getLogger(JavaPolicyHandlingRuntimeWireProcessor.class.getName());

-

-    public JavaPolicyHandlingRuntimeWireProcessor() {

-        super();

-    }

-

-    public void process(RuntimeWire wire) {

-        /*Contract contract = wire.getSource().getContract();

-        if (!(contract instanceof RuntimeComponentReference)) {

-            return;

-        }*/

-

-        RuntimeComponent component = wire.getTarget().getComponent();

-        if (component != null && component.getImplementation() instanceof JavaImplementation) {

-            JavaImplementation javaImpl = (JavaImplementation)component.getImplementation();

-            if (javaImpl instanceof PolicySetAttachPoint) {

-                PolicyHandler policyHandler = null;

-                List<PolicyHandler> implPolicyHandlers = new ArrayList<PolicyHandler>();

-                PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)javaImpl;

-

-                try {

-                    //for ( PolicySet policySet : policiedImpl.getPolicySets() ) {

-                    for (PolicySet policySet : component.getPolicySets()) {

-                        policyHandler =

-                            PolicyHandlerUtils.findPolicyHandler(policySet, javaImpl.getPolicyHandlerClassNames());

-                        if (policyHandler != null) {

-                            policyHandler.setUp(javaImpl);

-                            implPolicyHandlers.add(policyHandler);

-                        } else {

-                            //FIXME: to be removed after the PolicyHandler story has crystalized..

-                            //maybe replace with exception then...

-                            logger.warning("No PolicyHandler registered for PolicySet - " + policySet.getName());

-                        }

-                    }

-

-                    List<PolicyHandler> applicablePolicyHandlers = null;

-                    for (InvocationChain chain : wire.getInvocationChains()) {

-                        applicablePolicyHandlers = new ArrayList<PolicyHandler>();

-                        if (javaImpl instanceof OperationsConfigurator) {

-                            String operationName = chain.getTargetOperation().getName();

-                            OperationsConfigurator opConfigurator = (OperationsConfigurator)component;

-                            for (ConfiguredOperation confOp : opConfigurator.getConfiguredOperations()) {

-                                if (confOp.getName().equals(operationName)) {

-                                    for (PolicySet policySet : confOp.getPolicySets()) {

-                                        policyHandler =

-                                            PolicyHandlerUtils.findPolicyHandler(policySet, javaImpl

-                                                .getPolicyHandlerClassNames());

-                                        if (policyHandler != null) {

-                                            policyHandler.setUp(javaImpl);

-                                            applicablePolicyHandlers.add(policyHandler);

-                                        } else {

-                                            logger.warning("No PolicyHandler registered for " + policySet);

-                                        }

-                                    }

-                                    break;

-                                }

-                            }

-

-                            //if no policies have been specified at the operation level then simply

-                            //apply whatever is specified for the implementation level

-                            if (applicablePolicyHandlers.isEmpty()) {

-                                applicablePolicyHandlers = implPolicyHandlers;

-                            }

-                        }

-

-                        if (!applicablePolicyHandlers.isEmpty()) {

-                            String phase =

-                                (wire.getSource().getContract() instanceof ComponentReference) ? Phase.REFERENCE_POLICY

-                                    : Phase.SERVICE_POLICY;

-

-                            chain.addInterceptor(Phase.IMPLEMENTATION_POLICY, new PolicyHandlingInterceptor(chain.getTargetOperation(),

-                                                                                      applicablePolicyHandlers));

-                        }

-                    }

-                } catch (Exception e) {

-                    throw new RuntimeException(e);

-                }

-            }

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
deleted file mode 100644
index 515a7c8a43..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.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.implementation.java.invocation;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-
-/**
- * Performs an wire on a method of a given instance
- *
- * @version $Rev$ $Date$
- */
-public class MethodEventInvoker<T> implements EventInvoker<T> {
-    private final Method method;
-
-    /**
-     * Instantiates an  invoker for the given method
-     */
-    public MethodEventInvoker(Method method) {
-        assert method != null;
-        this.method = method;
-    }
-
-    public void invokeEvent(T instance) throws EventInvocationException {
-        try {
-            method.invoke(instance, (Object[]) null);
-        } catch (IllegalArgumentException e) {
-            String name = method.getName();
-            throw new EventInvocationException("Exception thrown by event method [" + name + "]", e.getCause());
-        } catch (IllegalAccessException e) {
-            String name = method.getName();
-            throw new EventInvocationException("Method is not accessible [" + name + "]");
-        } catch (InvocationTargetException e) {
-            String name = method.getName();
-            throw new EventInvocationException("Exception thrown by event method [" + name + "]", e.getCause());
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
deleted file mode 100644
index a7b175cf9b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.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.java.invocation;

-

-

-/**

- * Raised when a component has conversational scope but no conversational contract

- *

- * @version $Rev: 487877 $ $Date: 2006-12-16 15:32:16 -0500 (Sat, 16 Dec 2006) $

- */

-public class NoConversationalContractException extends Exception {

-

-    private static final long serialVersionUID = -1157790036638157539L;

-

-    public NoConversationalContractException(String message) {

-        super(message);

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
deleted file mode 100644
index 8c85b46c65..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.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.java.invocation;

-

-import java.util.List;

-

-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.util.PolicyHandler;

-

-/**

- * An interceptor to invoke policy handlers before and after the invocation of operations on 

- * an implementation.

- *

- * @version $Rev$ $Date$

- */

-public class PolicyHandlingInterceptor implements Interceptor {

-    private Invoker next;

-    private List<PolicyHandler> policyHandlers = null;

-    private Operation targetOperation = null;

-

-    public PolicyHandlingInterceptor(Operation targetOperation, List<PolicyHandler> policyHandlers) {

-        this.policyHandlers = policyHandlers;

-        this.targetOperation = targetOperation;

-    }

-

-    public Message invoke(Message msg) {

-        try {

-            applyPreInvocationPolicies(targetOperation, msg);

-            msg = next.invoke(msg);

-        } finally {

-            applyPostInvocationPolices(targetOperation, msg);

-        }

-        return msg;

-    }

-

-    public void setNext(Invoker next) {

-        this.next = next;

-    }

-

-    public Invoker getNext() {

-        return next;

-    }

-

-    private void applyPreInvocationPolicies(Object... context) {

-        for (PolicyHandler policyHandler : policyHandlers) {

-            policyHandler.beforeInvoke(context);

-        }

-    }

-

-    private void applyPostInvocationPolices(Object... context) {

-        for ( int count = policyHandlers.size() - 1 ; count >= 0 ; --count) {

-            policyHandlers.get(count).afterInvoke(context);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
deleted file mode 100644
index 384fef5c09..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.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.implementation.java.module;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.context.ComponentContextFactory;
-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.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.invocation.CglibProxyFactory;
-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.java.invocation.JavaCallbackRuntimeWireProcessor;
-import org.apache.tuscany.sca.implementation.java.invocation.JavaImplementationProviderFactory;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaRuntimeModuleActivator implements ModuleActivator {
-
-    public JavaRuntimeModuleActivator() {
-    }
-
-    public void start(ExtensionPointRegistry registry) {
-
-        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        MessageFactory messageFactory = factories.getFactory(MessageFactory.class);
-        
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
-
-        ProxyFactoryExtensionPoint proxyFactories = registry.getExtensionPoint(ProxyFactoryExtensionPoint.class);
-        proxyFactories.setClassProxyFactory(new CglibProxyFactory(messageFactory, interfaceContractMapper));
-
-        JavaInterfaceFactory javaFactory = factories.getFactory(JavaInterfaceFactory.class);
-
-        DataBindingExtensionPoint dataBindings = registry.getExtensionPoint(DataBindingExtensionPoint.class);
-        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
-        MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
-        JavaPropertyValueObjectFactory factory = new JavaPropertyValueObjectFactory(mediator);
-
-        ContextFactoryExtensionPoint contextFactories = registry.getExtensionPoint(ContextFactoryExtensionPoint.class);
-        ComponentContextFactory componentContextFactory = contextFactories.getFactory(ComponentContextFactory.class);
-        RequestContextFactory requestContextFactory = contextFactories.getFactory(RequestContextFactory.class);
-
-        Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
-        policyHandlerClassNames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames();
-        
-        ProxyFactory proxyFactory = new ExtensibleProxyFactory(proxyFactories);
-        
-        JavaImplementationProviderFactory javaImplementationProviderFactory =
-            new JavaImplementationProviderFactory(proxyFactory, dataBindings, factory, componentContextFactory,
-                                                  requestContextFactory, policyHandlerClassNames);
-
-        ProviderFactoryExtensionPoint providerFactories =
-            registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        providerFactories.addProviderFactory(javaImplementationProviderFactory);
-
-        RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint =
-            registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
-        if (wireProcessorExtensionPoint != null) {
-            wireProcessorExtensionPoint.addWireProcessor(new JavaCallbackRuntimeWireProcessor(interfaceContractMapper,
-                                                                                              javaFactory));
-            //wireProcessorExtensionPoint.addWireProcessor(new JavaPolicyHandlingRuntimeWireProcessor());
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 0871ddf4be..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/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.implementation.java.module.JavaRuntimeModuleActivator

diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
deleted file mode 100644
index ba8da101c6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.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.java.context;
-
-import junit.framework.TestCase;
-
-
-/**
- * Tests wires that are configured with a multiplicity
- *
- * @version $Rev$ $Date$
- */
-public class MultiplicityTestCase extends TestCase {
-
-    public void testMultiplicity() throws Exception {
-        // TODO implement
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
deleted file mode 100644
index 628a308c86..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.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.java.context;
-
-import static org.easymock.EasyMock.createMock;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.scope.TargetDestructionException;
-import org.apache.tuscany.sca.core.scope.TargetInitializationException;
-import org.apache.tuscany.sca.implementation.java.invocation.EventInvoker;
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReflectiveInstanceWrapperTestCase extends TestCase {
-    private ReflectiveInstanceWrapper<Object> wrapper;
-    private Object instance;
-    private EventInvoker<Object> initInvoker;
-    private EventInvoker<Object> destroyInvoker;
-
-    public void testWithNoCallbacks() {
-        wrapper = new ReflectiveInstanceWrapper<Object>(instance, null, null);
-        try {
-            wrapper.start();
-        } catch (TargetInitializationException e) {
-            fail();
-        }
-        try {
-            wrapper.stop();
-        } catch (TargetDestructionException e) {
-            fail();
-        }
-    }
-
-    public void testWithStartCallback() {
-        initInvoker.invokeEvent(instance);
-        EasyMock.replay(initInvoker);
-            wrapper = new ReflectiveInstanceWrapper<Object>(instance, initInvoker, null);
-        try {
-            wrapper.start();
-        } catch (TargetInitializationException e) {
-            fail();
-        }
-        EasyMock.verify(initInvoker);
-    }
-
-    public void testWithStopCallback() {
-        destroyInvoker.invokeEvent(instance);
-        EasyMock.replay(destroyInvoker);
-            wrapper = new ReflectiveInstanceWrapper<Object>(instance, null, destroyInvoker);
-        try {
-            wrapper.stop();
-        } catch (TargetDestructionException e) {
-            fail();
-        }
-        EasyMock.verify(destroyInvoker);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void setUp() throws Exception {
-        super.setUp();
-        instance = new Object();
-        initInvoker = createMock(EventInvoker.class);
-        destroyInvoker = createMock(EventInvoker.class);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
deleted file mode 100644
index 29dcfa8169..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.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.java.injection;
-
-import static org.easymock.EasyMock.createMock;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.invocation.CallbackWireObjectFactory;
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CallbackWireObjectFactoryTestCase extends TestCase {
-
-    @SuppressWarnings({"unchecked"})
-    public void testCreateInstance() throws Exception {
-        ProxyFactory service = createMock(ProxyFactory.class);
-        Foo foo = new Foo() {
-        };
-        EasyMock.expect(service.createCallbackProxy(EasyMock.eq(Foo.class), EasyMock.isA(List.class))).andReturn(foo);
-        EasyMock.replay(service);
-        List<RuntimeWire> wires = new ArrayList<RuntimeWire>();
-        CallbackWireObjectFactory factory = new CallbackWireObjectFactory(Foo.class, service, wires);
-        assertEquals(foo, factory.getInstance());
-        EasyMock.verify(service);
-    }
-
-    private interface Foo {
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
deleted file mode 100644
index cc852cc677..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.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.java.injection;
-
-import java.lang.reflect.Field;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FieldInjectorTestCase extends TestCase {
-
-    protected Field protectedField;
-
-    public void testIllegalAccess() throws Exception {
-        FieldInjector<Foo> injector = new FieldInjector<Foo>(protectedField, new SingletonObjectFactory<String>("foo"));
-        Foo foo = new Foo();
-        injector.inject(foo);
-        assertEquals("foo", foo.hidden);
-    }
-
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        protectedField = Foo.class.getDeclaredField("hidden");
-    }
-
-    private class Foo {
-        private String hidden;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
deleted file mode 100644
index d502462688..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.injection;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.databinding.impl.SimpleTypeMapperImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This test case will test the JavaPropertyValueObjectFactory.
- *
- * @version $Rev$ $Date$
- */
-public class JavaPropertyValueObjectFactoryTestCase {
-
-    /**
-     * The factory we should use for testing.
-     */
-    private static JavaPropertyValueObjectFactory factory;
-
-    /**
-     * The assembly factory used to create Properties.
-     */
-    private static AssemblyFactory assemblyFactory;
-
-    /**
-     * Test Setup.
-     */
-    @BeforeClass
-    public static void setup() {
-        // Create the factory
-        Mediator mediator = EasyMock.createNiceMock(Mediator.class);
-        DataBindingExtensionPoint dpep = new DefaultDataBindingExtensionPoint();
-        EasyMock.expect(mediator.getDataBindings()).andReturn(dpep).anyTimes();
-        EasyMock.replay(mediator);
-        factory = new JavaPropertyValueObjectFactory(mediator);
-        
-        // Create the AssemblyFactory we should use
-        assemblyFactory = new DefaultAssemblyFactory();
-    }
-
-    /**
-     * A test that will attempt to inject positive, negative and zero into an
-     * int property.
-     */
-    @Test
-    public void testIntegerInjectionValid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedType = Integer.TYPE;
-
-        for (int i = -5; i <= 5; i++) {
-            params.propertyValue = Integer.toString(i);
-            params.expectedValueFromFactory = i;
-            doInjection(params);
-        }
-    }
-
-    /**
-     * A test that will attempt to inject positive, negative and zero into an
-     * int property using a JavaElement.
-     */
-    @Test
-    public void testIntegerInjectionValidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedJavaElement = new JavaElementImpl(int.class);
-
-        for (int i = -5; i <= 5; i++) {
-            params.propertyValue = Integer.toString(i);
-            params.expectedValueFromFactory = i;
-            doInjection(params);
-        }
-    }
-
-    /**
-     * A test that will attempt to inject multiple int values into an
-     * int property.
-     */
-    @Test
-    public void testIntegerArrayInjectionValid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.isMany = true;
-        params.expectedType = int.class;
-        params.propertyValue = "1 2 3 4 5";
-        params.expectedValueFromFactory = Arrays.asList(1, 2, 3, 4, 5);
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject multiple int values into an
-     * int property using a JavaElement.
-     */
-    @Test
-    public void testIntegerArrayInjectionValidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.isMany = true;
-        params.expectedJavaElement = new JavaElementImpl(int[].class);
-        params.propertyValue = "1 2 3 4 5";
-        int[] expected = { 1, 2, 3, 4, 5 };
-        params.expectedValueFromFactory = expected; 
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject a non-number into an
-     * int property.
-     */
-    @Test
-    public void testIntegerInjectionBadNumberInvalid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedType = Integer.TYPE;
-        params.propertyValue = "a";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject a non-number into an
-     * int property using a JavaElement.
-     */
-    @Test
-    public void testIntegerInjectionBadNumberInvalidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedJavaElement = new JavaElementImpl(Integer.TYPE);
-        params.propertyValue = "a";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject multiple int values into an
-     * int property where one of the property values is not a number.
-     * The injection should throw ObjectCreationException
-     */
-    @Test
-    public void testIntegerArrayInjectionBadNumberInvalid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.isMany = true;
-        params.expectedType = int.class;
-        params.propertyValue = "1 2 aa 4 5";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject multiple int values into an
-     * int property using a JavaElement where one of the property
-     * values is not a number.
-     * The injection should throw ObjectCreationException
-     */
-    @Test
-    public void testIntegerArrayInjectionBadNumberInvalidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.isMany = true;
-        params.expectedJavaElement = new JavaElementImpl(int[].class);
-        params.propertyValue = "1 2 aa 4 5";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject an empty string into an int property.
-     * The injection should throw ObjectCreationException
-     */
-    @Test
-    public void testIntegerInjectionEmptyStringInvalid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedType = Integer.TYPE;
-        params.propertyValue = "";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject an empty string into an int property
-     * using a JavaElement.
-     * The injection should throw ObjectCreationException
-     */
-    @Test
-    public void testIntegerInjectionEmptyStringInvalidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "intField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_INT;
-        params.expectedJavaElement = new JavaElementImpl(Integer.TYPE);
-        params.propertyValue = "";
-        params.exceptionExpected = true;
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject a String into a String 
-     * property.
-     */
-    @Test
-    public void testStringInjectionValid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "StringField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_STRING;
-        params.expectedType = String.class;
-
-        params.propertyValue = "Some Test String";
-        params.expectedValueFromFactory = "Some Test String";
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject a String into a String 
-     * property using a JavaElement.
-     */
-    @Test
-    public void testStringInjectionValidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "StringField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_STRING;
-        params.expectedJavaElement = new JavaElementImpl(String.class);
-
-        params.propertyValue = "Some Test String";
-        params.expectedValueFromFactory = "Some Test String";
-        doInjection(params);
-    }
-
-    /**
-     * This class defines all the parameters for the Property Injection test.
-     */
-    private class InjectionTestParams {
-        // Input parameters for the test
-        public boolean isMany = false;
-        public String propertyName;
-        public String propertyValue;
-        public QName xsdType;
-        
-        // Expected result for test
-        public Object expectedValueFromFactory;
-        public Class<?> expectedType;
-        public JavaElementImpl expectedJavaElement;
-        public boolean exceptionExpected = false;
-    }
-
-    /**
-     * A test that will attempt to inject multiple String values into an
-     * String property.
-     */
-    @Test
-    public void testStringArrayInjectionValid() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "StringField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_STRING;
-        params.isMany = true;
-        params.expectedType = String.class;
-        params.propertyValue = "\"String1\" \"String2\" \"String3\" \"String4\" \"String5\"";
-        params.expectedValueFromFactory = Arrays.asList(
-                "String1", "String2", "String3", "String4", "String5");
-        doInjection(params);
-    }
-
-    /**
-     * A test that will attempt to inject multiple String values into an
-     * String property using a JavaElement.
-     */
-    @Test
-    public void testStringArrayInjectionValidWithJavaElement() {
-        InjectionTestParams params = new InjectionTestParams();
-        params.propertyName = "StringField";
-        params.xsdType = SimpleTypeMapperImpl.XSD_STRING;
-        params.isMany = true;
-        params.expectedJavaElement = new JavaElementImpl(String.class);
-        params.propertyValue = "\"String1\" \"String2\" \"String3\" \"String4\" \"String5\"";
-        params.expectedValueFromFactory = Arrays.asList(
-                "String1", "String2", "String3", "String4", "String5");
-        doInjection(params);
-    }
-
-    /**
-     * Utility method for testing creating properties  with the 
-     * JavaPropertyValueObjectFactory.
-     * 
-     * @param testParams The parameters for the test
-     */
-    private void doInjection(final InjectionTestParams testParams) {
-        // Create the property
-        Property prop = assemblyFactory.createProperty();
-        prop.setMany(testParams.isMany);
-        prop.setName(testParams.propertyName);
-        prop.setXSDType(testParams.xsdType);
-
-        // Mock up the XML that will contain the Property details
-        Document doc = EasyMock.createNiceMock(Document.class);
-        Element rootElement = EasyMock.createMock(Element.class);
-        EasyMock.expect(doc.getDocumentElement()).andReturn(rootElement);
-        NodeList nodeList = EasyMock.createMock(NodeList.class);
-        EasyMock.expect(rootElement.getChildNodes()).andReturn(nodeList).anyTimes();
-        EasyMock.expect(nodeList.getLength()).andReturn(1);
-        Node node = EasyMock.createMock(Node.class);
-        EasyMock.expect(nodeList.item(0)).andReturn(node);
-        EasyMock.expect(node.getTextContent()).andReturn(testParams.propertyValue);
-        EasyMock.replay(doc, rootElement, nodeList, node);
-
-        // Create a factory either using the Class or JavaElementImpl constructor
-        ObjectFactory<?> objectFactory;
-        if (testParams.expectedJavaElement != null) {
-            objectFactory = factory.createValueFactory(prop, doc, testParams.expectedJavaElement);
-        } else {
-            objectFactory = factory.createValueFactory(prop, doc, testParams.expectedType);
-        }
-        Assert.assertNotNull(objectFactory);
-
-        // Lets test the factory
-        try {
-            // Create a new instance with the factory
-            Object value = objectFactory.getInstance();
-
-            // Did we expect an exception to be thrown?
-            if (testParams.exceptionExpected) {
-                Assert.fail("Test should have thrown ObjectCreationException");
-            }
-
-            // Make sure the result is of the correct type
-            if (testParams.expectedValueFromFactory instanceof Collection<?>) {
-                // Make sure the Collections contain the same type
-                Assert.assertTrue(value instanceof Collection<?>);
-                Iterator<?> iter1 = ((Collection<?>) testParams.expectedValueFromFactory).iterator();
-                Iterator<?> iter2 = ((Collection<?>) value).iterator();
-                Assert.assertEquals(iter1.next().getClass(), iter2.next().getClass());
-            } else {
-                Assert.assertEquals(testParams.expectedValueFromFactory.getClass(), value.getClass());
-            }
-
-            // Validate the result
-            Assert.assertNotNull(value);
-            if (testParams.expectedValueFromFactory.getClass().isArray()) {
-                Assert.assertTrue(compareArrays(testParams.expectedValueFromFactory, value));
-            } else {
-                Assert.assertEquals(testParams.expectedValueFromFactory, value);
-            }
-        } catch (ObjectCreationException ex) {
-            // Is this an expected exception?
-            if (testParams.exceptionExpected) {
-                // Make sure the exception error message contains the property name
-                Assert.assertTrue(ex.toString().indexOf(testParams.propertyName) != -1);
-
-                // Make sure the exception error message contains the property value
-                if (testParams.propertyValue != null) {
-                    if (testParams.isMany) {
-                        // FIXME: No simple way to do this for multi-value properties
-                    } else {
-                        Assert.assertTrue(ex.toString().indexOf(testParams.propertyValue) != -1);
-                    }
-                }
-            } else {
-                // Test failure. We were not expecting an exception
-                ex.printStackTrace();
-                Assert.fail("Unexpected exception " + ex);
-            }
-        }
-    }
-
-    /**
-     * Compares two Objects that are actually arrays to make sure that they are
-     * equal.
-     * 
-     * @param array1 The first array
-     * @param array2 The second array
-     * @return True if they are equal. False if they are not
-     */
-    private boolean compareArrays(final Object array1, final Object array2) {
-        // Check for primitive array types
-        if (array1 instanceof boolean[]) {
-            return Arrays.equals((boolean[]) array1, (boolean[]) array2);
-        }
-        if (array1 instanceof byte[]) {
-            return Arrays.equals((byte[]) array1, (byte[]) array2);
-        }
-        if (array1 instanceof char[]) {
-            return Arrays.equals((char[]) array1, (char[]) array2);
-        }
-        if (array1 instanceof double[]) {
-            return Arrays.equals((double[]) array1, (double[]) array2);
-        }
-        if (array1 instanceof float[]) {
-            return Arrays.equals((float[]) array1, (float[]) array2);
-        }
-        if (array1 instanceof int[]) {
-            return Arrays.equals((int[]) array1, (int[]) array2);
-        }
-        if (array1 instanceof long[]) {
-            return Arrays.equals((long[]) array1, (long[]) array2);
-        }
-        if (array1 instanceof short[]) {
-            return Arrays.equals((short[]) array1, (short[]) array2);
-        }
-        
-        // Not a primitive so must be an Object[]
-        return Arrays.equals((Object[]) array1, (Object[]) array2);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
deleted file mode 100644
index 4de0a4e8c7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.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.implementation.java.injection;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.implementation.java.invocation.EventInvocationException;
-import org.apache.tuscany.sca.implementation.java.invocation.MethodEventInvoker;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MethodEventInvokerTestCase extends TestCase {
-    private Method privateMethod;
-    private Method exceptionMethod;
-
-    public void testIllegalAccess() throws Exception {
-        MethodEventInvoker<MethodEventInvokerTestCase.Foo> injector = new MethodEventInvoker<Foo>(privateMethod);
-        try {
-            injector.invokeEvent(new Foo());
-            fail();
-        } catch (EventInvocationException e) {
-            // expected
-        }
-    }
-
-    public void testException() throws Exception {
-        MethodEventInvoker<MethodEventInvokerTestCase.Foo> injector = new MethodEventInvoker<Foo>(exceptionMethod);
-        try {
-            injector.invokeEvent(new Foo());
-            fail();
-        } catch (RuntimeException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        privateMethod = MethodEventInvokerTestCase.Foo.class.getDeclaredMethod("hidden");
-        exceptionMethod = MethodEventInvokerTestCase.Foo.class.getDeclaredMethod("exception");
-
-    }
-
-    public class Foo {
-
-        public void foo() {
-        }
-
-        private void hidden() {
-        }
-
-        public void exception() {
-            throw new RuntimeException();
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
deleted file mode 100644
index 214779ed3f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.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.implementation.java.injection;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MethodInjectorTestCase extends TestCase {
-    private Method fooMethod;
-    private Method privateMethod;
-    private Method exceptionMethod;
-
-    public void testIllegalArgument() throws Exception {
-        ObjectFactory<Object> factory = new SingletonObjectFactory<Object>(new Object());
-        MethodInjector<Foo> injector = new MethodInjector<Foo>(fooMethod, factory);
-        try {
-            injector.inject(new Foo());
-            fail();
-        } catch (ObjectCreationException e) {
-            // expected
-        }
-    }
-
-    public void testException() throws Exception {
-        ObjectFactory<Object> factory = new SingletonObjectFactory<Object>("foo");
-        MethodInjector<Foo> injector = new MethodInjector<Foo>(exceptionMethod, factory);
-        try {
-            injector.inject(new Foo());
-            fail();
-        } catch (RuntimeException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        fooMethod = Foo.class.getMethod("foo", String.class);
-        privateMethod = Foo.class.getDeclaredMethod("hidden", String.class);
-        exceptionMethod = Foo.class.getDeclaredMethod("exception", String.class);
-
-    }
-
-    private class Foo {
-
-        public void foo(String bar) {
-        }
-
-        private void hidden(String bar) {
-        }
-
-        public void exception(String bar) {
-            throw new RuntimeException();
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
deleted file mode 100644
index c470b8cf3d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.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.java.injection;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RequestContextObjectFactoryTestCase extends TestCase {
-
-    public void testInstanceCreate() {
-        RequestContextObjectFactory factory = new RequestContextObjectFactory(null);
-        assertNotNull(factory.getInstance());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
deleted file mode 100644
index ed7a0e7d03..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.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.implementation.java.injection;
-
-import junit.framework.TestCase;
-
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ResourceObjectFactoryTestCase extends TestCase {
-
-    public void testResolveFromHostByType() throws Exception {
-        ResourceHost host = EasyMock.createMock(ResourceHost.class);
-        EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn("foo");
-        EasyMock.replay(host);
-        ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, host);
-        assertEquals("foo", factory.getInstance());
-        EasyMock.verify(host);
-    }
-
-    public void testResolveFromHostByName() throws Exception {
-        ResourceHost host = EasyMock.createMock(ResourceHost.class);
-        EasyMock.expect(host.resolveResource(EasyMock.eq(String.class),
-            EasyMock.eq("sca://localhost/bar"))).andReturn("foo");
-        EasyMock.replay(host);
-        ResourceObjectFactory<String> factory =
-            new ResourceObjectFactory<String>(String.class, "sca://localhost/bar", false, host);
-        assertEquals("foo", factory.getInstance());
-        EasyMock.verify(host);
-    }
-
-
-    public void testResolveFromParentThenResolveFromHostNotFound() throws Exception {
-        ResourceHost host = EasyMock.createMock(ResourceHost.class);
-        EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
-        EasyMock.replay(host);
-        ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, true, host);
-        assertNull(factory.getInstance());
-        EasyMock.verify(host);
-    }
-
-    public void testResolveByTypeNotFound() throws Exception {
-//        ResourceHost host = EasyMock.createMock(ResourceHost.class);
-//        EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
-//        EasyMock.replay(host);
-//
-//        RuntimeWire wire = EasyMock.createMock(RuntimeWire.class);
-//        EasyMock.expect(wire.getTargetInstance()).andReturn(null);
-//        EasyMock.replay(wire);
-//
-//        ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, false, host);
-//        try {
-//            factory.getInstance();
-//            fail();
-//        } catch (ResourceNotFoundException e) {
-//            //expected
-//        }
-//        EasyMock.verify(host);
-    }
-
-    public void testResolveByTypeNotFoundOptional() throws Exception {
-        ResourceHost host = EasyMock.createMock(ResourceHost.class);
-        EasyMock.expect(host.resolveResource(EasyMock.eq(String.class))).andReturn(null);
-        EasyMock.replay(host);
-        ResourceObjectFactory<String> factory = new ResourceObjectFactory<String>(String.class, true, host);
-        assertNull(factory.getInstance());
-        EasyMock.verify(host);
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
deleted file mode 100644
index c1650c3a83..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.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.java.injection;
-
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Implementation of ObjectFactory that returns a single instance, typically an immutable type.
- *
- * @version $Rev$ $Date$
- */
-public class SingletonObjectFactory<T> implements ObjectFactory<T> {
-    private final T instance;
-
-    public SingletonObjectFactory(T instance) {
-        this.instance = instance;
-    }
-
-    public T getInstance() {
-        return instance;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
deleted file mode 100644
index 40ad1b1e95..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.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.java.injection;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SingletonObjectFactoryTestCase extends TestCase {
-
-    public void testSingleton() throws Exception {
-        Object o = new Object();
-        SingletonObjectFactory<Object> factory = new SingletonObjectFactory<Object>(o);
-        assertEquals(o, factory.getInstance());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
deleted file mode 100644
index de371e09bb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.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.implementation.java.injection;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.apache.tuscany.sca.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * Creates new instances of a Java class
- *
- * @version $Rev$ $Date$
- * @see org.apache.tuscany.sca.implementation.java.injection.Injector
- */
-public class TestObjectFactory<T> implements ObjectFactory<T> {
-
-    private final Constructor<T> ctr;
-    private ObjectFactory[] initializerFactories;
-
-    /**
-     * Creates the object factory
-     *
-     * @param ctr the constructor to use when instantiating a new object
-     */
-    public TestObjectFactory(Constructor<T> ctr) {
-        assert ctr != null;
-        this.ctr = ctr;
-        initializerFactories = new ObjectFactory[ctr.getParameterTypes().length];
-    }
-
-    /**
-     * Creates the object factory
-     *
-     * @param ctr       the constructor to use when instantiating a new object
-     * @param factories an ordered list of <code>ObjectFactory</code>s to use for returning constructor parameters
-     */
-    public TestObjectFactory(Constructor<T> ctr, List<ObjectFactory> factories) {
-        assert ctr != null;
-        int params = ctr.getParameterTypes().length;
-        assert params == factories.size();
-        this.ctr = ctr;
-        initializerFactories = new ObjectFactory[params];
-        int i = 0;
-        for (ObjectFactory factory : factories) {
-            initializerFactories[i] = factory;
-            i++;
-        }
-    }
-
-    /**
-     * Returns the ordered array of <code>ObjectFactory</code>s use in creating constructor parameters
-     */
-    public ObjectFactory[] getInitializerFactories() {
-        return initializerFactories;
-    }
-
-    /**
-     * Sets an <code>ObjectFactory</code>s to use in creating constructor parameter
-     *
-     * @param pos     the constructor parameter position
-     * @param factory the object factory
-     */
-    public void setInitializerFactory(int pos, ObjectFactory factory) {
-        assert pos < initializerFactories.length;
-        initializerFactories[pos] = factory;
-    }
-
-    /**
-     * Creates a new instance of an object
-     */
-    public T getInstance() throws ObjectCreationException {
-        int size = initializerFactories.length;
-        Object[] initargs = new Object[size];
-        // create the constructor arg array
-        for (int i = 0; i < size; i++) {
-            ObjectFactory<?> objectFactory = initializerFactories[i];
-            if (objectFactory == null) {
-                // this can happen if a reference is optional
-                initargs[i] = null;
-            } else {
-                initargs[i] = objectFactory.getInstance();
-            }
-        }
-        try {
-            ctr.setAccessible(true);
-            return ctr.newInstance(initargs);
-        } catch (IllegalArgumentException e) {
-            String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
-        } catch (InstantiationException e) {
-            String name = ctr.getDeclaringClass().getName();
-            throw new AssertionError("Class is not instantiable [" + name + "]");
-        } catch (IllegalAccessException e) {
-            String name = ctr.getName();
-            throw new AssertionError("Constructor is not accessible [" + name + "]");
-        } catch (InvocationTargetException e) {
-            String name = ctr.getName();
-            throw new ObjectCreationException("Exception thrown by constructor: " + name, e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
deleted file mode 100644
index 1fb7abb917..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.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.java.injection;
-
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestObjectFactoryTestCase extends TestCase {
-
-    private Constructor<Foo> ctor;
-
-    public void testConstructorInjection() throws Exception {
-        List<ObjectFactory> initializers = new ArrayList<ObjectFactory>();
-        initializers.add(new SingletonObjectFactory<String>("foo"));
-        TestObjectFactory<Foo> factory = new TestObjectFactory<Foo>(ctor, initializers);
-        Foo foo = factory.getInstance();
-        assertEquals("foo", foo.foo);
-    }
-
-    /**
-     * Verifies null parameters can be passed to a constructor. This is valid when a reference is optional during
-     * constructor injection
-     */
-    public void testConstructorInjectionOptionalParam() throws Exception {
-        List<ObjectFactory> initializers = new ArrayList<ObjectFactory>();
-        initializers.add(null);
-        TestObjectFactory<Foo> factory = new TestObjectFactory<Foo>(ctor, initializers);
-        Foo foo = factory.getInstance();
-        assertNull(foo.foo);
-    }
-
-    public void testConstructorInitializerInjection() throws Exception {
-        TestObjectFactory<Foo> factory = new TestObjectFactory<Foo>(ctor);
-        factory.setInitializerFactory(0, new SingletonObjectFactory<String>("foo"));
-        Foo foo = factory.getInstance();
-        assertEquals("foo", foo.foo);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        ctor = Foo.class.getConstructor(String.class);
-    }
-
-    private static class Foo {
-
-        private String foo;
-
-        public Foo(String foo) {
-            this.foo = foo;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
deleted file mode 100644
index e993cdd382..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.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.implementation.java.util;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean1 extends SuperBean {
-
-    public static final int ALL_BEAN1_FIELDS = 6 + ALL_SUPER_FIELDS;
-    public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS;
-    public static final int ALL_BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1;
-    public String field3;
-    protected String field2;
-    private String field1;
-
-    public void setMethod1(String param) {
-    }
-
-    public void setMethod1(int param) {
-    }
-
-    @Override
-    public void override(String param) throws Exception {
-    }
-
-
-    public void noOverride(String param) throws Exception {
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
deleted file mode 100644
index 82264c77c9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.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.java.util;
-
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean2 {
-
-    private List methodList;
-    private List fieldList;
-
-    public List getMethodList() {
-        return methodList;
-    }
-
-    public void setMethodList(List list) {
-        methodList = list;
-    }
-
-    public List getfieldList() {
-        return fieldList;
-    }
-
-    public void setfieldList(List list) {
-        throw new AssertionFailedError("setter inadvertantly called");
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
deleted file mode 100644
index a5e12d181c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.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.java.util;
-
-/**
- * Implementations are used in wiring tests
- *
- * @version $Rev$ $Date$
- */
-public interface Entry {
-
-    String getString();
-
-    void setString(String val);
-}
-
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
deleted file mode 100644
index ed6bf7ddc4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.util;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaIntrospectionHelperTestCase extends TestCase {
-
-    private List testNoGenericsList;
-    private List<String> testList;
-    private Map<String, Bean1> testMap;
-    private Entry[] testArray;
-    private String[] testStringArray;
-
-    public JavaIntrospectionHelperTestCase() {
-        super();
-    }
-
-    public JavaIntrospectionHelperTestCase(String arg0) {
-        super(arg0);
-    }
-
-    public void testBean1AllPublicProtectedFields() throws Exception {
-        Set<Field> beanFields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(Bean1.class, true);
-        assertEquals(4, beanFields.size());                //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS
-    }
-
-    public void testGetSuperAllMethods() throws Exception {
-        Set<Method> superBeanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(SuperBean.class, true);
-        assertEquals(SuperBean.ALL_SUPER_METHODS, superBeanMethods.size());
-    }
-
-    public void testGetBean1AllMethods() throws Exception {
-        Set<Method> beanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
-        assertEquals(Bean1.ALL_BEAN1_METHODS, beanMethods.size());
-    }
-
-    public void testOverrideMethod() throws Exception {
-        Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
-        boolean invoked = false;
-        for (Method method : beanFields) {
-            if (method.getName().equals("override")) {
-                method.invoke(new Bean1(), "foo");
-                invoked = true;
-            }
-        }
-        if (!invoked) {
-            throw new Exception("Override never invoked");
-        }
-    }
-
-    public void testNoOverrideMethod() throws Exception {
-        Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
-        boolean found = false;
-        for (Method method : beanFields) {
-            if (method.getName().equals("noOverride") && method.getParameterTypes().length == 0) {
-                found = true;
-            }
-        }
-        if (!found) {
-            throw new Exception("No override not found");
-        }
-    }
-
-    public void testDefaultConstructor() throws Exception {
-        Constructor ctr = JavaIntrospectionHelper.getDefaultConstructor(Bean2.class);
-        assertEquals(ctr, Bean2.class.getConstructor());
-        assertTrue(Bean2.class == ctr.newInstance((Object[]) null).getClass());
-    }
-
-
-    public void testGetAllInterfaces() {
-        Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(Z.class);
-        assertEquals(2, interfaces.size());
-        assertTrue(interfaces.contains(W.class));
-        assertTrue(interfaces.contains(W2.class));
-    }
-
-
-    public void testGetAllInterfacesObject() {
-        Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(Object.class);
-        assertEquals(0, interfaces.size());
-    }
-
-    public void testGetAllInterfacesNoInterfaces() {
-        Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(NoInterface.class);
-        assertEquals(0, interfaces.size());
-    }
-
-    /**
-     * Tests generics introspection capabilities
-     */
-    public void testGenerics() throws Exception {
-
-        List classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testList").getGenericType());
-        assertEquals(1, classes.size());
-        assertEquals(String.class, classes.get(0));
-
-        classes =
-            JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testNoGenericsList").getGenericType());
-        assertEquals(0, classes.size());
-
-        classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testMap").getGenericType());
-        assertEquals(2, classes.size());
-        assertEquals(String.class, classes.get(0));
-        assertEquals(Bean1.class, classes.get(1));
-
-        classes = JavaIntrospectionHelper
-            .getGenerics(getClass().getDeclaredMethod("fooMethod", Map.class).getGenericParameterTypes()[0]);
-        assertEquals(2, classes.size());
-        assertEquals(String.class, classes.get(0));
-        assertEquals(Bean1.class, classes.get(1));
-
-        classes = JavaIntrospectionHelper
-            .getGenerics(getClass().getDeclaredMethod("fooMethod", List.class).getGenericParameterTypes()[0]);
-        assertEquals(1, classes.size());
-        assertEquals(String.class, classes.get(0));
-
-    }
-
-    private void fooMethod(List<String> foo) {
-
-    }
-
-    private void fooMethod(Map<String, Bean1> foo) {
-
-    }
-
-    public void setTestArray(Entry[] array) {
-    }
-
-    private interface W {
-
-    }
-
-    private interface W2 {
-
-    }
-
-    private class X implements W {
-
-    }
-
-    private class Y extends X implements W, W2 {
-
-    }
-
-    private class Z extends Y {
-
-    }
-
-    private class NoInterface {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
deleted file mode 100644
index 408cedb8be..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.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.java.util;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SuperBean {
-
-    public static final int ALL_SUPER_FIELDS = 6;
-    public static final int ALL_SUPER_PUBLIC_PROTECTED_FIELDS = 5;
-    public static final int ALL_SUPER_METHODS = 4;
-    public String superField2;
-
-    protected String superField3;
-
-    private String superField1;
-
-    public void setSuperMethod1(String param) {
-    }
-
-    public void setSuperMethod1(int param) {
-    }
-
-    public void override(String param) throws Exception {
-        throw new Exception("Override not handled");
-    }
-
-    public void noOverride() throws Exception {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-xml/LICENSE b/tags/java/sca/1.3/modules/implementation-java-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/NOTICE b/tags/java/sca/1.3/modules/implementation-java-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/pom.xml b/tags/java/sca/1.3/modules/implementation-java-xml/pom.xml
deleted file mode 100644
index 092eda643f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-java-xml</artifactId>
-    <name>Apache Tuscany SCA Java Implementation XML Model</name>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>${version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</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.implementation.java.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.java.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
deleted file mode 100644
index ecbf0c4c78..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/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;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.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/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
deleted file mode 100644
index 11934ec6bb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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;
-
-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.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-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.ConfiguredOperationProcessor;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-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.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.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.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.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaImplementationProcessor implements StAXArtifactProcessor<JavaImplementation>,
-    JavaImplementationConstants {
-
-    private JavaImplementationFactory javaFactory;
-    private AssemblyFactory assemblyFactory;
-    private PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private IntentAttachPointTypeFactory  intentAttachPointTypeFactory;
-    private ConfiguredOperationProcessor configuredOperationProcessor;
-    private Monitor monitor;
-
-    public JavaImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaImplementationFactory.class);
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-        this.monitor = monitor;
-        this.configuredOperationProcessor = new ConfiguredOperationProcessor(modelFactories, this.monitor);
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "impl-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 = new ProblemImpl(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();
-        
-        /*if ( javaImplementation instanceof PolicySetAttachPoint ) {
-            IntentAttachPointType implType = intentAttachPointTypeFactory.createImplementationType();
-            implType.setName(getArtifactType());
-            implType.setUnresolved(true);
-            ((PolicySetAttachPoint)javaImplementation).setType(implType);
-        }*/
-        
-        javaImplementation.setUnresolved(true);
-        javaImplementation.setName(reader.getAttributeValue(null, CLASS));
-
-        // Read policies
-        policyProcessor.readPolicies(javaImplementation, reader);
-
-        // read operation elements if exists or skip unto end element
-        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());
-        }
-
-        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/tags/java/sca/1.3/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index ff43eebcfc..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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.JavaImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.java,model=org.apache.tuscany.sca.implementation.java.JavaImplementation
diff --git a/tags/java/sca/1.3/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
deleted file mode 100644
index 210b715da8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/AddService.java
deleted file mode 100644
index 9c22177684..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 3f28d740a7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index e0cf23dc17..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index c1fceb575d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 9599c86292..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index e1f35f99b5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 7a3d06c15e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index d621407908..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index 21af91f392..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 4fed0a8c6a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
deleted file mode 100644
index e5912906f5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.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.sca.implementation.java.xml;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-
-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.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-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.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.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Test reading Java implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
-    private CompositeBuilder compositeBuilder;
-    
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        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);
-        
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); 
-        policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-
-    }
-
-    public void fixmeTestPolicyIntents() throws Exception {
-        ModelResolver resolver = new TestModelResolver(getClass().getClassLoader());
-        
-        URL url = getClass().getResource("definitions.xml");
-        URI uri = URI.create("definitions.xml");
-        SCADefinitions scaDefns = policyDefinitionsProcessor.read(null, uri, url);
-                
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        
-        staxProcessor.resolve(scaDefns, resolver);
-        staxProcessor.resolve(composite, resolver);
-
-        compositeBuilder.build(composite);
-        
-        //intents are computed and aggregate intents from ancestor elements
-        assertEquals(((PolicySetAttachPoint)composite.getComponents().get(0)).getRequiredIntents().size(), 3);
-        assertEquals(((PolicySetAttachPoint)composite.getComponents().get(5)).getRequiredIntents().size(), 3);
-        
-        //assertEquals(((OperationsConfigurator)composite.getComponents().get(0)).getConfiguredOperations().isEmpty(), true);
-        //assertEquals(((OperationsConfigurator)composite.getComponents().get(5)).getConfiguredOperations().isEmpty(), false);
-        
-        
-        //test for proper aggregation of policy intents on implementation elements
-        for ( Intent intent : ((PolicySetAttachPoint)composite.getComponents().get(0).getImplementation()).getRequiredIntents() ) {
-            String intentName = intent.getName().getLocalPart();
-            if ( !(intentName.equals("tuscanyIntent_1") || intentName.equals("tuscanyIntent_2") ||
-                intentName.equals("tuscanyIntent_3")) ) {
-                fail();
-            }
-        }
-        
-        for ( Intent intent : ((PolicySetAttachPoint)composite.getComponents().get(5)).getRequiredIntents() ) {
-            String intentName = intent.getName().getLocalPart();
-            if ( !(intentName.equals("tuscanyIntent_1") || intentName.equals("tuscanyIntent_4") ||
-                intentName.equals("tuscanyIntent_5")) ) {
-                fail();
-            }
-        }
-
-        //test for proper aggregation of policy intents and policysets on operations of implementation
-        OperationsConfigurator opConf = (OperationsConfigurator)composite.getComponents().get(5);
-        assertEquals(opConf.getConfiguredOperations().get(0).getRequiredIntents().size(), 4);
-        for ( Intent intent :  opConf.getConfiguredOperations().get(0).getRequiredIntents()) {
-            String intentName = intent.getName().getLocalPart();
-            if ( !(intentName.equals("tuscanyIntent_1") || intentName.equals("tuscanyIntent_4") ||
-                intentName.equals("tuscanyIntent_5") || intentName.equals("tuscanyIntent_6") ) ) {
-                fail();
-            }
-        }
-        
-        opConf = (OperationsConfigurator)composite.getComponents().get(6);
-        assertEquals(opConf.getConfiguredOperations().get(0).getRequiredIntents().size(), 3);
-        for ( Intent intent :  opConf.getConfiguredOperations().get(0).getRequiredIntents()) {
-            String intentName = intent.getName().getLocalPart();
-            if ( !(intentName.equals("tuscanyIntent_1") || intentName.equals("tuscanyIntent_4") ||
-                intentName.equals("tuscanyIntent_6.qualified2") ) ) {
-                fail();
-            }
-        }
-    }
-    
-    public void testPolicySets() throws Exception {
-        ModelResolver resolver = new TestModelResolver(getClass().getClassLoader());
-        
-        URL url = getClass().getResource("definitions_with_policysets.xml");
-        URI uri = URI.create("definitions_with_policysets.xml");
-        SCADefinitions policyDefinitions = policyDefinitionsProcessor.read(null, uri, url);
-                
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-        
-        for ( Component component : composite.getComponents() ) {
-            for ( PolicySet policySet : policyDefinitions.getPolicySets() ) {
-                component.getApplicablePolicySets().add(policySet);
-            }
-        }
-        
-        staxProcessor.resolve(policyDefinitions, resolver);
-        staxProcessor.resolve(composite, resolver);
-
-        compositeBuilder.build(composite);
-        
-        //test for determination of policysets for implementation
-        assertEquals(((PolicySetAttachPoint)composite.getComponents().get(0)).getPolicySets().size(), 1);
-        for ( PolicySet policySet : ((PolicySetAttachPoint)composite.getComponents().get(0).getImplementation()).getPolicySets() ) {
-            String policySetName = policySet.getName().getLocalPart();
-            if ( !(policySetName.equals("tuscanyPolicySet_1")) ) {
-                fail();
-            }
-        }
-        
-        assertEquals(((PolicySetAttachPoint)composite.getComponents().get(5)).getPolicySets().size(), 2);
-        for ( PolicySet policySet : ((PolicySetAttachPoint)composite.getComponents().get(5).getImplementation()).getPolicySets() ) {
-            String policySetName = policySet.getName().getLocalPart();
-            if ( !(policySetName.equals("tuscanyPolicySet_1") || policySetName.equals("tuscanyPolicySet_2")) ) {
-                fail();
-            }
-        }
-
-        //test for computation of policysets on operations of implementation
-        OperationsConfigurator opConf = (OperationsConfigurator)composite.getComponents().get(5);
-        assertEquals(opConf.getConfiguredOperations().get(0).getPolicySets().size(), 3);
-        for ( PolicySet policySet : opConf.getConfiguredOperations().get(0).getPolicySets() ) {
-            String policySetName = policySet.getName().getLocalPart();
-            if ( !(policySetName.equals("tuscanyPolicySet_1") || policySetName.equals("tuscanyPolicySet_2")
-                    || policySetName.equals("tuscanyPolicySet_3")) ) {
-                fail();
-            }
-        }
-        
-        opConf = (OperationsConfigurator)composite.getComponents().get(6);
-        assertEquals(opConf.getConfiguredOperations().get(0).getPolicySets().size(), 4);
-        for ( PolicySet policySet : opConf.getConfiguredOperations().get(0).getPolicySets() ) {
-            String policySetName = policySet.getName().getLocalPart();
-            if ( !(policySetName.equals("tuscanyPolicySet_1") || policySetName.equals("tuscanyPolicySet_2")
-                    || policySetName.equals("tuscanyPolicySet_3")
-                    || policySetName.equals("tuscanyPolicySet_4")) ) {
-                fail();
-            }
-        }
-        //new PrintUtil(System.out).print(composite);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
deleted file mode 100644
index 27e3579c35..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.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.implementation.java.xml;
-
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-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>();
-    
-    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) {
-            
-            // 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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
deleted file mode 100644
index 646b5db617..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.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.java.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.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 writing Java implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class WriteTestCase extends TestCase {
-
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    
-    @Override
-    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);
-    }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
deleted file mode 100644
index a58fa0c072..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
deleted file mode 100644
index cddc134c2c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/tags/java/sca/1.3/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
deleted file mode 100644
index 9147133d5d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java-xml/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/tags/java/sca/1.3/modules/implementation-java/LICENSE b/tags/java/sca/1.3/modules/implementation-java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/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/tags/java/sca/1.3/modules/implementation-java/NOTICE b/tags/java/sca/1.3/modules/implementation-java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/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/tags/java/sca/1.3/modules/implementation-java/pom.xml b/tags/java/sca/1.3/modules/implementation-java/pom.xml
deleted file mode 100644
index 22be3b311c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-implementation-java</artifactId>
-    <name>Apache Tuscany SCA Java Implementation Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</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.implementation.java</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.java*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
deleted file mode 100644
index c8b7c072ac..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.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.java;
-
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- * Represents a Java implementation.
- * 
- * @version $Rev$ $Date$
- */
-public interface BaseJavaImplementation extends Implementation, Extensible {
-
-    /**
-     * Returns the name of the Java implementation class.
-     * 
-     * @return the name of the Java implementation class
-     */
-    String getName();
-
-    /**
-     * Sets the name of the Java implementation class.
-     * 
-     * @param className the name of the Java implementation class
-     */
-    void setName(String className);
-
-    /**
-     * Returns the Java implementation class.
-     * 
-     * @return the Java implementation class
-     */
-    Class<?> getJavaClass();
-
-    /**
-     * Sets the Java implementation class.
-     * 
-     * @param javaClass the Java implementation class
-     */
-    void setJavaClass(Class<?> javaClass);
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
deleted file mode 100644
index e44ebd7c91..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.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.java;
-
-/**
- * A factory for the Java model.
- *
- * @version $Rev$ $Date$
- */
-import org.apache.tuscany.sca.implementation.java.impl.JavaImplementationFactoryImpl;
-
-public class DefaultJavaImplementationFactory extends JavaImplementationFactoryImpl implements JavaImplementationFactory {
-
-    public DefaultJavaImplementationFactory() {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
deleted file mode 100644
index 2198a632c0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.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.java;
-
-import java.lang.reflect.Member;
-
-/**
- * Denotes a problem processing annotations on a POJO implementation
- * 
- * @version $Rev$ $Date$
- */
-public class IntrospectionException extends Exception {
-    private static final long serialVersionUID = -361025119035104470L;
-    private Member member;
-
-    public IntrospectionException() {
-    }
-
-    public IntrospectionException(String message) {
-        super(message);
-    }
-
-    public IntrospectionException(String message, Member member) {
-        super(message);
-        this.member = member;
-    }
-
-    public IntrospectionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public IntrospectionException(Throwable cause) {
-        super(cause);
-    }
-
-    public Member getMember() {
-        return member;
-    }
-
-    public void setMember(Member member) {
-        this.member = member;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
deleted file mode 100644
index c49ef21547..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.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.implementation.java;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-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.impl.JavaScopeImpl;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-
-/**
- * Represents a Java implementation.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaImplementation extends BaseJavaImplementation {
-
-    /**
-     * Returns the constructor used to instantiate implementation instances.
-     *
-     * @return the constructor used to instantiate implementation instances
-     */
-    JavaConstructorImpl<?> getConstructor();
-
-    /**
-     * Sets the constructor used to instantiate implementation instances
-     *
-     * @param definition the constructor used to instantiate implementation instances
-     */
-    void setConstructor(JavaConstructorImpl<?> definition);
-
-    /**
-     * Returns the component initializer method.
-     *
-     * @return the component initializer method
-     */
-    Method getInitMethod();
-
-    /**
-     * Sets the component initializer method.
-     *
-     * @param initMethod the component initializer method
-     */
-    void setInitMethod(Method initMethod);
-
-    /**
-     * Returns the component destructor method.
-     *
-     * @return the component destructor method
-     */
-    Method getDestroyMethod();
-
-    /**
-     * Sets the component destructor method.
-     *
-     * @param destroyMethod the component destructor method
-     */
-    void setDestroyMethod(Method destroyMethod);
-
-    /**
-     * Returns the resources injected into this implementation.
-     *
-     * @return
-     */
-    Map<String, JavaResourceImpl> getResources();
-
-    /**
-     * Returns the Java member used to inject a conversation ID.
-     *
-     * @return
-     */
-    List<Member> getConversationIDMembers();
-
-    /**
-     * Sets the Java member used to inject a conversation ID.
-     *
-     * @param conversationIDMember
-     */
-    void addConversationIDMember(Member conversationIDMember);
-
-    /**
-     * Returns true if AllowsPassReference is set.
-     *
-     * @return true if AllowsPassByReference is set
-     */
-    boolean isAllowsPassByReference();
-
-    /**
-     * @param allowsPassByReference the allowsPassByReference to set
-     */
-    void setAllowsPassByReference(boolean allowsPassByReference);
-
-    /**
-     * @return the allowsPassByReferenceMethods
-     */
-    List<Method> getAllowsPassByReferenceMethods();
-
-    /**
-     * @param method
-     * @return
-     */
-    boolean isAllowsPassByReference(Method method);
-
-    /**
-     * @return the constructors
-     */
-    Map<Constructor, JavaConstructorImpl> getConstructors();
-
-    /**
-     * @return the eagerInit
-     */
-    boolean isEagerInit();
-
-    /**
-     * @param eagerInit the eagerInit to set
-     */
-    void setEagerInit(boolean eagerInit);
-
-    /**
-     * @return the callbacks
-     */
-    Map<String, Collection<JavaElementImpl>> getCallbackMembers();
-
-    /**
-     * @return the properties
-     */
-    Map<String, JavaElementImpl> getPropertyMembers();
-
-    /**
-     * @return the references
-     */
-    Map<String, JavaElementImpl> getReferenceMembers();
-
-    /**
-     * @return the scope
-     */
-    JavaScopeImpl getJavaScope();
-
-    /**
-     * @param scope the scope to set
-     */
-    void setJavaScope(JavaScopeImpl scope);
-
-    /**
-     * @return the maxAge
-     */
-    long getMaxAge();
-
-    /**
-     * @param maxAge the maxAge to set
-     */
-    void setMaxAge(long maxAge);
-
-    /**
-     * @return the maxIdleTime
-     */
-    long getMaxIdleTime();
-
-    /**
-     * @param maxIdleTime the maxIdleTime to set
-     */
-    void setMaxIdleTime(long maxIdleTime);
-
-    /**
-     * @return the map of a policy handler class names
-     */
-    Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames();
-
-    /**
-     * @param policyHandlerClassNames Map of policyhandler class names
-     */
-    void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames);
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
deleted file mode 100644
index 8228c80372..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.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.java;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-
-
-/**
- * Factory for the Java model
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaImplementationFactory {
-
-    /**
-     * Creates a new Java implementation model.
-     * 
-     * @return
-     */
-    JavaImplementation createJavaImplementation();
-    
-    /**
-     * Creates a new Java implementation model from an implementation class.
-     * 
-     * @param implementationClass The implementation class to introspect.
-     * @return
-     */
-    JavaImplementation createJavaImplementation(Class<?> implementationClass) throws IntrospectionException;
-
-    /**
-     * Creates the contents of a Java implementation model from an implementation class.
-     * 
-     * @param implementationClass The implementation class to introspect.
-     * @return
-     */
-    void createJavaImplementation(JavaImplementation javaImplementation, Class<?> implementationClass) throws IntrospectionException;
-
-    /**
-     * Registers the given visitor.
-     * 
-     * @param visitor
-     */
-    void addClassVisitor(JavaClassVisitor visitor);
-
-    /**
-     * Deregisters the given visitor.
-     */
-    void removeClassVisitor(JavaClassVisitor visitor);
-    
-    /**
-     * Returns the list of visitors.
-     * 
-     * @return
-     */
-    List<JavaClassVisitor> getClassVisitors();
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
deleted file mode 100644
index 97773879fa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.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.implementation.java.impl;
-
-import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
-import org.apache.tuscany.sca.implementation.java.BaseJavaImplementation;
-
-/**
- * Represents a Java implementation.
- * 
- * @version $Rev$ $Date$
- */
-abstract class BaseJavaImplementationImpl extends ImplementationImpl implements BaseJavaImplementation {
-
-    private String className;
-    private Class<?> javaClass;
-    
-    protected BaseJavaImplementationImpl() {
-    }
-
-    public String getName() {
-        if (isUnresolved()) {
-            return className;
-        } else if (javaClass != null) {
-            return javaClass.getName();
-        } else {
-            return null;
-        }
-    }
-
-    public void setName(String className) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.className = className;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-        if (this.className == null) {
-            this.className = javaClass.getName();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return getName();
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof BaseJavaImplementation) {
-            if (getName() != null) {
-                return getName().equals(((BaseJavaImplementation)obj).getName());
-            } else {
-                return ((BaseJavaImplementation)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
deleted file mode 100644
index 0bcec3c78f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.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.implementation.java.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper;
-
-/**
- * An extensible Java class introspector implementation.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaClassIntrospectorImpl {
-    
-    private List<JavaClassVisitor> visitors;
-
-    public JavaClassIntrospectorImpl(List<JavaClassVisitor> visitors) {
-        this.visitors = visitors;
-    }
-
-    /**
-     * JSR-250 PFD recommends the following guidelines for how annotations
-     * interact with inheritance in order to keep the resulting complexity in
-     * control:
-     * <ol>
-     * <li>Class-level annotations only affect the class they annotate and
-     * their members, that is, its methods and fields. They never affect a
-     * member declared by a superclass, even if it is not hidden or overridden
-     * by the class in question.
-     * <li>In addition to affecting the annotated class, class-level
-     * annotations may act as a shorthand for member-level annotations. If a
-     * member carries a specific member-level annotation, any annotations of the
-     * same type implied by a class-level annotation are ignored. In other
-     * words, explicit member-level annotations have priority over member-level
-     * annotations implied by a class-level annotation.
-     * <li>The interfaces implemented by a class never contribute annotations
-     * to the class itself or any of its members.
-     * <li>Members inherited from a superclass and which are not hidden or
-     * overridden maintain the annotations they had in the class that declared
-     * them, including member-level annotations implied by class-level ones.
-     * <li>Member-level annotations on a hidden or overridden member are always
-     * ignored.
-     * </ol>
-     */
-    public void introspectClass(JavaImplementation type, Class<?> clazz)
-        throws IntrospectionException {
-        for (JavaClassVisitor extension : visitors) {
-            extension.visitClass(clazz, type);
-        }
-
-        for (Constructor<?> constructor : clazz.getConstructors()) {
-            for (JavaClassVisitor extension : visitors) {
-                extension.visitConstructor(constructor, type);
-                // Assuming the visitClass or visitConstructor will populate the
-                // type.getConstructors
-                JavaConstructorImpl<?> definition = type.getConstructors().get(constructor);
-                if (definition != null) {
-                    for (JavaParameterImpl p : definition.getParameters()) {
-                        extension.visitConstructorParameter(p, type);
-                    }
-                }
-            }
-        }
-
-        Set<Field> fields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(clazz, true);
-        for (Field field : fields) {
-            for (JavaClassVisitor extension : visitors) {
-                extension.visitField(field, type);
-            }
-        }
-
-        // Check if any private fields have illegal annotations that should be raised as errors
-        Set<Field> privateFields = JavaIntrospectionHelper.getPrivateFields(clazz);
-        for (Field field : privateFields) {
-            for (JavaClassVisitor processor : visitors) {
-                processor.visitField(field, type);
-            }
-        }
-        
-        Set<Method> methods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(clazz, true);
-        for (Method method : methods) {
-            for (JavaClassVisitor processor : visitors) {
-                processor.visitMethod(method, type);
-            }
-        }
-
-        // Check if any private methods have illegal annotations that should be raised as errors
-        Set<Method> privateMethods = JavaIntrospectionHelper.getPrivateMethods(clazz);
-        for (Method method : privateMethods) {
-            for (JavaClassVisitor processor : visitors) {
-                processor.visitMethod(method, type);
-            }
-        }
-
-        Class superClass = clazz.getSuperclass();
-        if (superClass != null) {
-            visitSuperClass(superClass, type);
-        }
-
-        for (JavaClassVisitor extension : visitors) {
-            extension.visitEnd(clazz, type);
-        }
-    }
-
-    private void visitSuperClass(Class<?> clazz, JavaImplementation type) throws IntrospectionException {
-        if (!Object.class.equals(clazz)) {
-            for (JavaClassVisitor extension : visitors) {
-                extension.visitSuperClass(clazz, type);
-            }
-            clazz = clazz.getSuperclass();
-            if (clazz != null) {
-                visitSuperClass(clazz, type);
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
deleted file mode 100644
index c0b04b4b4e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.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.java.impl;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Hold injection information for the constructor used to instantiate a
- * component implementation instance
- * 
- * @version $Rev$ $Date$
- */
-public class JavaConstructorImpl<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;
-    }
-
-    /**
-     * @return the parameters
-     */
-    public JavaParameterImpl[] getParameters() {
-        return parameters;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
deleted file mode 100644
index 2365298f71..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.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.sca.implementation.java.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;
-
-/**
- * This class represents a java element such as a Package, Class, Constructor,
- * Field, Method or Parameter.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaElementImpl {
-    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(Package pkg) {
-        this.anchor = pkg;
-        this.elementType = ElementType.PACKAGE;
-        this.name = pkg.getName();
-    }
-
-    public JavaElementImpl(Class<?> cls) {
-        this.anchor = cls;
-        this.elementType = ElementType.TYPE;
-        this.type = cls;
-        this.genericType = cls;
-        this.name = cls.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;
-    }
-
-    /**
-     * @return the anchor
-     */
-    public AnnotatedElement getAnchor() {
-        return anchor;
-    }
-
-    /**
-     * @return the elementType
-     */
-    public ElementType getElementType() {
-        return elementType;
-    }
-
-    /**
-     * @return the genericType
-     */
-    public Type getGenericType() {
-        return genericType;
-    }
-
-    /**
-     * @return the index
-     */
-    public int getIndex() {
-        return index;
-    }
-
-    /**
-     * @return the type
-     */
-    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;
-    }
-
-    @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;
-    }
-
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name the name to set
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return the classifier
-     */
-    public Class<? extends Annotation> getClassifer() {
-        return classifer;
-    }
-
-    /**
-     * @param classifer the classifier to set
-     */
-    public void setClassifer(Class<? extends Annotation> classifer) {
-        this.classifer = classifer;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
deleted file mode 100644
index 46594e0f50..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.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.implementation.java.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-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.ConversationIDProcessor;
-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.ScopeProcessor;
-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;
-
-/**
- * A module activator for the Java implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class JavaImplementationActivator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry registry) {
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-        PolicyFactory policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        
-        BaseJavaClassVisitor[] extensions =
-            new BaseJavaClassVisitor[] {new ConstructorProcessor(assemblyFactory),
-                                        new AllowsPassByReferenceProcessor(assemblyFactory),
-                                        new ComponentNameProcessor(assemblyFactory),
-                                        new ContextProcessor(assemblyFactory),
-                                        new ConversationIDProcessor(assemblyFactory),
-                                        new ConversationProcessor(assemblyFactory),
-                                        new DestroyProcessor(assemblyFactory), new EagerInitProcessor(assemblyFactory),
-                                        new InitProcessor(assemblyFactory), new PropertyProcessor(assemblyFactory),
-                                        new ReferenceProcessor(assemblyFactory, javaFactory),
-                                        new ResourceProcessor(assemblyFactory), new ScopeProcessor(assemblyFactory),
-                                        new ServiceProcessor(assemblyFactory, javaFactory),
-                                        new HeuristicPojoProcessor(assemblyFactory, javaFactory),
-                                        new PolicyProcessor(assemblyFactory, policyFactory)};
-
-        JavaImplementationFactory javaImplementationFactory = modelFactories.getFactory(JavaImplementationFactory.class);
-        for (JavaClassVisitor extension : extensions) {
-            javaImplementationFactory.addClassVisitor(extension);
-        }
-
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
deleted file mode 100644
index 0cc78498e6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.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.implementation.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.introspect.JavaClassVisitor;
-
-/**
- * A factory for the Java model.
- *
- * @version $Rev$ $Date$
- */
-public abstract class JavaImplementationFactoryImpl implements JavaImplementationFactory {
-    
-    private List<JavaClassVisitor> visitors = new ArrayList<JavaClassVisitor>();
-    private JavaClassIntrospectorImpl introspector;
-    
-    public JavaImplementationFactoryImpl() {
-        introspector = new JavaClassIntrospectorImpl(visitors);
-    }
-
-    public JavaImplementation createJavaImplementation() {
-        JavaImplementation javaImplementation = new JavaImplementationImpl();
-        return javaImplementation;
-    }
-    
-    public JavaImplementation createJavaImplementation(Class<?> implementationClass) throws IntrospectionException {
-        JavaImplementation javaImplementation = createJavaImplementation();
-        introspector.introspectClass(javaImplementation, implementationClass);
-        return javaImplementation;
-    }
-    
-    public void createJavaImplementation(JavaImplementation javaImplementation, Class<?> implementationClass) throws IntrospectionException {
-        introspector.introspectClass(javaImplementation, implementationClass);
-    }
-
-    public void addClassVisitor(JavaClassVisitor visitor) {
-        visitors.add(visitor);
-    }
-
-    public void removeClassVisitor(JavaClassVisitor visitor) {
-        visitors.remove(visitor);
-    }
-    
-    public List<JavaClassVisitor> getClassVisitors() {
-        return visitors;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
deleted file mode 100644
index 8aa62ae62c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.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.java.impl;
-
-import java.lang.reflect.Constructor;
-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.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
-
-/**
- * A component type specialization for POJO implementations
- *
- * @version $Rev$ $Date$
- */
-public class JavaImplementationImpl extends BaseJavaImplementationImpl implements JavaImplementation {
-    private JavaConstructorImpl<?> constructorDefinition;
-    private Map<Constructor, JavaConstructorImpl> constructors = new HashMap<Constructor, JavaConstructorImpl>();
-    private Method initMethod;
-    private Method destroyMethod;
-    private final Map<String, JavaResourceImpl> resources = new HashMap<String, JavaResourceImpl>();
-    private final Map<String, JavaElementImpl> propertyMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, JavaElementImpl> referenceMembers = new HashMap<String, JavaElementImpl>();
-    private final Map<String, Collection<JavaElementImpl>> callbackMembers = new HashMap<String, Collection<JavaElementImpl>>();
-    private List<Member> conversationIDMember = new ArrayList<Member>();
-    private boolean eagerInit;
-    private boolean allowsPassByReference;
-    private List<Method> allowsPassByReferenceMethods = new ArrayList<Method>();
-    private long maxAge = -1;
-    private long maxIdleTime = -1;
-    private JavaScopeImpl scope = JavaScopeImpl.STATELESS;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
-    
-    protected JavaImplementationImpl() {
-        super();
-    }    
-
-    public JavaConstructorImpl<?> getConstructor() {
-        return constructorDefinition;
-    }
-
-    public void setConstructor(JavaConstructorImpl<?> definition) {
-        this.constructorDefinition = definition;
-    }
-
-    public Method getInitMethod() {
-        return initMethod;
-    }
-
-    public void setInitMethod(Method initMethod) {
-        this.initMethod = initMethod;
-    }
-
-    public Method getDestroyMethod() {
-        return destroyMethod;
-    }
-
-    public void setDestroyMethod(Method destroyMethod) {
-        this.destroyMethod = destroyMethod;
-    }
-
-    public Map<String, JavaResourceImpl> getResources() {
-        return resources;
-    }
-
-    public List<Member> getConversationIDMembers() {
-        return this.conversationIDMember;
-    }
-
-    public void addConversationIDMember(Member conversationIDMember) {
-        this.conversationIDMember.add(conversationIDMember);
-    }
-
-    public boolean isAllowsPassByReference() {
-        return allowsPassByReference;
-    }
-
-    public void setAllowsPassByReference(boolean allowsPassByReference) {
-        this.allowsPassByReference = allowsPassByReference;
-    }
-
-    public List<Method> getAllowsPassByReferenceMethods() {
-        return allowsPassByReferenceMethods;
-    }
-    
-    public boolean isAllowsPassByReference(Method method) {
-        return allowsPassByReference || allowsPassByReferenceMethods.contains(method);
-    }
-
-    public Map<Constructor, JavaConstructorImpl> getConstructors() {
-        return constructors;
-    }
-
-    public boolean isEagerInit() {
-        return eagerInit;
-    }
-
-    public void setEagerInit(boolean eagerInit) {
-        this.eagerInit = eagerInit;
-    }
-
-    public Map<String, Collection<JavaElementImpl>> getCallbackMembers() {
-        return callbackMembers;
-    }
-
-    public Map<String, JavaElementImpl> getPropertyMembers() {
-        return propertyMembers;
-    }
-
-    public Map<String, JavaElementImpl> getReferenceMembers() {
-        return referenceMembers;
-    }
-
-    public JavaScopeImpl getJavaScope() {
-        return scope;
-    }
-
-    public void setJavaScope(JavaScopeImpl scope) {
-        this.scope = scope;
-    }
-
-    public long getMaxAge() {
-        return maxAge;
-    }
-
-    public void setMaxAge(long maxAge) {
-        this.maxAge = maxAge;
-    }
-
-    public long getMaxIdleTime() {
-        return maxIdleTime;
-    }
-
-    public void setMaxIdleTime(long maxIdleTime) {
-        this.maxIdleTime = maxIdleTime;
-    }
-
-    public Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames() {
-        return policyHandlerClassNames;
-    }
-
-    public void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
-        this.policyHandlerClassNames = policyHandlerClassNames;
-    }
- 
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
deleted file mode 100644
index c4c528f4f2..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.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.java.impl;
-
-import java.lang.reflect.Constructor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaParameterImpl extends JavaElementImpl {
-    /**
-     * @param constructor
-     * @param index
-     */
-    public JavaParameterImpl(Constructor<?> constructor, int index) {
-        super(constructor, index);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
deleted file mode 100644
index 1aca15ebb8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.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.implementation.java.impl;
-
-
-/**
- * A resource dependency declared by a Java component implementation
- * 
- * @version $Rev$ $Date$
- */
-public class JavaResourceImpl {
-    private JavaElementImpl element;
-    private String mappedName;
-    private boolean optional;
-
-    public JavaResourceImpl(JavaElementImpl element) {
-        this.element = element;
-    }
-
-    /**
-     * The name of the resource
-     * 
-     * @return the name of the resource
-     */
-    public String getName() {
-        return element.getName();
-    }
-
-    /**
-     * Returns the URI of the resource
-     * 
-     * @return the URI of the resource
-     */
-    public String getMappedName() {
-        return mappedName;
-    }
-
-    /**
-     * Sets the resource URI
-     */
-    public void setMappedName(String mappedName) {
-        this.mappedName = mappedName;
-    }
-
-    /**
-     * If true, the resource is optional
-     * 
-     * @return true if the resource is optional
-     */
-    public boolean isOptional() {
-        return optional;
-    }
-
-    /**
-     * Sets whether the resource is optional
-     */
-    public void setOptional(boolean optional) {
-        this.optional = optional;
-    }
-
-    /**
-     * @return the element
-     */
-    public JavaElementImpl getElement() {
-        return element;
-    }
-
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
deleted file mode 100644
index 85c2f73f75..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.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.java.impl;
-
-/**
- * The default implementation scopes supported by assemblies.
- *
- * @version $Rev$ $Date$
- */
-public class JavaScopeImpl {
-    public static final JavaScopeImpl STATELESS = new JavaScopeImpl("STATELESS");
-    public static final JavaScopeImpl REQUEST = new JavaScopeImpl("REQUEST");
-    public static final JavaScopeImpl SESSION = new JavaScopeImpl("SESSION");
-    public static final JavaScopeImpl CONVERSATION = new JavaScopeImpl("CONVERSATION");
-    public static final JavaScopeImpl COMPOSITE = new JavaScopeImpl("COMPOSITE");
-    public static final JavaScopeImpl SYSTEM = new JavaScopeImpl("SYSTEM");
-    public static final JavaScopeImpl UNDEFINED = new JavaScopeImpl("UNDEFINED");
-
-    private String scope;
-
-    public JavaScopeImpl(String scope) {
-        this.scope = scope.toUpperCase().intern();
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final JavaScopeImpl scope1 = (JavaScopeImpl) o;
-        return !(scope != null ? scope != scope1.scope.intern() : scope1.scope != null);
-    }
-
-    @Override
-    public int hashCode() {
-        return scope != null ? scope.hashCode() : 0;
-    }
-
-    @Override
-    public String toString() {
-        return scope;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
deleted file mode 100644
index 4fa40dee4b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.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.implementation.java.introspect;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-
-/**
- * Implementations process class-level metadata, typically parsing annotations
- * and updating the corresponding <code>ComponentType</code>. A processor
- * may, for example, create a Property which is responsible for injecting a
- * complex type on a component implementation instance when it is instantiated.
- * <p/> Processors will receive callbacks as the implementation class is walked
- * while evaluating an assembly. It is the responsibility of the parser to
- * determine whether to perform an action during the callback.
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaClassVisitor {
-
-    /**
-     * A callback received when the component implementation class is first
-     * loaded
-     * 
-     * @param clazz the component implementation class
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * A callback received as the component implementation class hierarchy is
-     * evaluated
-     * 
-     * @param clazz the superclass in the component implmentation's class
-     *            hierarchy
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    <T> void visitSuperClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * A callback received as the component implementation's public and
-     * protected methods are evaluated
-     * 
-     * @param method the current public or protected method being evaluated
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    void visitMethod(Method method, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * A callback received as the component implementation's constructor used
-     * for instantiation by the runtime is evaluated. If an implementation
-     * contains more than one constructor, the constructor passed to the
-     * callback will be chosen according to the algorithm described in the SCA
-     * Java Client and Implementation Model Specification.
-     * 
-     * @param constructor the constructor used for instantiating component
-     *            implementation instances
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * @param parameter
-     * @param type
-     * @throws IntrospectionException
-     */
-    void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * A callback received as the component implementation's public and
-     * protected fields are evaluated
-     * 
-     * @param field the current public or protected field being evaluated
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    void visitField(Field field, JavaImplementation type) throws IntrospectionException;
-
-    /**
-     * The final callback received when all other callbacks during evaluation of
-     * the component implementation have been issued
-     * 
-     * @param clazz the component implementation class
-     * @param type the incomplete component type associated with the
-     *            implementation class
-     * @throws IntrospectionException if an error is encountered while processing
-     *             metadata
-     */
-    <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException;
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
deleted file mode 100644
index 9596fe0808..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.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.implementation.java.introspect.impl;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-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.JavaParameterImpl;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-
-/**
- * Base class for ImplementationProcessors that handle annotations that add
- * Properties.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class AbstractPropertyProcessor<A extends Annotation> extends BaseJavaClassVisitor {
-    private final Class<A> annotationClass;
-
-    protected AbstractPropertyProcessor(AssemblyFactory assemblyFactory, Class<A> annotationClass) {
-        super(assemblyFactory);
-        this.annotationClass = annotationClass;
-    }
-    
-    private boolean removeProperty(JavaElementImpl prop, JavaImplementation type) {
-        if(prop==null) {
-            return false;
-        }
-        List<Property> props = type.getProperties();
-        for(int i=0;i<props.size();i++) {
-            if(props.get(i).getName().equals(prop.getName())) {
-                props.remove(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        A annotation = method.getAnnotation(annotationClass);
-        if (annotation == null) {
-            return;
-        }
-
-        if (!JavaIntrospectionHelper.isSetter(method)) {
-            throw new IllegalPropertyException("Annotated method is not a setter: " + method, method);
-        }
-
-        String name = getName(annotation);
-        if (name == null || "".equals(name)) {
-            name = method.getName();
-            if (name.startsWith("set")) {
-                name = JavaIntrospectionHelper.toPropertyName(method.getName());
-            }
-        }
-
-        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
-        JavaElementImpl prop = properties.get(name);
-        // Setter override field
-        if (prop != null && prop.getElementType() != ElementType.FIELD) {
-            throw new DuplicatePropertyException(name);
-        }
-
-        removeProperty(prop, type);
-        
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        Property property = createProperty(name, element);
-
-        // add databinding available as annotations, as extensions
-
-        initProperty(property, annotation);
-        type.getProperties().add(property);
-        properties.put(name, element);
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-
-        A annotation = field.getAnnotation(annotationClass);
-        if (annotation == null) {
-            return;
-        }
-
-        String name = getName(annotation);
-        if (name == null) {
-            name = "";
-        }
-        if ("".equals(name) || name.equals(field.getType().getName())) {
-            name = field.getName();
-        }
-
-        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
-        JavaElementImpl prop = properties.get(name);
-        // Setter override field
-        if (prop != null && prop.getElementType() == ElementType.FIELD) {
-            throw new DuplicatePropertyException(name);
-        }
-
-        if (prop == null) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            Property property = createProperty(name, element);
-            initProperty(property, annotation);
-            type.getProperties().add(property);
-            properties.put(name, element);
-        }
-    }
-
-    @Override
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
-        throws IntrospectionException {
-
-        Map<String, JavaElementImpl> properties = type.getPropertyMembers();
-        A annotation = parameter.getAnnotation(annotationClass);
-        if (annotation != null) {
-            String name = getName(annotation);
-            if (name == null) {
-                name = parameter.getType().getName();
-            }
-            if (!"".equals(name) && !"".equals(parameter.getName()) && !name.equals(parameter.getName())) {
-                throw new InvalidConstructorException("Mismatched property name: " + parameter);
-            }
-            if ("".equals(name) && "".equals(parameter.getName())) {
-                throw new InvalidPropertyException("Missing property name: " + parameter);
-            }
-            if ("".equals(name)) {
-                name = parameter.getName();
-            }
-
-            JavaElementImpl prop = properties.get(name);
-            // Setter override field
-            if (prop != null && prop.getElementType() != ElementType.FIELD) {
-                throw new DuplicatePropertyException(name);
-            }
-            removeProperty(prop, type);
-            
-            parameter.setName(name);
-            parameter.setClassifer(annotationClass);
-            Property property = createProperty(name, parameter);
-            initProperty(property, annotation);
-            type.getProperties().add(property);
-            properties.put(name, parameter);
-        }
-    }
-
-    protected abstract String getName(A annotation);
-
-    protected abstract void initProperty(Property property, A annotation) throws IntrospectionException;
-
-    @SuppressWarnings("unchecked")
-    protected Property createProperty(String name, JavaElementImpl element) throws IntrospectionException {
-
-        Property property = assemblyFactory.createProperty();
-        property.setName(name);
-        Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-        property.setXSDType(JavaXMLMapper.getXMLType(baseType));
-
-        Class<?> javaType = element.getType();
-        if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
-            property.setMany(true);
-        }
-        return property;
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
deleted file mode 100644
index 4a3ce0c343..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.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.java.introspect.impl;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * Processes {@link AllowsPassByReference} on an implementation
- * 
- * @version $Rev$ $Date$
- */
-public class AllowsPassByReferenceProcessor extends BaseJavaClassVisitor {
-    
-    public AllowsPassByReferenceProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        type.setAllowsPassByReference(clazz.isAnnotationPresent(AllowsPassByReference.class));
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        boolean pbr = method.isAnnotationPresent(AllowsPassByReference.class);
-        if (pbr) {
-            type.getAllowsPassByReferenceMethods().add(method);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
deleted file mode 100644
index c6e6b6e4d6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when constructor parameters cannot be unambiguously resolved to a property or reference
- *
- * @version $Rev$ $Date$
- */
-public class AmbiguousConstructorException extends IntrospectionException {
-    private static final long serialVersionUID = 3662860753837091880L;
-
-    public AmbiguousConstructorException(String message) {
-        super(message);
-    }
-    
-    public AmbiguousConstructorException(String message, Member member) {
-        super(message, member);
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
deleted file mode 100644
index bc6551d45d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.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.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-
-/**
- * A convenience class for annotation processors which alleviates the need to
- * implement unused callbacks
- * 
- * @version $Rev$ $Date$
- */
-public abstract class BaseJavaClassVisitor implements JavaClassVisitor {
-    protected AssemblyFactory assemblyFactory;
-    
-    protected BaseJavaClassVisitor(AssemblyFactory factory) {
-        this.assemblyFactory = factory;
-    }
-
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public <T> void visitSuperClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-    }
-
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type) throws IntrospectionException {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
deleted file mode 100644
index 556f0b77e9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.osoa.sca.annotations.ComponentName;
-
-/**
- * Processes {@link @ComponentName} annotations on a component implementation and adds
- * a {@link JavaMappedProperty} to the component type which will be used to
- * inject the appropriate component name.
- * 
- * @version $Rev$ $Date$
- */
-public class ComponentNameProcessor extends BaseJavaClassVisitor {
-    
-    public ComponentNameProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        if (method.getAnnotation(ComponentName.class) == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 1) {
-            throw new IllegalContextException("ComponentName setter must have one parameter", method);
-        }
-        Class<?> paramType = method.getParameterTypes()[0];
-        String name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        if (String.class.equals(paramType)) {
-            JavaElementImpl element = new JavaElementImpl(method, 0);
-            element.setName(name);
-            element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-            JavaResourceImpl resource = new JavaResourceImpl(element);
-            type.getResources().put(resource.getName(), resource);
-        } else {
-            throw new IllegalContextException(paramType.getName());
-        }
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        if (field.getAnnotation(ComponentName.class) == null) {
-            return;
-        }
-        Class<?> paramType = field.getType();
-        if (String.class.equals(paramType)) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            element.setClassifer(Resource.class);
-            JavaResourceImpl resource = new JavaResourceImpl(element);
-            type.getResources().put(resource.getName(), resource);
-        } else {
-            throw new IllegalContextException(paramType.getName());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
deleted file mode 100644
index 17e28479d3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.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.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-
-/**
- * Handles processing of a constructor decorated with
- * {@link org.osoa.sca.annotations.Constructor}
- * 
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("unchecked")
-public class ConstructorProcessor extends BaseJavaClassVisitor {
-    
-    public ConstructorProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        Constructor[] ctors = clazz.getConstructors();
-        boolean found = false;
-        for (Constructor constructor : ctors) {
-            JavaConstructorImpl<?> definition = new JavaConstructorImpl(constructor);
-            type.getConstructors().put(constructor, definition);
-            if (constructor.getAnnotation(org.osoa.sca.annotations.Constructor.class) != null) {
-                if (found) {
-                    throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", constructor);
-                }
-                found = true;
-                type.setConstructor(definition);
-            }
-        }
-    }
-
-    @Override
-    public <T> void visitConstructor(Constructor<T> constructor, JavaImplementation type)
-        throws IntrospectionException {
-        org.osoa.sca.annotations.Constructor annotation = constructor
-            .getAnnotation(org.osoa.sca.annotations.Constructor.class);
-        if (annotation == null) {
-            return;
-        }
-        JavaConstructorImpl<?> definition = type.getConstructor();
-        if (definition == null) {
-            definition = new JavaConstructorImpl(constructor);
-            type.setConstructor(definition);
-        }
-        JavaParameterImpl[] parameters = definition.getParameters();
-        String[] value = annotation.value();
-        boolean isDefault = value.length == 0 || (value.length == 1 && "".equals(value[0]));
-        if (!isDefault && value.length != parameters.length) {
-            throw new InvalidConstructorException("Invalid Number of names in @Constructor");
-        }
-        for (int i = 0; i < parameters.length; i++) {
-            parameters[i].setName(i < value.length ? value[i] : "");
-        }
-        type.setConstructor(definition);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
deleted file mode 100644
index 177ceaa57c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-
-/**
- * Processes {@link @Context} annotations on a component implementation and adds
- * a {@link JavaMappedProperty} to the component type which will be used to
- * inject the appropriate context
- * 
- * @version $Rev$ $Date$
- */
-public class ContextProcessor extends BaseJavaClassVisitor {
-    
-    public ContextProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        if (method.getAnnotation(Context.class) == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 1) {
-            throw new IllegalContextException("Context setter must have one parameter", method);
-        }
-        Class<?> paramType = method.getParameterTypes()[0];
-        String name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) {
-            JavaElementImpl element = new JavaElementImpl(method, 0);
-            element.setName(name);
-            element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-            JavaResourceImpl resource = new JavaResourceImpl(element);
-            type.getResources().put(resource.getName(), resource);
-        } else {
-            throw new UnknownContextTypeException(paramType.getName());
-        }
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        if (field.getAnnotation(Context.class) == null) {
-            return;
-        }
-        Class<?> paramType = field.getType();
-        if (ComponentContext.class.equals(paramType) || RequestContext.class.equals(paramType)) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            element.setClassifer(Resource.class);
-            JavaResourceImpl resource = new JavaResourceImpl(element);
-            type.getResources().put(resource.getName(), resource);
-        } else {
-            throw new UnknownContextTypeException(paramType.getName());
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
deleted file mode 100644
index 985f8baa82..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.osoa.sca.annotations.ConversationID;
-
-/**
- * Processes {@link @ConversationID} annotations on a component implementation and adds
- * a {@link JavaMappedProperty} to the component type which will be used to
- * inject the appropriate conversationId
- *
- * @version $Rev$ $Date$
- */
-public class ConversationIDProcessor extends BaseJavaClassVisitor {
-    
-    public ConversationIDProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        if (method.getAnnotation(ConversationID.class) == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 1) {
-            throw new IllegalContextException("ConversationID setter must have one parameter", method);
-        }
-        String name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        element.setName(name);
-        element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        JavaResourceImpl resource = new JavaResourceImpl(element);
-        type.getResources().put(resource.getName(), resource);
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        if (field.getAnnotation(ConversationID.class) == null) {
-            return;
-        }
-        JavaElementImpl element = new JavaElementImpl(field);
-        element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        JavaResourceImpl resource = new JavaResourceImpl(element);
-        type.getResources().put(resource.getName(), resource);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
deleted file mode 100644
index efd04262dd..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.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.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationProcessor extends BaseJavaClassVisitor {
-    private static final String SECONDS = " SECONDS";
-    private static final String MINUTES = " MINUTES";
-    private static final String HOURS = " HOURS";
-    private static final String DAYS = " DAYS";
-    private static final String YEARS = " YEARS";
-    
-    public ConversationProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-
-        ConversationAttributes conversation = clazz.getAnnotation(ConversationAttributes.class);
-        if (conversation == null) {
-            return;
-        }
-        Scope scope = clazz.getAnnotation(Scope.class);
-        if (scope == null) {
-            // implicitly assume conversation
-            type.setJavaScope(org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl.CONVERSATION);
-        } else if (conversation != null) {
-            long maxAge;
-            long maxIdleTime;
-            String maxAgeVal = conversation.maxAge();
-            String maxIdleTimeVal = conversation.maxIdleTime();
-            try {
-                if (maxAgeVal.length() > 0) {
-                    maxAge = convertTimeMillis(maxAgeVal);
-                    type.setMaxAge(maxAge);
-                }
-            } catch (NumberFormatException e) {
-                throw new InvalidConversationalImplementation("Invalid maximum age", e);
-            }
-            try {
-                if (maxIdleTimeVal.length() > 0) {
-                    maxIdleTime = convertTimeMillis(maxIdleTimeVal);
-                    type.setMaxIdleTime(maxIdleTime);
-                }
-            } catch (NumberFormatException e) {
-                throw new InvalidConversationalImplementation("Invalid maximum idle time", e);
-            }
-        }
-
-    }
-
-    @Override
-    public void visitMethod(Method method,
-                            JavaImplementation type) throws IntrospectionException {
-        ConversationID conversationID = method.getAnnotation(ConversationID.class);
-        if (conversationID == null) {
-            return;
-        }
-        type.addConversationIDMember(method);
-    }
-
-    @Override
-    public void visitField(Field field,
-                           JavaImplementation type) throws IntrospectionException {
-        ConversationID conversationID = field.getAnnotation(ConversationID.class);
-        if (conversationID == null) {
-            return;
-        }
-        type.addConversationIDMember(field);
-    }
-
-    protected long convertTimeMillis(String expr) throws NumberFormatException {
-        expr = expr.trim().toUpperCase();
-        int i = expr.lastIndexOf(SECONDS);
-        if (i >= 0) {
-            String units = expr.substring(0, i);
-            return Long.parseLong(units) * 1000;
-        }
-        i = expr.lastIndexOf(MINUTES);
-        if (i >= 0) {
-            String units = expr.substring(0, i);
-            return Long.parseLong(units) * 60000;
-        }
-
-        i = expr.lastIndexOf(HOURS);
-        if (i >= 0) {
-            String units = expr.substring(0, i);
-            return Long.parseLong(units) * 3600000;
-        }
-        i = expr.lastIndexOf(DAYS);
-        if (i >= 0) {
-            String units = expr.substring(0, i);
-            return Long.parseLong(units) * 86400000;
-        }
-        i = expr.lastIndexOf(YEARS);
-        if (i >= 0) {
-            String units = expr.substring(0, i);
-            return Long.parseLong(units) * 31556926000L;
-        }
-        return Long.parseLong(expr) * 1000; // assume seconds if no suffix
-                                            // specified
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
deleted file mode 100644
index 50e4d46e97..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.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.java.introspect.impl;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.Destroy;
-
-/**
- * Processes the {@link @Destroy} annotation on a component implementation and
- * updates the component type with the decorated destructor method
- * 
- * @version $Rev$ $Date$
- */
-public class DestroyProcessor extends BaseJavaClassVisitor {
-    
-    public DestroyProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        Destroy annotation = method.getAnnotation(Destroy.class);
-        if (annotation == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 0) {
-            throw new IllegalDestructorException("Destructor must not have argments", method);
-        }
-        if(!method.getReturnType().equals(void.class)) {
-            throw new IllegalDestructorException("Destructor must return void.", method);
-        }
-        if (type.getDestroyMethod() != null) {
-            throw new DuplicateDestructorException("More than one destructor found on implementation");
-        }
-        if (!Modifier.isPublic(method.getModifiers())) {
-            throw new IllegalDestructorException("Destructor must be a public method. Invalid annotation @Destroy found on "+method);
-        }
-        type.setDestroyMethod(method);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
deleted file mode 100644
index 88a245cbf3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when more than one component implementation constructor is annotated with {@link
- * org.osoa.sca.annotations.Constructor}
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateConstructorException extends IntrospectionException {
-    private static final long serialVersionUID = -5926763756570552986L;
-
-    public DuplicateConstructorException(String message) {
-        super(message);
-    }
-
-    public DuplicateConstructorException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
deleted file mode 100644
index 9b834e7e87..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy}
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateDestructorException extends IntrospectionException {
-    private static final long serialVersionUID = -7474912510114895203L;
-
-    public DuplicateDestructorException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
deleted file mode 100644
index 4325faef26..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init}
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateInitException extends IntrospectionException {
-    private static final long serialVersionUID = -6282935288115512057L;
-
-    public DuplicateInitException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
deleted file mode 100644
index b9e1923e73..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when an implementation has more than one property injection site with the same name
- *
- * @version $Rev$ $Date$
- */
-public class DuplicatePropertyException extends IntrospectionException {
-    private static final long serialVersionUID = 5536415875694904037L;
-
-    public DuplicatePropertyException(String message) {
-        super(message);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
deleted file mode 100644
index 300ad6817e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when an implementation has more than one reference injection site with the same name
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateReferenceException extends IntrospectionException {
-    private static final long serialVersionUID = 907910648213477158L;
-
-    public DuplicateReferenceException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
deleted file mode 100644
index 2d177b3f76..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.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.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when an implementation has more than one resource injection site with the same name
- *
- * @version $Rev$ $Date$
- */
-public class DuplicateResourceException extends IntrospectionException {
-
-    private static final long serialVersionUID = 1619276459330463299L;
-
-    public DuplicateResourceException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
deleted file mode 100644
index 5619275b82..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.EagerInit;
-
-/**
- * Handles processing of {@link org.osoa.sca.annotations.EagerInit}
- *
- * @version $Rev$ $Date$
- */
-public class EagerInitProcessor extends BaseJavaClassVisitor {
-    
-    public EagerInitProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz,
-                               JavaImplementation type) throws IntrospectionException {
-        super.visitClass(clazz, type);
-        EagerInit annotation = clazz.getAnnotation(EagerInit.class);
-        if (annotation == null) {
-            Class<?> superClass = clazz.getSuperclass();
-            while (!Object.class.equals(superClass)) {
-                annotation = superClass.getAnnotation(EagerInit.class);
-                if (annotation != null) {
-                    break;
-                }
-                superClass = superClass.getSuperclass();
-            }
-            if (annotation == null) {
-                return;
-            }
-        }
-        type.setEagerInit(true);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
deleted file mode 100644
index fc4d27e752..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllInterfaces;
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllPublicAndProtectedFields;
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllUniquePublicProtectedMethods;
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.toPropertyName;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-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.interfacedef.util.JavaXMLMapper;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Heuristically evaluates an un-annotated Java implementation type to determine
- * services, references, and properties according to the algorithm described in
- * the SCA Java Client and Implementation Model Specification <p/> TODO
- * Implement: <p/> When no service interface is annotated, need to calculate a
- * single service comprising all public methods that are not reference or
- * property injection sites. If that service can be exactly mapped to an
- * interface implemented by the class then the service interface will be defined
- * in terms of that interface.
- * 
- * @version $Rev$ $Date$
- */
-public class HeuristicPojoProcessor extends BaseJavaClassVisitor {
-    private JavaInterfaceFactory javaFactory;
-
-    public HeuristicPojoProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-        super(assemblyFactory);
-        this.javaFactory = javaFactory;
-    }
-
-    @Override
-    public <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        List<org.apache.tuscany.sca.assembly.Service> services = type.getServices();
-        if (services.isEmpty()) {
-            // heuristically determine the service
-            /**
-             * The following is quoted from Java Specification 1.2.1.3. Introspecting services offered by a Java implementation
-             * In the cases described below, the services offered by a Java implementation class may be determined
-             * through introspection, eliding the need to specify them using @Service. The following algorithm is used 
-             * to determine how services are introspected from an implementation class:
-             * 
-             * If the interfaces of the SCA services are not specified with the @Service annotation on the 
-             * implementation class, it is assumed that all implemented interfaces that have been annotated 
-             * as @Remotable are the service interfaces provided by the component. If none of the implemented 
-             * interfaces is remotable, then by default the implementation offers a single service whose type 
-             * is the implementation class.
-             */
-            Set<Class> interfaces = getAllInterfaces(clazz);
-            for (Class<?> i : interfaces) {
-                if (i.isAnnotationPresent(Remotable.class)) {
-                    addService(type, i);
-                }
-            }
-            if (services.isEmpty()) {
-                // class is the interface
-                addService(type, clazz);
-            }
-        }
-        Set<Method> methods = getAllUniquePublicProtectedMethods(clazz, false);
-        if (!type.getReferenceMembers().isEmpty() || !type.getPropertyMembers().isEmpty()) {
-            // references and properties have been explicitly defined
-            //            if (type.getServices().isEmpty()) {
-            //                calculateServiceInterface(clazz, type, methods);
-            //                if (type.getServices().isEmpty()) {
-            //                    throw new ServiceTypeNotFoundException(clazz.getName());
-            //                }
-            //            }
-            evaluateConstructor(type, clazz);
-            return;
-        }
-        calcPropRefs(methods, services, type, clazz);
-        evaluateConstructor(type, clazz);
-    }
-
-    private void addService(JavaImplementation type, Class<?> clazz) throws IntrospectionException {
-        try {
-            org.apache.tuscany.sca.assembly.Service service = createService(clazz);
-            type.getServices().add(service);
-        } catch (InvalidInterfaceException e) {
-            throw new IntrospectionException(e);
-        }
-    }
-
-    private boolean isPublicSetter(Method method) {
-        return method.getParameterTypes().length == 1 && Modifier.isPublic(method.getModifiers())
-            && method.getName().startsWith("set")
-            && method.getReturnType() == void.class;
-    }
-
-    private boolean isProtectedSetter(Method method) {
-        return method.getParameterTypes().length == 1 && Modifier.isProtected(method.getModifiers())
-            && method.getName().startsWith("set")
-            && method.getReturnType() == void.class;
-    }
-
-    private <T> void calcPropRefs(Set<Method> methods,
-                                  List<org.apache.tuscany.sca.assembly.Service> services,
-                                  JavaImplementation type,
-                                  Class<T> clazz) throws IntrospectionException {
-        // heuristically determine the properties references
-        // make a first pass through all public methods with one param
-        Set<String> setters = new HashSet<String>();
-        Set<String> others = new HashSet<String>();
-        for (Method method : methods) {
-            if (!isPublicSetter(method)) {
-                continue;
-            }
-            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {
-                // Add the property name as others
-                others.add(toPropertyName(method.getName()));
-                continue;
-            }
-            if (!isInServiceInterface(method, services)) {
-                // Not part of the service interface
-                String name = toPropertyName(method.getName());
-                setters.add(name);
-                // avoid duplicate property or ref names
-                if (!type.getPropertyMembers().containsKey(name) && !type.getReferenceMembers().containsKey(name)) {
-                    Class<?> param = method.getParameterTypes()[0];
-                    Type genericType = method.getGenericParameterTypes()[0];
-                    if (isReferenceType(param, genericType)) {
-                        type.getReferences().add(createReference(name, param));
-                        type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));
-                    } else {
-                        type.getProperties().add(createProperty(name, param));
-                        type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));
-                    }
-                }
-            }
-        }
-        // second pass for protected methods with one param
-        for (Method method : methods) {
-            if (!isProtectedSetter(method)) {
-                continue;
-            }
-            if (method.isAnnotationPresent(Callback.class) || method.isAnnotationPresent(Context.class)) {
-                // Add the property name as others
-                others.add(toPropertyName(method.getName()));
-                continue;
-            }
-            Class<?> param = method.getParameterTypes()[0];
-            String name = toPropertyName(method.getName());
-            setters.add(name);
-            // avoid duplicate property or ref names
-            if (isReferenceType(param, method.getGenericParameterTypes()[0])) {
-                if (!type.getReferenceMembers().containsKey(name)) {
-                    type.getReferences().add(createReference(name, param));
-                    type.getReferenceMembers().put(name, new JavaElementImpl(method, 0));
-                }
-            } else {
-                if (!type.getPropertyMembers().containsKey(name)) {
-                    type.getProperties().add(createProperty(name, param));
-                    type.getPropertyMembers().put(name, new JavaElementImpl(method, 0));
-                }
-            }
-        }
-
-        // Public or protected fields unless there is a public or protected
-        // setter method
-        // for the same name
-        Set<Field> fields = getAllPublicAndProtectedFields(clazz, false);
-        for (Field field : fields) {
-            if (field.isAnnotationPresent(Callback.class) || field.isAnnotationPresent(Context.class)) {
-                continue;
-            }
-            if (setters.contains(field.getName()) || others.contains(field.getName())) {
-                continue;
-            }
-            String name = field.getName();
-            Class<?> paramType = field.getType();
-            if (isReferenceType(paramType, field.getGenericType())) {
-                if (!type.getReferenceMembers().containsKey(name)) {
-                    type.getReferences().add(createReference(name, paramType));
-                    type.getReferenceMembers().put(name, new JavaElementImpl(field));
-                }
-            } else {
-                if (!type.getPropertyMembers().containsKey(name)) {
-                    type.getProperties().add(createProperty(name, paramType));
-                    type.getPropertyMembers().put(name, new JavaElementImpl(field));
-                }
-            }
-        }
-    }
-
-    /**
-     * Determines the constructor to use based on the component type's
-     * references and properties
-     * 
-     * @param type the component type
-     * @param clazz the implementation class corresponding to the component type
-     * @throws NoConstructorException if no suitable constructor is found
-     * @throws AmbiguousConstructorException if the parameters of a constructor
-     *             cannot be unambiguously mapped to references and properties
-     */
-    @SuppressWarnings("unchecked")
-    private <T> void evaluateConstructor(JavaImplementation type, Class<T> clazz) throws IntrospectionException {
-        // determine constructor if one is not annotated
-        JavaConstructorImpl<?> definition = type.getConstructor();
-        Constructor constructor;
-        boolean explict = false;
-        if (definition != null && definition.getConstructor()
-            .isAnnotationPresent(org.osoa.sca.annotations.Constructor.class)) {
-            // the constructor was already defined explicitly
-            return;
-        } else if (definition != null) {
-            explict = true;
-            constructor = definition.getConstructor();
-        } else {
-            // no definition, heuristically determine constructor
-            Constructor[] constructors = clazz.getConstructors();
-            if (constructors.length == 0) {
-                throw new NoConstructorException("No public constructor for class");
-            } else if (constructors.length == 1) {
-                // Only one constructor, take it
-                constructor = constructors[0];
-            } else {
-                // FIXME multiple constructors, none yet done
-                Constructor<T> selected = null;
-                int sites = type.getPropertyMembers().size() + type.getReferenceMembers().size();
-                for (Constructor<T> ctor : constructors) {
-                    if (ctor.getParameterTypes().length == 0) {
-                        selected = ctor;
-                    }
-                    if (ctor.getParameterTypes().length == sites) {
-                        // TODO finish
-                        // selected = constructor;
-                        // select constructor
-                        // break;
-                    }
-                }
-                if (selected == null) {
-                    throw new NoConstructorException();
-                }
-                constructor = selected;
-                definition = type.getConstructors().get(selected);
-                type.setConstructor(definition);
-                // return;
-            }
-            definition = type.getConstructors().get(constructor);
-            type.setConstructor(definition);
-        }
-        JavaParameterImpl[] parameters = definition.getParameters();
-        if (parameters.length == 0) {
-            return;
-        }
-        Map<String, JavaElementImpl> props = type.getPropertyMembers();
-        Map<String, JavaElementImpl> refs = type.getReferenceMembers();
-        Annotation[][] annotations = constructor.getParameterAnnotations();
-        if (!explict) {
-            // the constructor wasn't defined by an annotation, so check to see
-            // if any of the params have an annotation
-            // which we can impute as explicitly defining the constructor, e.g.
-            // @Property, @Reference, or @Autowire
-            explict = injectionAnnotationsPresent(annotations);
-        }
-        if (explict) {
-            for (int i = 0; i < parameters.length; i++) {
-                if (isAnnotated(parameters[i])) {
-                    continue;
-                } else if (!findReferenceOrProperty(parameters[i], props, refs)) {
-                    throw new AmbiguousConstructorException(parameters[i].toString());
-                }
-            }
-        } else {
-            if (!areUnique(parameters)) {
-                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");
-            }
-            if (!calcPropRefUniqueness(props.values(), refs.values())) {
-                throw new AmbiguousConstructorException("Cannot resolve non-unique parameter types, use @Constructor");
-            }
-            if (!(props.isEmpty() && refs.isEmpty())) {
-                calcParamNames(parameters, props, refs);
-            } else {
-                heuristicParamNames(type, parameters);
-
-            }
-        }
-    }
-
-    private void calcParamNames(JavaParameterImpl[] parameters,
-                                Map<String, JavaElementImpl> props,
-                                Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {
-        // the constructor param types must unambiguously match defined
-        // reference or property types
-        for (JavaParameterImpl param : parameters) {
-            if (!findReferenceOrProperty(param, props, refs)) {
-                throw new AmbiguousConstructorException(param.getName());
-            }
-        }
-    }
-
-    private void heuristicParamNames(JavaImplementation type, JavaParameterImpl[] parameters)
-        throws IntrospectionException {
-        // heuristically determine refs and props from the parameter types
-        for (JavaParameterImpl p : parameters) {
-            String name = p.getType().getSimpleName().toLowerCase();
-            if (isReferenceType(p.getType(), p.getGenericType())) {
-                type.getReferences().add(createReference(name, p.getType()));
-                p.setClassifer(Reference.class);
-                type.getReferenceMembers().put(name, p);
-            } else {
-                type.getProperties().add(createProperty(name, p.getType()));
-                p.setClassifer(Property.class);
-                type.getPropertyMembers().put(name, p);
-            }
-            p.setName(name);
-        }
-    }
-
-    private static boolean areUnique(Class[] collection) {
-        Set<Class> set = new HashSet<Class>(Arrays.asList(collection));
-        return set.size() == collection.length;
-    }
-
-    /**
-     * Returns true if the union of the given collections of properties and
-     * references have unique Java types
-     */
-    private boolean calcPropRefUniqueness(Collection<JavaElementImpl> props, Collection<JavaElementImpl> refs) {
-
-        Class[] classes = new Class[props.size() + refs.size()];
-        int i = 0;
-        for (JavaElementImpl property : props) {
-            classes[i] = property.getType();
-            i++;
-        }
-        for (JavaElementImpl reference : refs) {
-            classes[i] = reference.getType();
-            i++;
-        }
-        return areUnique(classes);
-    }
-
-    /**
-     * Unambiguously finds the reference or property associated with the given
-     * type
-     * 
-     * @return the name of the reference or property if found, null if not
-     * @throws AmbiguousConstructorException if the constructor parameter cannot
-     *             be resolved to a property or reference
-     */
-    private boolean findReferenceOrProperty(JavaParameterImpl parameter,
-                                            Map<String, JavaElementImpl> props,
-                                            Map<String, JavaElementImpl> refs) throws AmbiguousConstructorException {
-
-        boolean found = false;
-        if (!"".equals(parameter.getName())) {
-            // Match by name
-            JavaElementImpl prop = props.get(parameter.getName());
-            if (prop != null && prop.getType() == parameter.getType()) {
-                parameter.setClassifer(Property.class);
-                return true;
-            }
-            JavaElementImpl ref = refs.get(parameter.getName());
-            if (ref != null && ref.getType() == parameter.getType()) {
-                parameter.setClassifer(Reference.class);
-                return true;
-            }
-        }
-        for (JavaElementImpl property : props.values()) {
-            if (property.getType() == parameter.getType()) {
-                if (found) {
-                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",
-                                                            (Member)parameter.getAnchor());
-                }
-                parameter.setClassifer(Property.class);
-                parameter.setName(property.getName());
-                found = true;
-                // do not break since ambiguities must be checked, i.e. more
-                // than one prop or ref of the same type
-            }
-        }
-        for (JavaElementImpl reference : refs.values()) {
-            if (reference.getType() == parameter.getType()) {
-                if (found) {
-                    throw new AmbiguousConstructorException("Ambiguous property or reference for constructor type",
-                                                            (Member)parameter.getAnchor());
-                }
-                parameter.setClassifer(Reference.class);
-                parameter.setName(reference.getName());
-                found = true;
-                // do not break since ambiguities must be checked, i.e. more
-                // than one prop or ref of the same type
-            }
-        }
-        return found;
-    }
-
-    /**
-     * Returns true if a given type is reference according to the SCA
-     * specification rules for determining reference types The following rules
-     * are used to determine whether an unannotated field or setter method is a
-     * property or reference:
-     * <ol>
-     * <li>If its type is simple, then it is a property.
-     * <li>If its type is complex, then if the type is an interface marked by
-     * 
-     * @Remotable, then it is a reference; otherwise, it is a property.
-     *             <li>Otherwise, if the type associated with the member is an
-     *             array or a java.util.Collection, the basetype is the element
-     *             type of the array or the parameterized type of the
-     *             Collection; otherwise the basetype is the member type. If the
-     *             basetype is an interface with an
-     * @Remotable or
-     * @Service annotation then the member is defined as a reference. Otherwise,
-     *          it is defined as a property.
-     *          </ol>
-     *          <p>
-     *          The name of the reference or of the property is derived from the
-     *          name found on the setter method or on the field.
-     */
-    private boolean isReferenceType(Class<?> cls, Type genericType) {
-        Class<?> baseType = JavaIntrospectionHelper.getBaseType(cls, genericType);
-        return baseType.isInterface() && baseType.isAnnotationPresent(Remotable.class);
-    }
-
-    /**
-     * Returns true if the given operation is defined in the collection of
-     * service interfaces
-     */
-    private boolean isInServiceInterface(Method operation, List<org.apache.tuscany.sca.assembly.Service> services) {
-        for (org.apache.tuscany.sca.assembly.Service service : services) {
-            Interface interface1 = service.getInterfaceContract().getInterface();
-            if (interface1 instanceof JavaInterface) {
-                Class<?> clazz = ((JavaInterface)interface1).getJavaClass();
-                if (isMethodMatched(clazz, operation)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Test if the class declares a method which matches the signature of the
-     * given method
-     * 
-     * @param clazz
-     * @param method
-     * @return
-     */
-    private boolean isMethodMatched(Class<?> clazz, Method method) {
-        if (method.getDeclaringClass() == clazz) {
-            return true;
-        }
-        Method[] methods = clazz.getMethods();
-        for (Method m : methods) {
-            if (JavaIntrospectionHelper.exactMethodMatch(method, m)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Creates a mapped property.
-     * 
-     * @param name the property name
-     * @param paramType the property type
-     */
-    private org.apache.tuscany.sca.assembly.Property createProperty(String name, Class<?> paramType) {
-        org.apache.tuscany.sca.assembly.Property property = assemblyFactory.createProperty();
-        property.setName(name);
-        property.setXSDType(JavaXMLMapper.getXMLType(paramType));
-        return property;
-    }
-
-    private boolean isAnnotated(JavaParameterImpl parameter) {
-        for (Annotation annotation : parameter.getAnnotations()) {
-            Class<? extends Annotation> annotType = annotation.annotationType();
-            if (annotType.equals(Property.class) || annotType.equals(Reference.class)
-                || annotType.equals(Resource.class)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean areUnique(JavaParameterImpl[] parameters) {
-        Set<Class> set = new HashSet<Class>(parameters.length);
-        for (JavaParameterImpl p : parameters) {
-            if (!set.add(p.getType())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public org.apache.tuscany.sca.assembly.Reference createReference(String name, Class<?> paramType)
-        throws IntrospectionException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        reference.setName(name);
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-        try {
-            JavaInterface callInterface = javaFactory.createJavaInterface(paramType);
-            reference.getInterfaceContract().setInterface(callInterface);
-            if (callInterface.getCallbackClass() != null) {
-                JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-            }
-            reference.setMultiplicity(Multiplicity.ZERO_ONE);
-        } catch (InvalidInterfaceException e1) {
-            throw new IntrospectionException(e1);
-        }
-        try {
-            processCallback(paramType, reference);
-        } catch (InvalidServiceType e) {
-            throw new IntrospectionException(e);
-        }
-        return reference;
-    }
-
-    public org.apache.tuscany.sca.assembly.Service createService(Class<?> interfaze) throws InvalidInterfaceException {
-        org.apache.tuscany.sca.assembly.Service service = assemblyFactory.createService();
-        service.setName(interfaze.getSimpleName());
-
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        JavaInterface callInterface = javaFactory.createJavaInterface(interfaze);
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            service.getInterfaceContract().setCallbackInterface(callbackInterface);
-        }
-
-        Interface javaInterface = service.getInterfaceContract().getInterface();
-        javaInterface.setRemotable(interfaze.getAnnotation(Remotable.class) != null);
-        service.getInterfaceContract().setInterface(javaInterface);
-        return service;
-    }
-
-    public void processCallback(Class<?> interfaze, Contract contract) throws InvalidServiceType {
-        Callback callback = interfaze.getAnnotation(Callback.class);
-        if (callback != null && !Void.class.equals(callback.value())) {
-            Class<?> callbackClass = callback.value();
-            JavaInterface javaInterface = javaFactory.createJavaInterface();
-            javaInterface.setJavaClass(callbackClass);
-            contract.getInterfaceContract().setCallbackInterface(javaInterface);
-        } else if (callback != null && Void.class.equals(callback.value())) {
-            throw new InvalidServiceType("No callback interface specified on annotation", interfaze);
-        }
-    }
-
-    public boolean injectionAnnotationsPresent(Annotation[][] annots) {
-        for (Annotation[] annotations : annots) {
-            for (Annotation annotation : annotations) {
-                Class<? extends Annotation> annotType = annotation.annotationType();
-                if (annotType.equals(Property.class) || annotType.equals(Reference.class)
-                    || annotType.equals(Resource.class)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
deleted file mode 100644
index 9fe2fcd468..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal use of {@link org.osoa.sca.annotations.Callback} on a reference
- *
- * @version $Rev$ $Date$
- */
-public class IllegalCallbackReferenceException extends IntrospectionException {
-    private static final long serialVersionUID = -8932525723147700591L;
-
-    public IllegalCallbackReferenceException(String message) {
-        super(message);
-    }
-    
-    public IllegalCallbackReferenceException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
deleted file mode 100644
index f5696122df..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Context}
- *
- * @version $Rev$ $Date$
- */
-public class IllegalContextException extends IntrospectionException {
-    private static final long serialVersionUID = -6946383136750117008L;
-
-    public IllegalContextException(String message) {
-        super(message);
-    }
-
-    public IllegalContextException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
deleted file mode 100644
index 6a0d60c92f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal signature for a method decorated with {@link org.osoa.sca.annotations.Destroy}
- *
- * @version $Rev$ $Date$
- */
-public class IllegalDestructorException extends IntrospectionException {
-    private static final long serialVersionUID = 365719353107446326L;
-
-    public IllegalDestructorException(String message) {
-        super(message);
-    }
-    
-    public IllegalDestructorException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
deleted file mode 100644
index 8f50852c2d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal signature for a method decorated with {@link @org.osoa.sca.annotations.Init}
- *
- * @version $Rev$ $Date$
- */
-public class IllegalInitException extends IntrospectionException {
-    private static final long serialVersionUID = -3690763271986854701L;
-
-    public IllegalInitException(String message) {
-        super(message);
-    }
-
-    public IllegalInitException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
deleted file mode 100644
index 54f7dfad1e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal property definition in a component type
- * 
- * @version $Rev$ $Date$
- */
-public class IllegalPropertyException extends IntrospectionException {
-    private static final long serialVersionUID = -2836849110706758494L;
-
-    public IllegalPropertyException(String message) {
-        super(message);
-    }
-    
-    public IllegalPropertyException(String message, Member member) {
-        super(message, member);
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
deleted file mode 100644
index 25196c56e5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal reference definition in a component type
- *
- * @version $Rev$ $Date$
- */
-public class IllegalReferenceException extends IntrospectionException {
-    private static final long serialVersionUID = 4612984122225271395L;
-
-    public IllegalReferenceException(String message) {
-        super(message);
-    }
-    
-    public IllegalReferenceException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
deleted file mode 100644
index ccfbaf0043..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal resource definition in a component type
- *
- * @version $Rev$ $Date$
- */
-public class IllegalResourceException extends IntrospectionException {
-    private static final long serialVersionUID = -1100936539412435579L;
-
-    public IllegalResourceException(String message) {
-        super(message);
-    }
-    
-    public IllegalResourceException(String message, Member member) {
-        super(message, member);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
deleted file mode 100644
index e130f4221d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an illegal use of the {@link @org.osoa.sca.annotations.Service} annotation
- *
- * @version $Rev$ $Date$
- */
-public class IllegalServiceDefinitionException extends IntrospectionException {
-    private static final long serialVersionUID = -7151534258405092548L;
-
-    public IllegalServiceDefinitionException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
deleted file mode 100644
index 583ccc86cd..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.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.java.introspect.impl;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.osoa.sca.annotations.Init;
-
-/**
- * Processes the {@link @Init} annotation on a component implementation and
- * updates the component type with the decorated initializer method
- * 
- * @version $Rev$ $Date$
- */
-public class InitProcessor extends BaseJavaClassVisitor {
-    
-    public InitProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        Init annotation = method.getAnnotation(Init.class);
-        if (annotation == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 0) {
-            throw new IllegalInitException("Initializer must not have argments", method);
-        }
-        if(!method.getReturnType().equals(void.class)) {
-            throw new IllegalInitException("Initializer must return void.", method);
-        }
-        if (type.getInitMethod() != null) {
-            throw new DuplicateInitException("More than one initializer found on implementaton");
-        }
-        if (!Modifier.isPublic(method.getModifiers())) {
-            throw new IllegalInitException("Initializer must be a public method. Invalid annotation @Init found on "+method);
-        }
-        type.setInitMethod(method);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
deleted file mode 100644
index 91b97b2caf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.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.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an invalid constructor definition, e.g. when the number of injection names specified in {@link
- * org.osoa.sca.annotations.Constructor} do not match the number of actual constructor parameters
- *
- * @version $Rev$ $Date$
- */
-public class InvalidConstructorException extends IntrospectionException {
-    private static final long serialVersionUID = 1411492435210741512L;
-
-    public InvalidConstructorException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
deleted file mode 100644
index a1e1d01ab3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Raised when an implementation specifies improper conversational metadata
- *
- * @version $Rev$ $Date$
- */
-public class InvalidConversationalImplementation extends IntrospectionException {
-    private static final long serialVersionUID = -5487291552769408149L;
-
-    public InvalidConversationalImplementation(String message) {
-        super(message);
-    }
-
-    public InvalidConversationalImplementation(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
deleted file mode 100644
index 976b4da120..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an invalid usage of {@link org.osoa.sca.annotations.Property}
- *
- * @version $Rev$ $Date$
- */
-public class InvalidPropertyException extends IntrospectionException {
-    private static final long serialVersionUID = -2682862652069727948L;
-
-    public InvalidPropertyException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
deleted file mode 100644
index e77a6beb0d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an invalid usage of {@link org.osoa.sca.annotations.Reference}
- *
- * @version $Rev$ $Date$
- */
-public class InvalidReferenceException extends IntrospectionException {
-    private static final long serialVersionUID = -3285246635989254165L;
-
-    public InvalidReferenceException(String message) {
-        super(message);
-    }
-
-    public InvalidReferenceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InvalidReferenceException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
deleted file mode 100644
index debb5cbacc..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.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.java.introspect.impl;
-
-import java.lang.reflect.Member;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Denotes an invalid usage of {@link @org.apache.tuscany.api.annotation.Resource}
- *
- * @version $Rev$ $Date$
- */
-public class InvalidResourceException extends IntrospectionException {
-    private static final long serialVersionUID = 511728001735534934L;
-
-    public InvalidResourceException(String message) {
-        super(message);
-    }
-    
-    public InvalidResourceException(String message, Member member) {
-        super(message, member);
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
deleted file mode 100644
index 7147da55b4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when a service type specified by an {@link org.osoa.sca.annotations.Service} annotation is invalid, e.g. it is
- * not an interface
- *
- * @version $Rev$ $Date$
- */
-public class InvalidServiceType extends IntrospectionException {
-    private static final long serialVersionUID = -1076466639416644386L;
-    private Class<?> serviceType;
-
-    public InvalidServiceType(String message) {
-        super(message);
-    }
-    
-    public InvalidServiceType(String message, Class<?> clazz) {
-        super(message);
-        this.serviceType = clazz;
-    }
-
-    /**
-     * @return the serviceType
-     */
-    public Class<?> getServiceType() {
-        return serviceType;
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
deleted file mode 100644
index 6039bd91f8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.introspect.impl;
-
-import java.beans.Introspector;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import org.osoa.sca.CallableReference;
-
-/**
- * Implements various reflection-related operations
- * 
- * @version $Rev$ $Date$
- */
-public final class JavaIntrospectionHelper {
-    private static final Logger logger = Logger.getLogger(JavaIntrospectionHelper.class.getName());
-    private static final Class[] EMPTY_CLASS_ARRY = new Class[0];
-
-    /**
-     * Hide the constructor
-     */
-    private JavaIntrospectionHelper() {
-    }
-
-    /**
-     * Returns a collection of public, and protected fields declared by a class
-     * or one of its supertypes
-     */
-    public static Set<Field> getAllPublicAndProtectedFields(Class clazz, boolean validating) {
-        return getAllPublicAndProtectedFields(clazz, new HashSet<Field>(), validating);
-    }
-
-    private static void checkInvalidAnnotations(AnnotatedElement element) {
-        for (Annotation a : element.getAnnotations()) {
-            if (a.annotationType().getName().startsWith("org.osoa.sca.annotations.")) {
-                logger.warning("Invalid annotation " + a + " is found on " + element);
-            }
-        }
-    }
-
-    /**
-     * Recursively evaluates the type hierarchy to return all fields that are
-     * public or protected
-     */
-    private static Set<Field> getAllPublicAndProtectedFields(Class clazz, Set<Field> fields, boolean validating) {
-        if (clazz == null || clazz.isArray() || Object.class.equals(clazz)) {
-            return fields;
-        }
-        fields = getAllPublicAndProtectedFields(clazz.getSuperclass(), fields, validating);
-        Field[] declaredFields = clazz.getDeclaredFields();
-        for (final Field field : declaredFields) {
-            int modifiers = field.getModifiers();
-            if ((Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers)) && !Modifier.isStatic(modifiers)) {
-                // Allow privileged access to set accessibility. Requires ReflectPermission
-                // in security policy.
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        field.setAccessible(true); // ignore Java accessibility
-                        return null;
-                    }
-                });
-                fields.add(field);
-            } else {
-                if (validating) {
-                    checkInvalidAnnotations(field);
-                }
-            }
-        }
-        return fields;
-    }
-
-    /**
-     * Returns a collection of public and protected methods declared by a class
-     * or one of its supertypes. Note that overridden methods will not be
-     * returned in the collection (i.e. only the method override will be). <p/>
-     * This method can potentially be expensive as reflection information is not
-     * cached. It is assumed that this method will be used during a
-     * configuration phase.
-     */
-    public static Set<Method> getAllUniquePublicProtectedMethods(Class clazz, boolean validating) {
-        return getAllUniqueMethods(clazz, new HashSet<Method>(), validating);
-    }
-
-    /**
-     * Recursively evaluates the type hierarchy to return all unique methods
-     */
-    private static Set<Method> getAllUniqueMethods(Class pClass, Set<Method> methods, boolean validating) {
-        if (pClass == null || pClass.isArray() || Object.class.equals(pClass)) {
-            return methods;
-        }
-        // we first evaluate methods of the subclass and then move to the parent
-        Method[] declaredMethods = pClass.getDeclaredMethods();
-        for (final Method declaredMethod : declaredMethods) {
-            int modifiers = declaredMethod.getModifiers();
-            if ((!Modifier.isPublic(modifiers) && !Modifier.isProtected(modifiers)) || Modifier.isStatic(modifiers)) {
-                if (validating) {
-                    checkInvalidAnnotations(declaredMethod);
-                }
-                continue;
-            }
-            if (methods.size() == 0) {
-                methods.add(declaredMethod);
-            } else {
-                List<Method> temp = new ArrayList<Method>();
-                boolean matched = false;
-                for (Method method : methods) {
-                    // only add if not already in the set from a superclass (i.e.
-                    // the method is not overridden)
-                    if (exactMethodMatch(declaredMethod, method)) {
-                        matched = true;
-                        break;
-                    }
-                }
-                if (!matched) {
-                    // Allow privileged access to set accessibility. Requires ReflectPermission
-                    // in security policy.
-                    AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                        public Object run() {
-                            declaredMethod.setAccessible(true);
-                            return null;
-                        }
-                    });
-                    temp.add(declaredMethod);
-                }
-                methods.addAll(temp);
-                temp.clear();
-            }
-        }
-        // evaluate class hierarchy - this is done last to track inherited
-        // methods
-        methods = getAllUniqueMethods(pClass.getSuperclass(), methods, validating);
-        return methods;
-    }
-
-    /**
-     * Finds the closest matching field with the given name, that is, a field of
-     * the exact specified type or, alternately, of a supertype.
-     * 
-     * @param name the name of the field
-     * @param type the field type
-     * @param fields the collection of fields to search
-     * @return the matching field or null if not found
-     */
-    public static Field findClosestMatchingField(String name, Class type, Set<Field> fields) {
-        Field candidate = null;
-        for (Field field : fields) {
-            if (field.getName().equals(name)) {
-                if (field.getType().equals(type)) {
-                    return field; // exact match
-                } else if (field.getType().isAssignableFrom(type) || (field.getType().isPrimitive() && primitiveAssignable(field
-                                                                                                                               .getType(),
-                                                                                                                           type))) {
-                    // We could have the situation where a field parameter is a
-                    // primitive and the demarshalled value is
-                    // an object counterpart (e.g. Integer and int)
-                    // @spec issue
-                    // either an interface or super class, so keep a reference
-                    // until
-                    // we know there are no closer types
-                    candidate = field;
-                }
-            }
-        }
-        if (candidate != null) {
-            return candidate;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Finds the closest matching method with the given name, that is, a method
-     * taking the exact parameter types or, alternately, parameter supertypes.
-     * 
-     * @param name the name of the method
-     * @param types the method parameter types
-     * @param methods the collection of methods to search
-     * @return the matching method or null if not found
-     */
-    public static Method findClosestMatchingMethod(String name, Class[] types, Set<Method> methods) {
-        if (types == null) {
-            types = EMPTY_CLASS_ARRY;
-        }
-        Method candidate = null;
-        for (Method method : methods) {
-            if (method.getName().equals(name) && method.getParameterTypes().length == types.length) {
-                Class<?>[] params = method.getParameterTypes();
-                boolean disqualify = false;
-                boolean exactMatch = true;
-                for (int i = 0; i < params.length; i++) {
-                    if (!params[i].equals(types[i]) && !params[i].isAssignableFrom(types[i])) {
-                        // no match
-                        disqualify = true;
-                        exactMatch = false;
-                        break;
-                    } else if (!params[i].equals(types[i]) && params[i].isAssignableFrom(types[i])) {
-                        // not exact match
-                        exactMatch = false;
-                    }
-                }
-                if (disqualify) {
-                    continue;
-                } else if (exactMatch) {
-                    return method;
-                } else {
-                    candidate = method;
-                }
-            }
-        }
-        if (candidate != null) {
-            return candidate;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Determines if two methods "match" - that is, they have the same method
-     * names and exact parameter types (one is not a supertype of the other)
-     */
-    public static boolean exactMethodMatch(Method method1, Method method2) {
-        if (!method1.getName().equals(method2.getName())) {
-            return false;
-        }
-        Class<?>[] types1 = method1.getParameterTypes();
-        Class<?>[] types2 = method2.getParameterTypes();
-        if (types1.length != types2.length) {
-            return false;
-        }
-        boolean matched = true;
-        for (int i = 0; i < types1.length; i++) {
-            if (types1[i] != types2[i]) {
-                matched = false;
-                break;
-            }
-        }
-        return matched;
-    }
-
-    public static <T> Constructor<T> getDefaultConstructor(Class<T> clazz) throws NoSuchMethodException {
-        return clazz.getConstructor((Class[])null);
-    }
-
-    /**
-     * Returns the simple name of a class - i.e. the class name devoid of its
-     * package qualifier
-     * 
-     * @param implClass the implementation class
-     */
-    public static String getBaseName(Class<?> implClass) {
-        return implClass.getSimpleName();
-    }
-
-    public static boolean isImmutable(Class clazz) {
-        return String.class == clazz || clazz.isPrimitive()
-            || Number.class.isAssignableFrom(clazz)
-            || Boolean.class.isAssignableFrom(clazz)
-            || Character.class.isAssignableFrom(clazz)
-            || Byte.class.isAssignableFrom(clazz);
-    }
-
-    /**
-     * Takes a property name and converts it to a getter method name according
-     * to JavaBean conventions. For example, property
-     * <code>foo<code> is returned as <code>getFoo</code>
-     */
-    public static String toGetter(String name) {
-        return "get" + name.toUpperCase().substring(0, 1) + name.substring(1);
-    }
-
-    /**
-     * Takes a setter or getter method name and converts it to a property name
-     * according to JavaBean conventions. For example, <code>setFoo(var)</code>
-     * is returned as property <code>foo<code>
-     */
-    public static String toPropertyName(String name) {
-        if (!name.startsWith("set")) {
-            return name;
-        }
-        return Introspector.decapitalize(name.substring(3));
-    }
-
-    public static Class<?> getErasure(Type type) {
-        if (type instanceof Class) {
-            return (Class)type;
-        } else if (type instanceof GenericArrayType) {
-            // FIXME: How to deal with the []?
-            GenericArrayType arrayType = (GenericArrayType)type;
-            return getErasure(arrayType.getGenericComponentType());
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType pType = (ParameterizedType)type;
-            return getErasure(pType.getRawType());
-        } else if (type instanceof WildcardType) {
-            WildcardType wType = (WildcardType)type;
-            Type[] types = wType.getUpperBounds();
-            return getErasure(types[0]);
-        } else if (type instanceof TypeVariable) {
-            TypeVariable var = (TypeVariable)type;
-            Type[] types = var.getBounds();
-            return getErasure(types[0]);
-        }
-        return null;
-    }
-
-    public static Class<?> getBaseType(Class<?> cls, Type genericType) {
-        if (cls.isArray()) {
-            return cls.getComponentType();
-        } else if (Collection.class.isAssignableFrom(cls)) {
-            if (genericType instanceof ParameterizedType) {
-                // Collection<BaseType>
-                ParameterizedType parameterizedType = (ParameterizedType)genericType;
-                Type baseType = parameterizedType.getActualTypeArguments()[0];
-                if (baseType instanceof GenericArrayType) {
-                    // Base is array
-                    return cls;
-                } else {
-                    return getErasure(baseType);
-                }
-            } else {
-                return cls;
-            }
-        } else {
-            return cls;
-        }
-    }
-
-    public static Type getParameterType(Type type) {
-        if (type instanceof ParameterizedType) {
-            // Collection<BaseType>
-            ParameterizedType parameterizedType = (ParameterizedType)type;
-            Type baseType = parameterizedType.getActualTypeArguments()[0];
-            return baseType;
-        } else {
-            return Object.class;
-        }
-    }
-
-    public static Class<?> getBusinessInterface(Class<?> cls, Type callableReferenceType) {
-        if (CallableReference.class.isAssignableFrom(cls) && callableReferenceType instanceof ParameterizedType) {
-            // Collection<BaseType>
-            ParameterizedType parameterizedType = (ParameterizedType)callableReferenceType;
-            Type baseType = parameterizedType.getActualTypeArguments()[0];
-            if (baseType instanceof GenericArrayType) {
-                // Base is array
-                return cls;
-            } else {
-                return getErasure(baseType);
-            }
-        }
-        return Object.class;
-    }
-
-    /**
-     * Takes a property name and converts it to a setter method name according
-     * to JavaBean conventions. For example, the property
-     * <code>foo<code> is returned as <code>setFoo(var)</code>
-     */
-    public static String toSetter(String name) {
-        return "set" + name.toUpperCase().substring(0, 1) + name.substring(1);
-    }
-
-    /**
-     * Compares a two types, assuming one is a primitive, to determine if the
-     * other is its object counterpart
-     */
-    private static boolean primitiveAssignable(Class memberType, Class param) {
-        if (memberType == Integer.class) {
-            return param == Integer.TYPE;
-        } else if (memberType == Double.class) {
-            return param == Double.TYPE;
-        } else if (memberType == Float.class) {
-            return param == Float.TYPE;
-        } else if (memberType == Short.class) {
-            return param == Short.TYPE;
-        } else if (memberType == Character.class) {
-            return param == Character.TYPE;
-        } else if (memberType == Boolean.class) {
-            return param == Boolean.TYPE;
-        } else if (memberType == Byte.class) {
-            return param == Byte.TYPE;
-        } else if (param == Integer.class) {
-            return memberType == Integer.TYPE;
-        } else if (param == Double.class) {
-            return memberType == Double.TYPE;
-        } else if (param == Float.class) {
-            return memberType == Float.TYPE;
-        } else if (param == Short.class) {
-            return memberType == Short.TYPE;
-        } else if (param == Character.class) {
-            return memberType == Character.TYPE;
-        } else if (param == Boolean.class) {
-            return memberType == Boolean.TYPE;
-        } else if (param == Byte.class) {
-            return memberType == Byte.TYPE;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the generic types represented in the given type. Usage as
-     * follows: <code>
-     * JavaIntrospectionHelper.getGenerics(field.getGenericType());
-     * <p/>
-     * JavaIntrospectionHelper.getGenerics(m.getGenericParameterTypes()[0];); </code>
-     * 
-     * @return the generic types in order of declaration or an empty array if
-     *         the type is not genericized
-     */
-    public static List<? extends Type> getGenerics(Type genericType) {
-        List<Type> classes = new ArrayList<Type>();
-        if (genericType instanceof ParameterizedType) {
-            ParameterizedType ptype = (ParameterizedType)genericType;
-            // get the type arguments
-            Type[] targs = ptype.getActualTypeArguments();
-            for (Type targ : targs) {
-                classes.add(targ);
-            }
-        }
-        return classes;
-    }
-
-    /**
-     * Returns the generic type specified by the class at the given position as
-     * in: <p/> <code> public class Foo<Bar,Baz>{ //.. }
-     * <p/>
-     * JavaIntrospectionHelper.introspectGeneric(Foo.class,1); <code>
-     * <p/>
-     * will return Baz.
-     */
-    public static Class introspectGeneric(Class<?> clazz, int pos) {
-        assert clazz != null : "No class specified";
-        Type type = clazz.getGenericSuperclass();
-        if (type instanceof ParameterizedType) {
-            Type[] args = ((ParameterizedType)type).getActualTypeArguments();
-            if (args.length <= pos) {
-                throw new IllegalArgumentException("Invalid index value for generic class " + clazz.getName());
-            }
-            return (Class)((ParameterizedType)type).getActualTypeArguments()[pos];
-        } else {
-            Type[] interfaces = clazz.getGenericInterfaces();
-            for (Type itype : interfaces) {
-                if (!(itype instanceof ParameterizedType)) {
-                    continue;
-                }
-                ParameterizedType interfaceType = (ParameterizedType)itype;
-                return (Class)interfaceType.getActualTypeArguments()[0];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the set of interfaces implemented by the given class and its
-     * ancestors or a blank set if none
-     */
-    public static Set<Class> getAllInterfaces(Class clazz) {
-        Set<Class> implemented = new HashSet<Class>();
-        getAllInterfaces(clazz, implemented);
-        return implemented;
-    }
-
-    private static void getAllInterfaces(Class clazz, Set<Class> implemented) {
-        Class[] interfaces = clazz.getInterfaces();
-        for (Class interfaze : interfaces) {
-            implemented.add(interfaze);
-        }
-        Class<?> superClass = clazz.getSuperclass();
-        // Object has no superclass so check for null
-        if (superClass != null && !superClass.equals(Object.class)) {
-            getAllInterfaces(superClass, implemented);
-        }
-    }
-
-    public static boolean isSetter(Method method) {
-        return (void.class == method.getReturnType() && method.getParameterTypes().length == 1 && method.getName()
-            .startsWith("set"));
-    }
-
-    public static boolean isGetter(Method method) {
-        return (void.class != method.getReturnType() && method.getParameterTypes().length == 0 && method.getName()
-            .startsWith("get"));
-    }
-
-    private final static Map<Class, String> signatures = new HashMap<Class, String>();
-    static {
-        signatures.put(boolean.class, "Z");
-        signatures.put(byte.class, "B");
-        signatures.put(char.class, "C");
-        signatures.put(short.class, "S");
-        signatures.put(int.class, "I");
-        signatures.put(long.class, "J");
-        signatures.put(float.class, "F");
-        signatures.put(double.class, "D");
-    };
-
-    public static String getSignature(Class<?> cls) {
-        if (cls.isPrimitive()) {
-            return signatures.get(cls);
-        }
-        if (cls.isArray()) {
-            return "[" + getSignature(cls.getComponentType());
-        }
-        return "L" + cls.getName().replace('.', '/') + ";";
-    }
-
-    public static Class<?> getArrayType(Class<?> componentType, int dims) throws ClassNotFoundException {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < dims; i++) {
-            buf.append('[');
-        }
-        buf.append(getSignature(componentType));
-        return Class.forName(buf.toString(), false, componentType.getClassLoader());
-    }
-
-    public static Set<Method> getPrivateMethods(Class clazz) {
-        Set<Method> methods = new HashSet<Method>();
-        Method[] declaredMethods = clazz.getDeclaredMethods();
-        for (final Method declaredMethod : declaredMethods) {
-            int modifiers = declaredMethod.getModifiers();
-            if(Modifier.isPrivate(modifiers)) {
-                methods.add(declaredMethod);
-            }
-        }
-        
-        return methods;
-    }
-
-    public static Set<Field> getPrivateFields(Class clazz) {
-        Set<Field> fields = new HashSet<Field>();
-        Field[] declaredFields = clazz.getDeclaredFields();
-        for (final Field declaredField : declaredFields) {
-            int modifiers = declaredField.getModifiers();
-            if(Modifier.isPrivate(modifiers)) {
-                fields.add(declaredField);
-            }
-        }
-        
-        return fields;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
deleted file mode 100644
index 453cfa35fe..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when a suitable constructor for a component implementation cannot be found
- *
- * @version $Rev$ $Date$
- */
-public class NoConstructorException extends IntrospectionException {
-    private static final long serialVersionUID = 3086706387280694424L;
-    
-    public NoConstructorException() {
-    }
-    
-    public NoConstructorException(String message) {
-       super(message);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
deleted file mode 100644
index 954a3abbc8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.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.
- */
-package org.apache.tuscany.sca.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-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.osoa.sca.annotations.PolicySets;
-import org.osoa.sca.annotations.Requires;
-
-/**
- * Processes an {@link org.osoa.sca.annotations.Requires} annotation
- *
- * @version $Rev$ $Date$
- */
-public class PolicyProcessor extends BaseJavaClassVisitor {
-    
-    private PolicyFactory policyFactory;
-
-    public PolicyProcessor(AssemblyFactory assemblyFactory, PolicyFactory policyFactory) {
-        super(assemblyFactory);
-        this.policyFactory = policyFactory;
-    }
-
-    private QName getQName(String intentName) {
-        QName qname;
-        if (intentName.startsWith("{")) {
-            int i = intentName.indexOf('}');
-            if (i != -1) {
-                qname = new QName(intentName.substring(1, i), intentName.substring(i + 1));
-            } else {
-                qname = new QName("", intentName);
-            }
-        } else {
-            qname = new QName("", intentName);
-        }
-        return qname;
-    }
-
-    /**
-     * Read policy intents on the given interface or class 
-     * @param clazz
-     * @param requiredIntents
-     */
-    private void readIntentsAndPolicySets(Class<?> clazz, 
-                                          List<Intent> requiredIntents, 
-                                          List<PolicySet> policySets) {
-        Requires intentAnnotation = clazz.getAnnotation(Requires.class);
-        if (intentAnnotation != null) {
-            String[] intentNames = intentAnnotation.value();
-            if (intentNames.length != 0) {
-                for (String intentName : intentNames) {
-
-                    // Add each intent to the list
-                    Intent intent = policyFactory.createIntent();
-                    intent.setName(getQName(intentName));
-                    requiredIntents.add(intent);
-                }
-            }
-        }
-        
-        PolicySets policySetAnnotation = clazz.getAnnotation(PolicySets.class);
-        if (policySetAnnotation != null) {
-            String[] policySetNames = policySetAnnotation.value();
-            if (policySetNames.length != 0) {
-                for (String policySetName : policySetNames) {
-
-                    // Add each intent to the list
-                    PolicySet policySet = policyFactory.createPolicySet();
-                    policySet.setName(getQName(policySetName));
-                    policySets.add(policySet);
-                }
-            }
-        }
-    }
-    
-    private void readIntents(Requires intentAnnotation, List<Intent> requiredIntents) {
-        //Requires intentAnnotation = method.getAnnotation(Requires.class);
-        if (intentAnnotation != null) {
-            String[] intentNames = intentAnnotation.value();
-            if (intentNames.length != 0) {
-                //Operation operation = assemblyFactory.createOperation();
-                //operation.setName(method.getName());
-                //operation.setUnresolved(true);
-                for (String intentName : intentNames) {
-
-                    // Add each intent to the list, associated with the
-                    // operation corresponding to the annotated method
-                    Intent intent = policyFactory.createIntent();
-                    intent.setName(getQName(intentName));
-                    //intent.getOperations().add(operation);
-                    requiredIntents.add(intent);
-                }
-            }
-        }
-    }
-    
-    private void readPolicySets(PolicySets policySetAnnotation, List<PolicySet> policySets) {
-        if (policySetAnnotation != null) {
-            String[] policySetNames = policySetAnnotation.value();
-            if (policySetNames.length != 0) {
-                //Operation operation = assemblyFactory.createOperation();
-                //operation.setName(method.getName());
-                //operation.setUnresolved(true);
-                for (String policySetName : policySetNames) {
-                    // Add each intent to the list, associated with the
-                    // operation corresponding to the annotated method
-                    PolicySet policySet = policyFactory.createPolicySet();
-                    policySet.setName(getQName(policySetName));
-                    //intent.getOperations().add(operation);
-                    policySets.add(policySet);
-                }
-            }
-        }
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        
-        // Read intents on the Java implementation class
-        if ( type instanceof PolicySetAttachPoint ) {
-            readIntentsAndPolicySets(clazz, 
-                                     ((PolicySetAttachPoint)type).getRequiredIntents(),
-                                     ((PolicySetAttachPoint)type).getPolicySets());
-        }
-        
-        // Process annotations on the service interfaces
-        //TODO This will have to move to a JavaInterface introspector later
-        for (Service service: type.getServices()) {
-            InterfaceContract interfaceContract = service.getInterfaceContract();
-            if (interfaceContract instanceof JavaInterfaceContract) {
-                JavaInterfaceContract javaInterfaceContract = (JavaInterfaceContract)interfaceContract;
-
-                // Read intents on the service interface
-                if (javaInterfaceContract.getInterface() != null) {
-                    JavaInterface javaInterface = (JavaInterface)javaInterfaceContract.getInterface();
-                    if (javaInterface.getJavaClass() != null) {
-                        readIntentsAndPolicySets(javaInterface.getJavaClass(), 
-                                                 service.getRequiredIntents(),
-                                                 service.getPolicySets());
-
-                        // Read intents on the service interface methods 
-                        Method[] methods = javaInterface.getJavaClass().getMethods();
-                        ConfiguredOperation confOp = null;
-                        for (Method method: methods) {
-                            if ( method.getAnnotation(Requires.class) != null  ||    
-                                method.getAnnotation(PolicySets.class) != null ) {
-                                confOp = assemblyFactory.createConfiguredOperation();
-                                confOp.setName(method.getName());
-                                confOp.setContractName(service.getName());
-                            
-                                service.getConfiguredOperations().add(confOp);
-                                readIntents(method.getAnnotation(Requires.class), confOp.getRequiredIntents());
-                                readPolicySets(method.getAnnotation(PolicySets.class), confOp.getPolicySets());
-                            }
-                        }
-                    }
-                    
-                }
-                
-                // Read intents on the callback interface 
-                if (javaInterfaceContract.getCallbackInterface() != null) {
-                    JavaInterface javaCallbackInterface = (JavaInterface)javaInterfaceContract.getCallbackInterface();
-                    if (javaCallbackInterface.getJavaClass() != null) {
-                        Callback callback = service.getCallback();
-                        if (callback == null) {
-                            callback = assemblyFactory.createCallback();
-                            service.setCallback(callback);
-                        }
-                        readIntentsAndPolicySets(javaCallbackInterface.getJavaClass(), 
-                                                 callback.getRequiredIntents(),
-                                                 callback.getPolicySets());
-
-                        // Read intents on the callback interface methods 
-                        Method[] methods = javaCallbackInterface.getJavaClass().getMethods();
-                        ConfiguredOperation confOp = null;
-                        for (Method method: methods) {
-                            confOp = assemblyFactory.createConfiguredOperation();
-                            confOp.setName(method.getName());
-                            callback.getConfiguredOperations().add(confOp);
-                            readIntents(method.getAnnotation(Requires.class), confOp.getRequiredIntents());
-                            readPolicySets(method.getAnnotation(PolicySets.class), confOp.getPolicySets());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private Reference getReference(Method method, JavaImplementation type) {
-        //since the ReferenceProcessor is called ahead of the PolicyProcessor the type should have
-        //picked up the reference setter method
-        org.osoa.sca.annotations.Reference annotation = 
-                                        method.getAnnotation(org.osoa.sca.annotations.Reference.class);
-        if (annotation != null) {
-            if (JavaIntrospectionHelper.isSetter(method)) {
-                String name = annotation.name();
-                if ("".equals(name)) {
-                    name = JavaIntrospectionHelper.toPropertyName(method.getName());
-                }
-                return getReferenceByName(name, type);
-            }
-        }
-        return null;
-    }
-    
-    private Reference getReferenceByName(String name, JavaImplementation type) {
-        for ( Reference reference : type.getReferences() ) {
-            if ( reference.getName().equals(name) ) {
-                return reference;
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        org.osoa.sca.annotations.Reference annotation = 
-            field.getAnnotation( org.osoa.sca.annotations.Reference.class);
-        if (annotation == null) {
-            return;
-        }
-        String name = annotation.name();
-        if ("".equals(name)) {
-            name = field.getName();
-        }
-        
-        Reference reference = null;
-        if ( (reference = getReferenceByName(name, type)) != null ) {
-            readIntents(field.getAnnotation(Requires.class), reference.getRequiredIntents());
-            readPolicySets(field.getAnnotation(PolicySets.class), reference.getPolicySets());
-        }
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        Reference reference = null;
-        if ( (reference = getReference(method, type)) != null ) {
-            readIntents(method.getAnnotation(Requires.class), reference.getRequiredIntents());
-            readPolicySets(method.getAnnotation(PolicySets.class), reference.getPolicySets());
-        } else {
-            if ( type instanceof OperationsConfigurator ) {
-                //Read the intents specified on the given implementation method
-                if ( (method.getAnnotation(Requires.class) != null || 
-                        method.getAnnotation(PolicySets.class) != null ) && 
-                            (type instanceof PolicySetAttachPoint )) {
-                    ConfiguredOperation confOp = assemblyFactory.createConfiguredOperation();
-                    confOp.setName(method.getName());
-                    ((OperationsConfigurator)type).getConfiguredOperations().add(confOp);
-            
-                
-                    readIntents(method.getAnnotation(Requires.class), confOp.getRequiredIntents());
-                    readPolicySets(method.getAnnotation(PolicySets.class), confOp.getPolicySets());
-                }
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
deleted file mode 100644
index cf1b4a9830..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.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.implementation.java.introspect.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.osoa.sca.annotations.Property;
-
-/**
- * Processes an {@link @Property} annotation, updating the component type with
- * corresponding {@link JavaMappedProperty}
- * 
- * @version $Rev$ $Date$
- */
-public class PropertyProcessor extends AbstractPropertyProcessor<Property> {
-
-    public PropertyProcessor(AssemblyFactory assemblyFactory) {
-        super(assemblyFactory, Property.class);
-    }
-
-    @Override
-    protected String getName(Property annotation) {
-        return annotation.name();
-    }
-
-    @Override
-    protected void initProperty(org.apache.tuscany.sca.assembly.Property property, Property annotation) {
-        property.setMustSupply(annotation.required());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
deleted file mode 100644
index a1f8a766ae..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getBaseType;
-
-import java.lang.annotation.ElementType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-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.JavaParameterImpl;
-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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * Processes an {@link @Reference} annotation, updating the component type with
- * corresponding {@link
- * org.apache.tuscany.spi.implementation.java.JavaMappedReference}
- * 
- * @version $Rev$ $Date$
- */
-public class ReferenceProcessor extends BaseJavaClassVisitor {
-    private JavaInterfaceFactory javaFactory;
-
-    public ReferenceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-        super(assemblyFactory);
-        this.javaFactory = javaFactory;
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        Reference annotation = method.getAnnotation(Reference.class);
-        if (annotation == null) {
-            return; // Not a reference annotation.
-        }
-        if (!JavaIntrospectionHelper.isSetter(method)) {
-            throw new IllegalReferenceException("Annotated method is not a setter: " + method, method);
-        }
-        String name = annotation.name();
-        if ("".equals(name)) {
-            name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        }
-        JavaElementImpl ref = type.getReferenceMembers().get(name);
-        // Setter override field
-        if (ref != null && ref.getElementType() != ElementType.FIELD) {
-            throw new DuplicateReferenceException(name);
-        }
-        removeReference(ref, type);
-
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
-        type.getReferences().add(reference);
-        type.getReferenceMembers().put(name, element);
-    }
-
-    private boolean removeReference(JavaElementImpl ref, JavaImplementation type) {
-        if (ref == null) {
-            return false;
-        }
-        List<org.apache.tuscany.sca.assembly.Reference> refs = type.getReferences();
-        for (int i = 0; i < refs.size(); i++) {
-            if (refs.get(i).getName().equals(ref.getName())) {
-                refs.remove(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-        Reference annotation = field.getAnnotation(Reference.class);
-        if (annotation == null) {
-            return;
-        }
-        String name = annotation.name();
-        if ("".equals(name)) {
-            name = field.getName();
-        }
-        JavaElementImpl ref = type.getReferenceMembers().get(name);
-        if (ref != null && ref.getElementType() == ElementType.FIELD) {
-            throw new DuplicateReferenceException(name);
-        }
-
-        // Setter method override field
-        if (ref == null) {
-            JavaElementImpl element = new JavaElementImpl(field);
-            org.apache.tuscany.sca.assembly.Reference reference = createReference(element, name);
-            type.getReferences().add(reference);
-            type.getReferenceMembers().put(name, element);
-        }
-    }
-
-    @Override
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
-        throws IntrospectionException {
-        Reference refAnnotation = parameter.getAnnotation(Reference.class);
-        if (refAnnotation == null) {
-            return;
-        }
-        String paramName = parameter.getName();
-        String name = getReferenceName(paramName, parameter.getIndex(), refAnnotation.name());
-        JavaElementImpl ref = type.getReferenceMembers().get(name);
-
-        // Setter override field
-        if (ref != null && ref.getElementType() != ElementType.FIELD) {
-            throw new DuplicateReferenceException(name);
-        }
-
-        removeReference(ref, type);
-        org.apache.tuscany.sca.assembly.Reference reference = createReference(parameter, name);
-        type.getReferences().add(reference);
-        type.getReferenceMembers().put(name, parameter);
-        parameter.setClassifer(Reference.class);
-        parameter.setName(name);
-    }
-
-    private String getReferenceName(String paramName, int pos, String name) throws InvalidConstructorException {
-        if ("".equals(name)) {
-            name = paramName;
-        }
-        if ("".equals(name)) {
-            return "_ref" + pos;
-        }
-        if (!"".equals(paramName) && !name.equals(paramName)) {
-            throw new InvalidConstructorException("Mismatching names specified for reference parameter " + pos);
-        } else {
-            return name;
-        }
-    }
-
-    private org.apache.tuscany.sca.assembly.Reference createReference(JavaElementImpl element, String name)
-        throws IntrospectionException {
-        org.apache.tuscany.sca.assembly.Reference reference = assemblyFactory.createReference();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        reference.setInterfaceContract(interfaceContract);
-
-        // reference.setMember((Member)element.getAnchor());
-        boolean required = true;
-        Reference ref = element.getAnnotation(Reference.class);
-        if (ref != null) {
-            required = ref.required();
-        }
-        // reference.setRequired(required);
-        reference.setName(name);
-        Class<?> rawType = element.getType();
-        if (rawType.isArray() || Collection.class.isAssignableFrom(rawType)) {
-            if (required) {
-                reference.setMultiplicity(Multiplicity.ONE_N);
-            } else {
-                reference.setMultiplicity(Multiplicity.ZERO_N);
-            }
-        } else {
-            if (required) {
-                reference.setMultiplicity(Multiplicity.ONE_ONE);
-            } else {
-                reference.setMultiplicity(Multiplicity.ZERO_ONE);
-            }
-        }
-        Type genericType = element.getGenericType();
-        Class<?> baseType = getBaseType(rawType, genericType);
-        if (CallableReference.class.isAssignableFrom(baseType)) {
-            if (Collection.class.isAssignableFrom(rawType)) {
-                genericType = JavaIntrospectionHelper.getParameterType(genericType);
-            }
-            baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType);
-        }
-        try {
-            JavaInterface callInterface = javaFactory.createJavaInterface(baseType);
-            reference.getInterfaceContract().setInterface(callInterface);
-            if (callInterface.getCallbackClass() != null) {
-                JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-                reference.getInterfaceContract().setCallbackInterface(callbackInterface);
-            }
-        } catch (InvalidInterfaceException e) {
-            throw new IntrospectionException(e);
-        }
-        return reference;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
deleted file mode 100644
index 3d43e39ce8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.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.java.introspect.impl;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a resource should be provided to an implementation by the runtime.
- *
- * @version $Rev$ $Date$
- */
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Resource {
-
-    /**
-     * Denotes the name of the resource declared by the implementation.
-     */
-    String name() default "";
-
-    /**
-     * Denotes if the resource is optional
-     */
-    boolean optional() default false;
-
-    /**
-     * Denotes the default name of the resource provided by the runtime environment.
-     */
-    String mappedName() default "";
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
deleted file mode 100644
index e15f9a0d6a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
-
-/**
- * Processes an {@link @Resource} annotation, updating the component type with
- * corresponding {@link org.apache.tuscany.spi.implementation.java.JavaResourceImpl}
- * 
- * @version $Rev$ $Date$
- */
-public class ResourceProcessor extends BaseJavaClassVisitor {
-    
-    public ResourceProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-        org.apache.tuscany.sca.implementation.java.introspect.impl.Resource annotation = method
-            .getAnnotation(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        if (annotation == null) {
-            return;
-        }
-        if (method.getParameterTypes().length != 1) {
-            throw new IllegalResourceException("Resource setter must have one parameter", method);
-        }
-        String name = annotation.name();
-        if (name.length() < 1) {
-            name = JavaIntrospectionHelper.toPropertyName(method.getName());
-        }
-        if (type.getResources().get(name) != null) {
-            throw new DuplicateResourceException(name);
-        }
-
-        String mappedName = annotation.mappedName();
-        JavaResourceImpl resource = createResource(name, new JavaElementImpl(method, 0));
-        resource.setOptional(annotation.optional());
-        if (mappedName.length() > 0) {
-            resource.setMappedName(mappedName);
-        }
-        type.getResources().put(resource.getName(), resource);
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-
-        org.apache.tuscany.sca.implementation.java.introspect.impl.Resource annotation = field
-            .getAnnotation(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        if (annotation == null) {
-            return;
-        }
-        String name = annotation.name();
-        if (name.length() < 1) {
-            name = field.getName();
-        }
-        if (type.getResources().get(name) != null) {
-            throw new DuplicateResourceException(name);
-        }
-
-        String mappedName = annotation.mappedName();
-
-        JavaResourceImpl resource = createResource(name, new JavaElementImpl(field));
-        resource.setOptional(annotation.optional());
-        if (mappedName.length() > 0) {
-            resource.setMappedName(mappedName);
-        }
-        type.getResources().put(resource.getName(), resource);
-    }
-
-    @SuppressWarnings("unchecked")
-    public JavaResourceImpl createResource(String name, JavaElementImpl element) {
-        element.setClassifer(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        element.setName(name);
-        return new JavaResourceImpl(element);
-    }
-
-    @Override
-    public void visitConstructorParameter(JavaParameterImpl parameter, JavaImplementation type)
-        throws IntrospectionException {
-        org.apache.tuscany.sca.implementation.java.introspect.impl.Resource resourceAnnotation = parameter
-            .getAnnotation(org.apache.tuscany.sca.implementation.java.introspect.impl.Resource.class);
-        if (resourceAnnotation != null) {
-            String name = resourceAnnotation.name();
-            if ("".equals(name)) {
-                name = parameter.getName();
-            }
-            if ("".equals(name)) {
-                throw new InvalidResourceException("Missing resource name", (Member)parameter.getAnchor());
-            }
-
-            if (!"".equals(parameter.getName()) && !name.equals(parameter.getName())) {
-                throw new InvalidConstructorException("Mismatched resource name: " + parameter);
-            }
-
-            if (type.getResources().get(name) != null) {
-                throw new DuplicateResourceException(name);
-            }
-
-            String mappedName = resourceAnnotation.mappedName();
-
-            JavaResourceImpl resource = createResource(name, parameter);
-            resource.setOptional(resourceAnnotation.optional());
-            if (mappedName.length() > 0) {
-                resource.setMappedName(mappedName);
-            }
-            type.getResources().put(resource.getName(), resource);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
deleted file mode 100644
index a3d3889d30..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl;
-
-/**
- * Processes the {@link JavaScopeImpl} annotation and updates the component type with the corresponding implmentation scope
- *
- * @version $Rev$ $Date$
- */
-public class ScopeProcessor extends BaseJavaClassVisitor {
-    
-    public ScopeProcessor(AssemblyFactory factory) {
-        super(factory);
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz,
-                               JavaImplementation type)
-        throws IntrospectionException {
-        org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class);
-        if (annotation == null) {
-            type.setJavaScope(JavaScopeImpl.STATELESS);
-            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/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
deleted file mode 100644
index 78963f5b03..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper.getAllInterfaces;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Service;
-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.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.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Processes an {@link org.osoa.sca.annotations.Service} annotation and updates
- * the component type with corresponding {@link Service}s. Also processes
- * related {@link org.osoa.sca.annotations.Callback} annotations.
- * 
- * @version $Rev$ $Date$
- */
-public class ServiceProcessor extends BaseJavaClassVisitor {
-    private static final Logger logger = Logger.getLogger(ServiceProcessor.class.getName());
-    private JavaInterfaceFactory javaFactory;
-    
-    public ServiceProcessor(AssemblyFactory assemblyFactory, JavaInterfaceFactory javaFactory) {
-        super(assemblyFactory);
-        this.javaFactory = javaFactory;
-    }
-
-    @Override
-    public <T> void visitClass(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        org.osoa.sca.annotations.Service annotation = clazz.getAnnotation(org.osoa.sca.annotations.Service.class);
-        if (annotation == null) {
-            // scan interfaces for remotable
-            Set<Class> interfaces = getAllInterfaces(clazz);
-            for (Class<?> interfaze : interfaces) {
-                if (interfaze.isAnnotationPresent(Remotable.class) || interfaze.isAnnotationPresent(Callback.class)) {
-                    Service service;
-                    try {
-                        service = createService(interfaze);
-                    } catch (InvalidInterfaceException e) {
-                        throw new IntrospectionException(e);
-                    }
-                    type.getServices().add(service);
-                }
-            }
-            return;
-        }
-        Class<?>[] interfaces = annotation.interfaces();
-        if (interfaces.length == 0) {
-            Class<?> interfaze = annotation.value();
-            if (Void.class.equals(interfaze)) {
-                //throw new IllegalServiceDefinitionException("No interfaces specified");
-                logger.warning("Ignoring @Service annotation.  No interfaces specified. class = "+clazz.getName());
-            } else {
-                interfaces = new Class<?>[1];
-                interfaces[0] = interfaze;
-            }
-        }
-        for (Class<?> interfaze : interfaces) {
-            try {
-                Service service = createService(interfaze);
-                type.getServices().add(service);
-            } catch (InvalidInterfaceException e) {
-                throw new IntrospectionException(e);
-            }
-        }
-    }
-
-    @Override
-    public void visitMethod(Method method, JavaImplementation type) throws IntrospectionException {
-
-        Callback annotation = method.getAnnotation(Callback.class);
-        if (annotation == null) {
-            return;
-        }
-        if(Modifier.isPrivate(method.getModifiers())) {
-            throw new IllegalCallbackReferenceException("Illegal annotation @Callback found on "+method, method);
-        }
-        if (method.getParameterTypes().length != 1) {
-            throw new IllegalCallbackReferenceException("Setter must have one parameter", method);
-        }
-        JavaElementImpl element = new JavaElementImpl(method, 0);
-        createCallback(type, element);
-    }
-
-    @Override
-    public void visitField(Field field, JavaImplementation type) throws IntrospectionException {
-
-        Callback annotation = field.getAnnotation(Callback.class);
-        if (annotation == null) {
-            return;
-        }
-        if(Modifier.isPrivate(field.getModifiers())) {
-            throw new IllegalCallbackReferenceException("Illegal annotation @Callback found on "+field, field);
-        }
-        JavaElementImpl element = new JavaElementImpl(field);
-        createCallback(type, element);
-    }
-
-    /**
-     * @param type
-     * @param element
-     * @throws IllegalCallbackReferenceException
-     */
-    private void createCallback(JavaImplementation type, JavaElementImpl element)
-        throws IllegalCallbackReferenceException {
-        Service callbackService = null;
-        Class<?> callbackClass = element.getType();
-        Type genericType = element.getGenericType();
-        Class<?> baseType = callbackClass;
-        if(CallableReference.class.isAssignableFrom(baseType)) {
-            // @Callback protected CallableReference<MyCallback> callback;
-            // The base type will be MyCallback
-            baseType = JavaIntrospectionHelper.getBusinessInterface(baseType, genericType);
-        }        
-        for (Service service : type.getServices()) {
-            JavaInterface javaInterface = (JavaInterface)service.getInterfaceContract().getCallbackInterface();
-            if (javaInterface != null && baseType == javaInterface.getJavaClass()) {
-                callbackService = service;
-            }
-        }
-        if (callbackService == null) {
-            throw new IllegalCallbackReferenceException("Callback type does not match a service callback interface: " + type.getName() );
-        }
-        if(type.getCallbackMembers().get(baseType.getName()) == null) {
-            type.getCallbackMembers().put(baseType.getName(), new ArrayList<JavaElementImpl>());
-        }
-        type.getCallbackMembers().get(baseType.getName()).add(element);
-    }
-
-    public Service createService(Class<?> interfaze) throws InvalidInterfaceException {
-        Service service = assemblyFactory.createService();
-        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
-        service.setInterfaceContract(interfaceContract);
-
-        // create a relative URI
-        service.setName(interfaze.getSimpleName());
-
-        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;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
deleted file mode 100644
index e1ca3ea565..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.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.java.introspect.impl;
-
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-
-/**
- * Thrown when a service interface cannot be determined based on a heuristic evaluation of an implementation
- *
- * @version $Rev$ $Date$
- */
-public class ServiceTypeNotFoundException extends IntrospectionException {
-    private static final long serialVersionUID = -5124437274726947007L;
-
-    public ServiceTypeNotFoundException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
deleted file mode 100644
index 57d224b2bf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.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.java.introspect.impl;
-
-/**
- * Thrown when a method or field marked with {@link org.osoa.sca.annotations.Context} takes an unknown type
- *
- * @version $Rev$ $Date$
- */
-public class UnknownContextTypeException extends IllegalContextException {
-    private static final long serialVersionUID = 8125863714365422419L;
-
-    public UnknownContextTypeException(String message) {
-        super(message);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index df60d57cf9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/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.implementation.java.impl.JavaImplementationActivator

diff --git a/tags/java/sca/1.3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/tags/java/sca/1.3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
deleted file mode 100644
index dc9de12632..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ /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.java.DefaultJavaImplementationFactory

diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
deleted file mode 100644
index fe93424d28..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.implementation.java.IntrospectionException;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-
-/**
- * Base class to simulate the processor sequences
- * 
- * @version $Rev$ $Date$
- */
-public class AbstractProcessorTest extends TestCase {
-    protected AssemblyFactory factory;
-    protected JavaInterfaceFactory javaFactory;
-    protected ConstructorProcessor constructorProcessor;
-    private ReferenceProcessor referenceProcessor;
-    private PropertyProcessor propertyProcessor;
-    private ResourceProcessor resourceProcessor;
-
-
-    protected AbstractProcessorTest() {
-        factory = new DefaultAssemblyFactory();
-        javaFactory = new DefaultJavaInterfaceFactory();
-        referenceProcessor = new ReferenceProcessor(factory, javaFactory);
-        propertyProcessor = new PropertyProcessor(factory);
-        resourceProcessor = new ResourceProcessor(factory);
-        constructorProcessor = new ConstructorProcessor(factory);
-        referenceProcessor = new ReferenceProcessor(factory, javaFactory);
-        propertyProcessor = new PropertyProcessor(factory);
-    }
-
-    protected <T> void visitConstructor(Constructor<T> constructor,
-                                        JavaImplementation type) throws IntrospectionException {
-        constructorProcessor.visitConstructor(constructor, type);
-        JavaConstructorImpl<?> definition = type.getConstructor();
-        if (definition == null) {
-            definition = new JavaConstructorImpl<T>(constructor);
-            type.getConstructors().put(constructor, definition);
-        }
-        JavaParameterImpl[] parameters = definition.getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            referenceProcessor.visitConstructorParameter(parameters[i], type);
-            propertyProcessor.visitConstructorParameter(parameters[i], type);
-            resourceProcessor.visitConstructorParameter(parameters[i], type);
-            // monitorProcessor.visitConstructorParameter(parameters[i], type);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
deleted file mode 100644
index 5beb31f0f9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.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.implementation.java.introspect.impl;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getProperty;
-
-import java.lang.annotation.Retention;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-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.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class AbstractPropertyProcessorTestCase extends TestCase {
-
-    private JavaClassVisitor extension;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public void testVisitMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBar", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        extension.visitMethod(method, type);
-        Property prop = getProperty(type, "test");
-        assertNotNull(prop);
-    }
-
-    public void testVisitNoParamsMethod() throws Exception {
-        Method method = Foo.class.getMethod("setNoParamsBar");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            extension.visitMethod(method, type);
-            fail();
-        } catch (IllegalPropertyException e) {
-            // expected
-        }
-    }
-
-    public void testVisitNonVoidMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBadBar", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            extension.visitMethod(method, type);
-            fail();
-        } catch (IllegalPropertyException e) {
-            // expected
-        }
-    }
-
-    public void testDuplicateMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBar", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        extension.visitMethod(method, type);
-        try {
-            extension.visitMethod(method, type);
-            fail();
-        } catch (DuplicatePropertyException e) {
-            // expected
-        }
-    }
-
-    public void testVisitField() throws Exception {
-        Field field = Foo.class.getDeclaredField("d");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        extension.visitField(field, type);
-        Property prop = getProperty(type, "test");
-        assertNotNull(prop);
-    }
-
-    public void testVisitConstructor() throws Exception {
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        JavaConstructorImpl<Foo> def = new JavaConstructorImpl<Foo>(ctor);
-        JavaParameterImpl parameter = def.getParameters()[0];
-        extension.visitConstructorParameter(parameter, type);
-        assertEquals("test", def.getParameters()[0].getName());
-        assertNotNull(getProperty(type, "test"));
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void setUp() throws Exception {
-        super.setUp();
-        extension = new TestProcessor();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-    }
-
-    @Retention(RUNTIME)
-    private @interface Bar {
-
-    }
-
-    private class TestProcessor extends AbstractPropertyProcessor<Bar> {
-
-        public TestProcessor() {
-            super(new DefaultAssemblyFactory(), Bar.class);
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        protected void initProperty(Property property, Bar annotation) {
-            // property.setDefaultValueFactory(EasyMock.createMock(ObjectFactory.class));
-            property.setName("test");
-        }
-
-        @Override
-        protected String getName(Bar annotation) {
-            return "test";
-        }
-    }
-
-    private static class Foo {
-
-        @Bar
-        protected String d;
-
-        public Foo(String a, @Bar
-        String b) {
-        }
-
-        public Foo(@Bar
-        String d) {
-            this.d = d;
-        }
-
-        @Bar
-        public void setBar(String d) {
-            this.d = d;
-        }
-
-        @Bar
-        public void setNoParamsBar() {
-        }
-
-        @Bar
-        public String setBadBar(String d) {
-            return null;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
deleted file mode 100644
index e5abb07760..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.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.java.introspect.impl;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AllowsPassByReferenceProcessorTestCase extends TestCase {
-
-    JavaImplementation type;
-    AllowsPassByReferenceProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public void testClassAnnotation() throws Exception {
-        processor.visitClass(Foo.class, type);
-        assertEquals(true, type.isAllowsPassByReference());
-
-        processor.visitClass(Bar.class, type);
-        assertEquals(false, type.isAllowsPassByReference());
-
-        Method m1 = Bar.class.getMethod("m1", new Class[] {});
-        processor.visitMethod(m1, type);
-        assertTrue(type.isAllowsPassByReference(m1));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-        processor = new AllowsPassByReferenceProcessor(new DefaultAssemblyFactory());
-    }
-
-    @AllowsPassByReference
-    private class Foo {
-    }
-
-    // no annotation
-    private class Bar {
-        @AllowsPassByReference
-        public void m1() {
-
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
deleted file mode 100644
index fa1527fbe5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getProperty;
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getReference;
-
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-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.implementation.java.impl.JavaParameterImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConstructorProcessorTestCase extends TestCase {
-    private ConstructorProcessor processor = new ConstructorProcessor(new DefaultAssemblyFactory());
-    
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testDuplicateConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitClass(BadFoo.class, type);
-            fail();
-        } catch (DuplicateConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testConstructorAnnotation() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor1 = Foo.class.getConstructor(String.class);
-        processor.visitConstructor(ctor1, type);
-        assertEquals("foo", type.getConstructor().getParameters()[0].getName());
-    }
-
-    public void testNoAnnotation() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<NoAnnotation> ctor1 = NoAnnotation.class.getConstructor();
-        processor.visitConstructor(ctor1, type);
-        assertNull(type.getConstructor());
-    }
-
-    public void testBadAnnotation() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadAnnotation> ctor1 = BadAnnotation.class.getConstructor(String.class, Foo.class);
-        try {
-            processor.visitConstructor(ctor1, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testMixedParameters() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Mixed> ctor1 = Mixed.class.getConstructor(String.class, String.class, String.class);
-        processor.visitConstructor(ctor1, type);
-
-        AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory);
-        PropertyProcessor propertyProcessor = new PropertyProcessor(assemblyFactory);
-        JavaParameterImpl[] parameters = type.getConstructor().getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            referenceProcessor.visitConstructorParameter(parameters[i], type);
-            propertyProcessor.visitConstructorParameter(parameters[i], type);
-        }
-
-        assertEquals("_ref0", parameters[0].getName());
-        assertEquals("foo", parameters[1].getName());
-        assertEquals("bar", parameters[2].getName());
-    }
-
-    private static class BadFoo {
-
-        @org.osoa.sca.annotations.Constructor("foo")
-        public BadFoo(String foo) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor( {"foo", "bar"})
-        public BadFoo(String foo, String bar) {
-
-        }
-    }
-
-    private static class Foo {
-        @org.osoa.sca.annotations.Constructor("foo")
-        public Foo(String foo) {
-
-        }
-    }
-
-    private static class NoAnnotation {
-        public NoAnnotation() {
-        }
-    }
-
-    private static class BadAnnotation {
-        @org.osoa.sca.annotations.Constructor("foo")
-        public BadAnnotation(String foo, Foo ref) {
-        }
-    }
-
-    public static final class Mixed {
-        @org.osoa.sca.annotations.Constructor
-        public Mixed(@Reference
-        String param1, @Property(name = "foo")
-        String param2, @Reference(name = "bar")
-        String param3) {
-        }
-    }
-
-    public static final class Multiple {
-        @org.osoa.sca.annotations.Constructor
-        public Multiple(@Reference
-        Collection<String> param1, @Property(name = "foo")
-        String[] param2, @Reference(name = "bar", required = true)
-        List<String> param3, @Property(name = "abc")
-        Set<String> param4, @Reference(name = "xyz")
-        String[] param5) {
-        }
-    }
-
-    public void testMultiplicity() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Multiple> ctor1 = Multiple.class.getConstructor(Collection.class,
-                                                                    String[].class,
-                                                                    List.class,
-                                                                    Set.class,
-                                                                    String[].class);
-        processor.visitConstructor(ctor1, type);
-        AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        ReferenceProcessor referenceProcessor = new ReferenceProcessor(assemblyFactory, javaFactory);
-        PropertyProcessor propertyProcessor = new PropertyProcessor(assemblyFactory);
-        JavaParameterImpl[] parameters = type.getConstructor().getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            referenceProcessor.visitConstructorParameter(parameters[i], type);
-            propertyProcessor.visitConstructorParameter(parameters[i], type);
-        }
-
-        org.apache.tuscany.sca.assembly.Reference ref0 = getReference(type, "_ref0");
-        assertNotNull(ref0);
-        assertEquals(Multiplicity.ONE_N, ref0.getMultiplicity());
-        org.apache.tuscany.sca.assembly.Reference ref1 = getReference(type, "bar");
-        assertNotNull(ref1);
-        assertEquals(Multiplicity.ONE_N, ref1.getMultiplicity());
-        org.apache.tuscany.sca.assembly.Reference ref2 = getReference(type, "xyz");
-        assertNotNull(ref2);
-        assertEquals(Multiplicity.ONE_N, ref2.getMultiplicity());
-        org.apache.tuscany.sca.assembly.Property prop1 = getProperty(type, "foo");
-        assertNotNull(prop1);
-        assertTrue(prop1.isMany());
-        org.apache.tuscany.sca.assembly.Property prop2 = getProperty(type, "abc");
-        assertNotNull(prop2);
-        assertTrue(prop2.isMany());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
deleted file mode 100644
index 690869ccb8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.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.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getProperty;
-
-import java.lang.reflect.Constructor;
-import java.util.List;
-
-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.osoa.sca.annotations.Property;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConstructorPropertyTestCase extends AbstractProcessorTest {
-    
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testProperty() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
-        visitConstructor(ctor, type);
-        org.apache.tuscany.sca.assembly.Property property = getProperty(type, "myProp");
-        assertTrue(property.isMustSupply());
-        assertEquals("myProp", property.getName());
-    }
-
-    public void testTwoPropertiesSameType() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
-        visitConstructor(ctor, type);
-        assertNotNull(getProperty(type, "myProp1"));
-        assertNotNull(getProperty(type, "myProp2"));
-    }
-
-    public void testDuplicateProperty() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (DuplicatePropertyException e) {
-            // expected
-        }
-    }
-
-    public void testNoName() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidPropertyException e) {
-            // expected
-        }
-    }
-
-    public void testNamesOnConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
-        visitConstructor(ctor, type);
-        assertNotNull(getProperty(type, "myProp"));
-    }
-
-    public void testInvalidNumberOfNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(Integer.class, Integer.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testNoMatchingNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(List.class, List.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-//    public void testMultiplicityRequired() throws Exception {
-    // TODO multiplicity
-//    }
-
-    private static class Foo {
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Property(name = "myProp", required = true)String prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myProp")
-        public Foo(@Property Integer prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Property(name = "myProp1")String prop1, @Property(name = "myProp2")String prop2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Property List prop) {
-
-        }
-    }
-
-    private static class BadFoo {
-
-        @org.osoa.sca.annotations.Constructor()
-        public BadFoo(@Property(name = "myProp")String prop1, @Property(name = "myProp")String prop2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor()
-        public BadFoo(@Property String prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myProp")
-        public BadFoo(@Property Integer prop, @Property Integer prop2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"})
-        public BadFoo(@Property List ref, @Property(name = "myOtherRef")List ref2) {
-
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
deleted file mode 100644
index 8c10df2146..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getReference;
-
-import java.lang.reflect.Constructor;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Multiplicity;
-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.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConstructorReferenceTestCase extends AbstractProcessorTest {
-    
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testReference() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
-        visitConstructor(ctor, type);
-        org.apache.tuscany.sca.assembly.Reference reference = getReference(type, "myRef");
-        assertEquals(Multiplicity.ONE_ONE, reference.getMultiplicity());
-        assertEquals("myRef", reference.getName());
-    }
-
-    public void testTwoReferencesSameType() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
-        visitConstructor(ctor, type);
-        assertNotNull(getReference(type, "myRef1"));
-        assertNotNull(getReference(type, "myRef2"));
-    }
-
-    public void testDuplicateProperty() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (DuplicateReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testNoName() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<NoNameFoo> ctor = NoNameFoo.class.getConstructor(String.class);
-        visitConstructor(ctor, type);
-        assertNotNull(getReference(type, "_ref0"));
-    }
-
-    public void testNamesOnConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
-        visitConstructor(ctor, type);
-        assertNotNull(getReference(type, "myRef"));
-    }
-
-    public void testInvalidNumberOfNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(Integer.class, Integer.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testNoMatchingNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(List.class, List.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-//    public void testMultiplicityRequired() throws Exception {
-    // TODO multiplicity
-//    }
-
-    private static class Foo {
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Reference(name = "myRef", required = true)String prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Reference(name = "myRef1")String prop1, @Reference(name = "myRef2")String prop2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myRef")
-        public Foo(@Reference Integer prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor()
-        public Foo(@Reference List prop) {
-
-        }
-    }
-
-    private static class NoNameFoo {
-
-        @org.osoa.sca.annotations.Constructor
-        public NoNameFoo(@Reference String prop) {
-
-        }
-    }
-
-    private static class BadFoo {
-
-        @org.osoa.sca.annotations.Constructor
-        public BadFoo(@Reference(name = "myRef")String prop1, @Reference(name = "myRef")String prop2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor
-        public BadFoo(@Reference String prop) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myRef")
-        public BadFoo(@Reference Integer ref, @Reference Integer ref2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor({"myRef", "myRef2"})
-        public BadFoo(@Reference List ref, @Reference(name = "myOtherRef")List ref2) {
-
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
deleted file mode 100644
index 365fb12afe..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ /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.
- */
-package org.apache.tuscany.sca.implementation.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-import java.util.List;
-
-import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConstructorResourceTestCase extends AbstractProcessorTest {
-    
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testResource() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class);
-        visitConstructor(ctor, type);
-        org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl resource = type.getResources().get("myResource");
-        assertFalse(resource.isOptional());
-    }
-
-    public void testTwoResourcesSameType() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
-        visitConstructor(ctor, type);
-        assertNotNull(type.getResources().get("myResource1"));
-        assertNotNull(type.getResources().get("myResource2"));
-    }
-
-    public void testDuplicateResource() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<BadFoo> ctor = BadFoo.class.getConstructor(String.class, String.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (DuplicateResourceException e) {
-            // expected
-        }
-    }
-
-    public void testNoName() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ConstructorResourceTestCase.BadFoo> ctor =
-            ConstructorResourceTestCase.BadFoo.class.getConstructor(String.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidResourceException e) {
-            // expected
-        }
-    }
-
-    public void testNamesOnConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(Integer.class);
-        visitConstructor(ctor, type);
-        assertNotNull(type.getResources().get("myResource"));
-    }
-
-    public void testInvalidNumberOfNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ConstructorResourceTestCase.BadFoo> ctor =
-            ConstructorResourceTestCase.BadFoo.class.getConstructor(Integer.class, Integer.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testNoMatchingNames() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ConstructorResourceTestCase.BadFoo> ctor =
-            ConstructorResourceTestCase.BadFoo.class.getConstructor(List.class, List.class);
-        try {
-            visitConstructor(ctor, type);
-            fail();
-        } catch (InvalidConstructorException e) {
-            // expected
-        }
-    }
-
-    private static class Foo {
-
-        @org.osoa.sca.annotations.Constructor
-        public Foo(@Resource(name = "myResource") String resource) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myResource")
-        public Foo(@Resource Integer resource) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor
-        public Foo(@Resource(name = "myResource1") String res1, @Resource(name = "myResource2") String res2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor
-        public Foo(@Resource List res) {
-
-        }
-    }
-
-    private static class BadFoo {
-
-        @org.osoa.sca.annotations.Constructor
-        public BadFoo(@Resource(name = "myResource") String res1, @Resource(name = "myResource") String res2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor
-        public BadFoo(@Resource String res) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor("myProp")
-        public BadFoo(@Resource Integer res, @Resource Integer res2) {
-
-        }
-
-        @org.osoa.sca.annotations.Constructor({"myRes", "myRes2"})
-        public BadFoo(@Resource List res, @Resource(name = "myOtherRes") List res2) {
-
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
deleted file mode 100644
index f77c9abad9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Context;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ContextProcessorTestCase extends TestCase {
-    private ContextProcessor processor;
-    private ComponentNameProcessor nameProcessor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public void testComponentContextMethod() throws Exception {
-        Method method = Foo.class.getMethod("setContext", ComponentContext.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitMethod(method, type);
-        assertNotNull(type.getResources().get("context"));
-    }
-
-    public void testComponentContextField() throws Exception {
-        Field field = Foo.class.getDeclaredField("context");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitField(field, type);
-        assertNotNull(type.getResources().get("context"));
-    }
-
-    public void testRequestContextMethod() throws Exception {
-        Method method = Foo.class.getMethod("setRequestContext", RequestContext.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitMethod(method, type);
-        assertNotNull(type.getResources().get("requestContext"));
-    }
-
-    public void testRequestContextField() throws Exception {
-        Field field = Foo.class.getDeclaredField("requestContext");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitField(field, type);
-        assertNotNull(type.getResources().get("requestContext"));
-    }
-
-    public void testComponentNameMethod() throws Exception {
-        Method method = Foo.class.getMethod("setName", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        nameProcessor.visitMethod(method, type);
-        assertNotNull(type.getResources().get("name"));
-    }
-
-    public void testComponentNameField() throws Exception {
-        Field field = Foo.class.getDeclaredField("name");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        nameProcessor.visitField(field, type);
-        assertNotNull(type.getResources().get("name"));
-    }
-
-    public void testInvalidParamType() throws Exception {
-        Method method = Foo.class.getMethod("setContext", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (UnknownContextTypeException e) {
-            // expected
-        }
-    }
-
-    public void testInvalidParamTypeField() throws Exception {
-        Field field = Foo.class.getDeclaredField("badContext");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitField(field, type);
-            fail();
-        } catch (UnknownContextTypeException e) {
-            // expected
-        }
-    }
-
-
-    public void testInvalidParamNum() throws Exception {
-        Method method = Foo.class.getMethod("setContext", ComponentContext.class, String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalContextException e) {
-            // expected
-        }
-    }
-
-    public void testInvalidNoParams() throws Exception {
-        Method method = Foo.class.getMethod("setContext");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalContextException e) {
-            // expected
-        }
-    }
-
-    public void testNoContext() throws Exception {
-        Method method = Foo.class.getMethod("noContext", ComponentContext.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitMethod(method, type);
-        assertEquals(0, type.getResources().size());
-    }
-
-    public void testNoContextField() throws Exception {
-        Field field = Foo.class.getDeclaredField("noContext");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitField(field, type);
-        assertEquals(0, type.getResources().size());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        processor = new ContextProcessor(new DefaultAssemblyFactory());
-        nameProcessor = new ComponentNameProcessor(new DefaultAssemblyFactory());
-    }
-
-    private class Foo {
-        @Context
-        protected ComponentContext context;
-
-        @ComponentName
-        protected String name;
-
-        @Context
-        protected Object badContext;
-
-        protected ComponentContext noContext;
-
-        @Context
-        protected RequestContext requestContext;
-
-        @Context
-        public void setContext(ComponentContext context) {
-
-        }
-
-        @ComponentName
-        public void setName(String name) {
-
-        }
-
-        @Context
-        public void setContext(String context) {
-
-        }
-
-        @Context
-        public void setContext(ComponentContext context, String string) {
-
-        }
-
-        @Context
-        public void setContext() {
-
-        }
-
-        public void noContext(ComponentContext context) {
-
-        }
-
-        @Context
-        public void setRequestContext(RequestContext requestContext) {
-            this.requestContext = requestContext;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
deleted file mode 100644
index c6b2626e9c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.ConversationID;
-
-/**
- * Test the ConversationIDProcessor
- *
- * @version $Rev$ $Date$
- */
-public class ConversationIDProcessorTestCase extends TestCase {
-    private ConversationIDProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public void testConversationIDMethod() throws Exception {
-        Method method = Foo.class.getMethod("setConversationID", String.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitMethod(method, type);
-        assertNotNull(type.getResources().get("conversationID"));
-    }
-
-    public void testConversationIDField() throws Exception {
-        Field field = Foo.class.getDeclaredField("cid");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitField(field, type);
-        assertNotNull(type.getResources().get("cid"));
-    }
-
-    public void testConversationIDMethodNotString() throws Exception {
-        Method method = Foo.class.getMethod("setConversationID", Long.class);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitMethod(method, type);
-        assertNotNull(type.getResources().get("conversationID"));
-    }
-
-    public void testConversationIDFieldNotString() throws Exception {
-        Field field = Foo.class.getDeclaredField("longCID");
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitField(field, type);
-        assertNotNull(type.getResources().get("longCID"));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        processor = new ConversationIDProcessor(new DefaultAssemblyFactory());
-    }
-
-    private class Foo {
-
-        @ConversationID
-        protected String cid;
-
-        @ConversationID
-        public void setConversationID(String cid) {
-
-        }
-
-        @ConversationID
-        protected Long longCID;
-
-        @ConversationID
-        public void setConversationID(Long cid) {
-
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
deleted file mode 100644
index 4555736813..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationProcessorTestCase extends TestCase {
-    private ConversationProcessor processor = new ConversationProcessor(new DefaultAssemblyFactory());
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testMaxIdleTime() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooMaxIdle.class, type);
-        assertEquals(10000L, type.getMaxIdleTime());
-        assertEquals(-1, type.getMaxAge());
-    }
-
-    public void testMaxAge() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooMaxAge.class, type);
-        assertEquals(10000L, type.getMaxAge());
-        assertEquals(-1, type.getMaxIdleTime());
-    }
-
-    public void testImplicitScope() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(ImplicitFooScope.class, type);
-        assertEquals(org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl.CONVERSATION, type.getJavaScope());
-    }
-
-    /* TUSCANY-1999 - apply conversation properties to all scopes
-    public void testBadFooScope() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitClass(BadFooScope.class, type);
-            fail();
-        } catch (InvalidConversationalImplementation e) {
-            // expected
-        }
-    }
-    */
-
-    public void testBadFooBoth() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(BadFooBoth.class, type);
-        assertEquals(10000L, type.getMaxAge());
-        assertEquals(10000L, type.getMaxIdleTime());
-    }
-
-    public void testJustConversation() throws Exception {
-        // TODO do we want these semantics
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooJustConversation.class, type);
-        assertEquals(org.apache.tuscany.sca.implementation.java.impl.JavaScopeImpl.CONVERSATION, type.getJavaScope());
-        assertEquals(-1, type.getMaxAge());
-        assertEquals(-1, type.getMaxIdleTime());
-    }
-
-    public void testSetConversationIDField() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Field field = FooWithConversationIDField.class.getDeclaredField("conversationID");
-        processor.visitField(field, type);
-        assertNotNull(type.getConversationIDMembers());
-        assertEquals(field, type.getConversationIDMembers().get(0));
-    }
-
-    public void testSetConversationIDMethod() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = FooWithConversationIDMethod.class.getDeclaredMethods()[0];
-        processor.visitMethod(method, type);
-        assertNotNull(type.getConversationIDMembers());
-        assertEquals(method, type.getConversationIDMembers().get(0));
-    }
-
-    @Scope("CONVERSATION")
-    @ConversationAttributes(maxIdleTime = "10 seconds")
-    private class FooMaxIdle {
-    }
-
-    @Scope("CONVERSATION")
-    @ConversationAttributes(maxAge = "10 seconds")
-    private class FooMaxAge {
-    }
-
-    @Scope("CONVERSATION")
-    @ConversationAttributes(maxAge = "10 seconds", maxIdleTime = "10 seconds")
-    private class BadFooBoth {
-    }
-
-    @ConversationAttributes(maxAge = "10 seconds")
-    private class ImplicitFooScope {
-    }
-
-    @Scope("STATELESS")
-    @ConversationAttributes(maxAge = "10 seconds")
-    private class BadFooScope {
-    }
-
-    @ConversationAttributes
-    private class FooJustConversation {
-    }
-
-    private class FooWithConversationIDField {
-        
-        @ConversationID
-        String conversationID;
-    }
-
-    private class FooWithConversationIDMethod {
-        @ConversationID
-        void setConversationID(String conversationID) {
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
deleted file mode 100644
index aa2671071c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.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.implementation.java.introspect.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConvertTimeMillisTestCase extends TestCase {
-    private MockProcessor registy;
-
-    public void testConvertSeconds() throws Exception {
-        assertEquals(10000L, registy.convertTimeMillis("10 seconds"));
-        assertEquals(10000L, registy.convertTimeMillis("10 SECONDS"));
-        try {
-            registy.convertTimeMillis("10seconds");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    public void testConvertMinutes() throws Exception {
-        assertEquals(600000L, registy.convertTimeMillis("10 minutes"));
-        assertEquals(600000L, registy.convertTimeMillis("10 MINUTES"));
-        try {
-            registy.convertTimeMillis("10minutes");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    public void testConvertHours() throws Exception {
-        assertEquals(36000000L, registy.convertTimeMillis("10 hours"));
-        assertEquals(36000000L, registy.convertTimeMillis("10 HOURS"));
-        try {
-            registy.convertTimeMillis("10hours");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    public void testConvertDays() throws Exception {
-        assertEquals(864000000L, registy.convertTimeMillis("10 days"));
-        assertEquals(864000000L, registy.convertTimeMillis("10 DAYS"));
-        try {
-            registy.convertTimeMillis("10days");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    public void testConvertYears() throws Exception {
-        assertEquals(315569260000L, registy.convertTimeMillis("10 years"));
-        assertEquals(315569260000L, registy.convertTimeMillis("10 YEARS"));
-        try {
-            registy.convertTimeMillis("10years");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    public void testConvertDefault() throws Exception {
-        assertEquals(10000L, registy.convertTimeMillis("10 "));
-        assertEquals(10000L, registy.convertTimeMillis("10"));
-    }
-
-    public void testInvalid() throws Exception {
-        try {
-            registy.convertTimeMillis("foo");
-            fail();
-        } catch (NumberFormatException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        registy = new MockProcessor();
-    }
-
-    private class MockProcessor extends ConversationProcessor {
-        
-        public MockProcessor() {
-            super(new DefaultAssemblyFactory());
-        }
-
-        @Override
-        protected long convertTimeMillis(String expr) throws NumberFormatException {
-            return super.convertTimeMillis(expr);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
deleted file mode 100644
index ffc67325fa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.Destroy;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DestroyProcessorTestCase extends TestCase {
-    
-    private AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    public void testDestroy() throws Exception {
-        DestroyProcessor processor = new DestroyProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = Foo.class.getMethod("destroy");
-        processor.visitMethod(method, type);
-        assertNotNull(type.getDestroyMethod());
-    }
-
-    public void testBadDestroy() throws Exception {
-        DestroyProcessor processor = new DestroyProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = Bar.class.getMethod("badDestroy", String.class);
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalDestructorException e) {
-            // expected
-        }
-    }
-
-    public void testTwoDestroy() throws Exception {
-        DestroyProcessor processor = new DestroyProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = Bar.class.getMethod("destroy");
-        Method method2 = Bar.class.getMethod("destroy2");
-        processor.visitMethod(method, type);
-        try {
-            processor.visitMethod(method2, type);
-            fail();
-        } catch (DuplicateDestructorException e) {
-            // expected
-        }
-    }
-
-    public void testProtectedDestroy() throws Exception {
-        DestroyProcessor processor = new DestroyProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = Bar.class.getDeclaredMethod("protectedDestroy");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalDestructorException e) {
-            // expected
-        }
-    }
-
-    public void testPrivateDestroy() throws Exception {
-        DestroyProcessor processor = new DestroyProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = Bar.class.getDeclaredMethod("privateDestroy");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalDestructorException e) {
-            // expected
-        }
-    }
-
-    private class Foo {
-
-        @Destroy
-        public void destroy() {
-        }
-    }
-
-
-    private class Bar {
-
-        @Destroy
-        public void destroy() {
-        }
-
-        @Destroy
-        public void destroy2() {
-        }
-
-        @Destroy
-        public void badDestroy(String foo) {
-        }
-
-        @Destroy
-        protected void protectedDestroy(){
-        }
-
-        @Destroy
-        private void privateDestroy(){
-        }
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
deleted file mode 100644
index 09bcc7ab6c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.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.java.introspect.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.EagerInit;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EagerInitProcessorTestCase extends TestCase {
-
-    private AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-    
-    public void testNoLevel() throws IntrospectionException {
-        EagerInitProcessor processor = new EagerInitProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(Level.class, type);
-    }
-
-    public void testSubclass() throws IntrospectionException {
-        EagerInitProcessor processor = new EagerInitProcessor(assemblyFactory);
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(SubClass.class, type);
-    }
-
-    @EagerInit
-    private class Level {
-    }
-
-    private class SubClass extends Level {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
deleted file mode 100644
index c7f340bd46..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.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.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.implementation.java.impl.JavaConstructorImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HeuristicAndPropertyTestCase extends TestCase {
-
-    private PropertyProcessor propertyProcessor;
-    private HeuristicPojoProcessor heuristicProcessor;
-    private AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
-    private JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-
-    /**
-     * Verifies the property and heuristic processors don't collide
-     */
-    @SuppressWarnings("unchecked")
-    public void testPropertyProcessorWithHeuristicProcessor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor ctor = Foo.class.getConstructor(String.class);
-        type.setConstructor(new JavaConstructorImpl(ctor));
-        propertyProcessor.visitConstructorParameter(type.getConstructor().getParameters()[0], type);
-        heuristicProcessor.visitEnd(Foo.class, type);
-        assertEquals(1, type.getProperties().size());
-        assertEquals("foo", type.getProperties().get(0).getName());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        propertyProcessor = new PropertyProcessor(assemblyFactory);
-        heuristicProcessor = new HeuristicPojoProcessor(assemblyFactory, new DefaultJavaInterfaceFactory());
-    }
-
-    public static class Foo {
-        public Foo(@Property(name = "foo")
-        String prop) {
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
deleted file mode 100644
index e98a8fec1f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getProperty;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.JavaElementImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HeuristicConstructorTestCase extends AbstractProcessorTest {
-
-    private AssemblyFactory factory;
-    private JavaInterfaceFactory javaFactory;
-    private HeuristicPojoProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public HeuristicConstructorTestCase() {
-        factory = new DefaultAssemblyFactory();
-        javaFactory = new DefaultJavaInterfaceFactory();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        processor = new HeuristicPojoProcessor(factory, javaFactory);
-    }
-
-    private <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        for (Constructor<?> constructor : clazz.getConstructors()) {
-            visitConstructor(constructor, type);
-        }
-        processor.visitEnd(clazz, type);
-    }
-
-    /**
-     * Verifies a single constructor is chosen with a parameter as the type
-     */
-    public void testSingleConstructorWithParam() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        org.apache.tuscany.sca.assembly.Property prop = factory.createProperty();
-        prop.setName("foo");
-        type.getProperties().add(prop);
-        // Hack to add a property member
-        JavaElementImpl element = new JavaElementImpl("foo", String.class, null);
-        type.getPropertyMembers().put("foo", element);
-        visitEnd(Foo1.class, type);
-        assertNotNull(type.getConstructor().getConstructor());
-        assertEquals("foo", type.getConstructor().getParameters()[0].getName());
-    }
-
-    /**
-     * Verifies a single constructor is chosen with a reference as the type
-     */
-    public void testSingleConstructorWithRef() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        org.apache.tuscany.sca.assembly.Reference ref = factory.createReference();
-        ref.setName("foo");
-        type.getReferences().add(ref);
-        type.getReferenceMembers().put("foo", new JavaElementImpl("foo", String.class, null));
-        visitEnd(Foo1.class, type);
-        assertNotNull(type.getConstructor().getConstructor());
-        assertEquals("foo", type.getConstructor().getParameters()[0].getName());
-    }
-
-    /**
-     * Verifies a single constructor is chosen with a property and a reference
-     * as the type
-     */
-    public void testSingleConstructorWithPropRef() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-
-        org.apache.tuscany.sca.assembly.Property prop = factory.createProperty();
-        prop.setName("foo");
-        type.getProperties().add(prop);
-        // Hack to add a property member
-        JavaElementImpl element = new JavaElementImpl("foo", String.class, null);
-        type.getPropertyMembers().put("foo", element);
-
-        org.apache.tuscany.sca.assembly.Reference ref = ModelHelper.createReference(factory, javaFactory, "ref", Foo1.class);
-        type.getReferences().add(ref);
-        type.getReferenceMembers().put("ref", new JavaElementImpl("ref", Foo1.class, null));
-        visitEnd(Foo2.class, type);
-        assertNotNull(type.getConstructor().getConstructor());
-        assertEquals(2, type.getConstructor().getParameters().length);
-    }
-
-    public void testSingleConstructorResolvableParam() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo5.class, type);
-        assertEquals(String.class, type.getPropertyMembers().get("string").getType());
-    }
-
-    public void testSingleConstructorResolvableRef() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo6.class, type);
-        assertTrue(ModelHelper.matches(ModelHelper.getReference(type, "ref"), Ref.class));
-    }
-
-    public void testSingleConstructorAmbiguousRef() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        org.apache.tuscany.sca.assembly.Reference ref = ModelHelper.createReference(factory, javaFactory, "ref", Foo1.class);
-        type.getReferences().add(ref);
-        type.getReferenceMembers().put("ref", new JavaElementImpl("ref", Foo1.class, null));
-        org.apache.tuscany.sca.assembly.Reference ref2 = ModelHelper.createReference(factory, javaFactory, "ref2", Foo1.class);
-        type.getReferences().add(ref2);
-        type.getReferenceMembers().put("ref2", new JavaElementImpl("ref2", Foo1.class, null));
-        try {
-            visitEnd(Foo4.class, type);
-            fail();
-        } catch (AmbiguousConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testConstructorPropertyAnnotatedParamsOnly() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo7.class, type);
-        assertNotNull(getProperty(type, "myProp"));
-    }
-
-    public void testConstructorReferenceAnnotatedParamsOnly() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo8.class, type);
-        assertNotNull(ModelHelper.getReference(type, "myRef"));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testDefaultConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo3.class, type);
-        assertNotNull(type.getConstructor().getConstructor());
-    }
-
-    public void testSameTypesButAnnotated() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo12.class, type);
-        assertEquals(2, type.getProperties().size());
-        assertNotNull(getProperty(type, "prop1"));
-        assertNotNull(getProperty(type, "prop2"));
-    }
-
-    /**
-     * Verifies processing executes with additional extension annotations
-     */
-    public void testRandomAnnotation() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo11.class, type);
-        assertEquals(1, type.getProperties().size());
-        assertNotNull(getProperty(type, "prop1"));
-    }
-
-    public void testPrivateConstructor() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            visitEnd(Foo14.class, type);
-            fail();
-        } catch (NoConstructorException e) {
-            // expected
-        }
-    }
-
-    public void testMultipleConstructors() throws Exception {
-        // throw new UnsupportedOperationException("Finish heuristic multiple
-        // constructors - Foo10");
-    }
-
-    public static class Foo1 {
-        public Foo1(String val) {
-        }
-    }
-
-    public static class Foo2 {
-        public Foo2(String val, Foo1 ref) {
-        }
-    }
-
-    public static class Foo3 {
-    }
-
-    public static class Foo4 {
-        public Foo4(Foo1 ref) {
-        }
-    }
-
-    public static class Prop {
-
-    }
-
-    @Remotable
-    public static interface Ref {
-
-    }
-
-    public static class Foo5 {
-        public Foo5(String val) {
-        }
-    }
-
-    public static class Foo6 {
-        public Foo6(Ref ref) {
-        }
-    }
-
-    public static class Foo7 {
-        public Foo7(@Property(name = "myProp")
-        String prop) {
-        }
-    }
-
-    public static class Foo8 {
-        public Foo8(@Reference(name = "myRef")
-        String ref) {
-        }
-    }
-
-    public static class Foo9 {
-        public Foo9(@Reference(name = "myRef")
-        String ref) {
-        }
-    }
-
-    public static class Foo10 {
-
-        public Foo10() {
-        }
-
-        public Foo10(String prop) {
-        }
-
-        public Foo10(@Property(name = "prop1")
-        String prop1, @Property(name = "prop2")
-        String prop2) {
-
-        }
-    }
-
-    public static class Foo11 {
-
-        public Foo11(@Property(name = "prop1")
-        String prop, @Baz
-        String baz) {
-        }
-    }
-
-    public static class Foo12 {
-
-        public Foo12(@Property(name = "prop1")
-        String prop, @Property(name = "prop2")
-        String baz) {
-        }
-    }
-
-    public @interface Baz {
-
-    }
-
-    public static class Foo13 {
-        public Foo13(@Reference
-        String foo) {
-        }
-    }
-
-    public static final class Foo14 {
-        private Foo14() {
-        }
-    }
-
-    public static final class Foo15 {
-        public Foo15(@Reference
-        String param1, @Reference
-        String param2) {
-        }
-    }
-
-    public static final class Foo16 {
-        public Foo16(@Reference
-        String param1, @Property(name = "foo")
-        String param2, @Reference(name = "bar")
-        String param3) {
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
deleted file mode 100644
index 50a221722f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.introspect.impl;
-
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Verifies component type information is properly introspected from an unadorned
- * POJO according to the SCA Java Client and Implementation Model Specification
- * 
- * @version $Rev$ $Date$
- */
-public class HeuristicPojoProcessorTestCase extends AbstractProcessorTest {
-
-    private org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public HeuristicPojoProcessorTestCase() {
-        processor = new HeuristicPojoProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-    }
-
-    private <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        for (Constructor<?> constructor : clazz.getConstructors()) {
-            visitConstructor(constructor, type);
-        }
-        processor.visitEnd(clazz, type);
-    }
-
-    /**
-     * Verifies a single service interface is computed when only one interface
-     * is implemented
-     */
-    public void testSingleInterface() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<SingleInterfaceImpl> ctor = SingleInterfaceImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<SingleInterfaceImpl>(ctor));
-        processor.visitEnd(SingleInterfaceImpl.class, type);
-        assertEquals(1, type.getServices().size());
-        assertTrue(ModelHelper.matches(ModelHelper.getService(type, PropertyInterface.class.getSimpleName()),
-                                       PropertyInterface.class));
-        assertTrue(type.getProperties().isEmpty());
-        assertTrue(type.getReferences().isEmpty());
-    }
-
-    /**
-     * Verifies property and reference setters are computed
-     */
-    public void testPropertyReference() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<SingleInterfaceWithPropertyReferenceImpl> ctor = SingleInterfaceWithPropertyReferenceImpl.class
-            .getConstructor();
-        type.setConstructor(new JavaConstructorImpl<SingleInterfaceWithPropertyReferenceImpl>(ctor));
-        processor.visitEnd(SingleInterfaceWithPropertyReferenceImpl.class, type);
-        assertEquals(1, type.getServices().size());
-        assertTrue(ModelHelper
-            .matches(ModelHelper.getService(type, Interface1.class.getSimpleName()), Interface1.class));
-        assertEquals(1, type.getProperties().size());
-        org.apache.tuscany.sca.assembly.Property prop = ModelHelper.getProperty(type, "property");
-        assertNotNull(prop);
-        assertEquals(ComplexProperty.class, type.getPropertyMembers().get("property").getType());
-        assertEquals(1, type.getReferences().size());
-        assertTrue(ModelHelper.matches(ModelHelper.getReference(type, "reference"), Ref.class));
-    }
-
-    /**
-     * Verifies that a property setter is not introspected if an analogous
-     * operation is in the service interface
-     */
-    public void testPropertySetterInInterface() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<SingleInterfaceImpl> ctor = SingleInterfaceImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<SingleInterfaceImpl>(ctor));
-        processor.visitEnd(SingleInterfaceImpl.class, type);
-        assertEquals(0, type.getProperties().size());
-    }
-
-    /**
-     * Verifies that a reference setter is not introspected if an analogous
-     * operation is in the service interface
-     */
-    public void testReferenceSetterInInterface() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<RefInterfaceImpl> ctor = RefInterfaceImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<RefInterfaceImpl>(ctor));
-        processor.visitEnd(RefInterfaceImpl.class, type);
-        assertEquals(0, type.getReferences().size());
-    }
-
-    /**
-     * Verifies collection generic types or array types are introspected as
-     * references according to specification rules
-     */
-    public void testReferenceCollectionType() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ReferenceCollectionImpl> ctor = ReferenceCollectionImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<ReferenceCollectionImpl>(ctor));
-        processor.visitEnd(ReferenceCollectionImpl.class, type);
-        assertEquals(1, type.getProperties().size());
-        assertEquals(3, type.getReferences().size());
-    }
-
-    /**
-     * Verifies collection generic types or array types are introspected as
-     * properties according to specification rules
-     */
-    public void testPropertyCollectionType() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<PropertyCollectionImpl> ctor = PropertyCollectionImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<PropertyCollectionImpl>(ctor));
-        processor.visitEnd(PropertyCollectionImpl.class, type);
-        assertEquals(0, type.getReferences().size());
-        assertEquals(4, type.getProperties().size());
-    }
-
-    /**
-     * Verifies references are calculated when the type marked with is
-     * 
-     * @Remotable
-     */
-    public void testRemotableRef() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<RemotableRefImpl> ctor = RemotableRefImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<RemotableRefImpl>(ctor));
-        processor.visitEnd(RemotableRefImpl.class, type);
-        assertEquals(2, type.getReferences().size());
-        assertEquals(0, type.getProperties().size());
-    }
-
-    public void testParentInterface() throws IntrospectionException, NoSuchMethodException {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Child> ctor = Child.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<Child>(ctor));
-        processor.visitEnd(Child.class, type);
-        assertNotNull(ModelHelper.getService(type, Interface1.class.getSimpleName()));
-    }
-
-    /**
-     * Verifies a service interface is calculated when only props and refs are
-     * given
-     */
-    public void testExcludedPropertyAndReference() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        org.apache.tuscany.sca.assembly.Reference ref = factory.createReference();
-        ref.setName("reference");
-        type.getReferences().add(ref);
-        type.getReferenceMembers().put("reference", new JavaElementImpl("reference", Ref.class, null));
-        org.apache.tuscany.sca.assembly.Reference ref2 = factory.createReference();
-        ref2.setName("reference2");
-        type.getReferences().add(ref2);
-        type.getReferenceMembers().put("reference2", new JavaElementImpl("reference2", Ref.class, null));
-        org.apache.tuscany.sca.assembly.Property prop1 = factory.createProperty();
-        prop1.setName("string1");
-        type.getProperties().add(prop1);
-        type.getPropertyMembers().put("string1", new JavaElementImpl("string1", String.class, null));
-        org.apache.tuscany.sca.assembly.Property prop2 = factory.createProperty();
-        prop2.setName("string2");
-        type.getProperties().add(prop2);
-        type.getPropertyMembers().put("string2", new JavaElementImpl("string2", String.class, null));
-        visitEnd(MockService.class, type);
-        assertEquals(1, type.getServices().size());
-    }
-
-    public void testProtectedRemotableRefField() throws IntrospectionException, NoSuchMethodException {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ProtectedRemotableRefFieldImpl> ctor = ProtectedRemotableRefFieldImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<ProtectedRemotableRefFieldImpl>(ctor));
-        processor.visitEnd(ProtectedRemotableRefFieldImpl.class, type);
-        assertNotNull(ModelHelper.getReference(type, "otherRef"));
-    }
-
-    public void testProtectedRemotableRefMethod() throws IntrospectionException, NoSuchMethodException {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<ProtectedRemotableRefMethodImpl> ctor = ProtectedRemotableRefMethodImpl.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<ProtectedRemotableRefMethodImpl>(ctor));
-        processor.visitEnd(ProtectedRemotableRefMethodImpl.class, type);
-        assertNotNull(ModelHelper.getReference(type, "otherRef"));
-    }
-
-    public void testSetDataTypes() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<PropertyIntTypeOnConstructor> ctor = PropertyIntTypeOnConstructor.class.getConstructor();
-        type.setConstructor(new JavaConstructorImpl<PropertyIntTypeOnConstructor>(ctor));
-        processor.visitEnd(PropertyIntTypeOnConstructor.class, type);
-        org.apache.tuscany.sca.assembly.Property foo = ModelHelper.getProperty(type, "foo");
-        assertEquals(int.class, type.getPropertyMembers().get("foo").getType());
-        assertEquals(new QName(JavaXMLMapper.URI_2001_SCHEMA_XSD, "int"), foo.getXSDType());
-    }
-
-    /**
-     * Errata for Java Component Implementation Specification v1.0 corrects the algorithm for determining
-     * references of an unannotated POJO (section 1.2.7).  This test makes sure that the earlier implementation
-     * is corrected as per the errata.  A notable difference is that the interfaces annotated with @Service
-     * no longer result in references.
-     */
-    public void testUpdatedRule() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(SomeServiceImpl.class, type);
-        assertEquals(12, type.getReferenceMembers().size());
-        assertTrue(type.getReferenceMembers().containsKey("rri1"));
-        assertTrue(type.getReferenceMembers().containsKey("rri2"));
-        assertTrue(type.getReferenceMembers().containsKey("rri3"));
-        assertTrue(type.getReferenceMembers().containsKey("rri4"));
-
-        assertTrue(type.getReferenceMembers().containsKey("rria1"));
-        assertTrue(type.getReferenceMembers().containsKey("rria2"));
-        assertTrue(type.getReferenceMembers().containsKey("rria3"));
-        assertTrue(type.getReferenceMembers().containsKey("rria4"));
-
-        assertTrue(type.getReferenceMembers().containsKey("rric1"));
-        assertTrue(type.getReferenceMembers().containsKey("rric2"));
-        assertTrue(type.getReferenceMembers().containsKey("rric3"));
-        assertTrue(type.getReferenceMembers().containsKey("rric4"));
-        
-        assertEquals(16, type.getPropertyMembers().size());
-        assertTrue(type.getPropertyMembers().containsKey("pnri1"));
-        assertTrue(type.getPropertyMembers().containsKey("pnri2"));
-        assertTrue(type.getPropertyMembers().containsKey("pnri3"));
-        assertTrue(type.getPropertyMembers().containsKey("pnri4"));
-
-        assertTrue(type.getPropertyMembers().containsKey("pnria1"));
-        assertTrue(type.getPropertyMembers().containsKey("pnria2"));
-        assertTrue(type.getPropertyMembers().containsKey("pnria3"));
-        assertTrue(type.getPropertyMembers().containsKey("pnria4"));
-
-        assertTrue(type.getPropertyMembers().containsKey("pnric1"));
-        assertTrue(type.getPropertyMembers().containsKey("pnric2"));
-        assertTrue(type.getPropertyMembers().containsKey("pnric3"));
-        assertTrue(type.getPropertyMembers().containsKey("pnric4"));
-        
-        assertTrue(type.getPropertyMembers().containsKey("gen1"));
-        assertTrue(type.getPropertyMembers().containsKey("gen2"));
-        assertTrue(type.getPropertyMembers().containsKey("gen3"));
-        assertTrue(type.getPropertyMembers().containsKey("gen4"));
-    }
-
-    @Remotable
-    private interface ReferenceRemotableInterface {
-        void operation1(String param1);
-    }
-
-    @Service
-    private interface PropertyNonRemotableInterface {
-        void operation1(String param1);
-    }
-    
-    @Remotable
-    private interface SomeService {
-        void serviceOperation1();
-    }
-
-    private static class SomeServiceImpl implements SomeService {
-        
-        public SomeServiceImpl() {
-        }
-        
-        // References - interface with @Remotable
-        public void setRri1(ReferenceRemotableInterface rri) {
-        }
-        protected void setRri2(ReferenceRemotableInterface rri) {
-        }
-        public ReferenceRemotableInterface rri3;
-        protected ReferenceRemotableInterface rri4;
-        
-        // References - array of interface with @Remotable
-        public void setRria1(ReferenceRemotableInterface[] rri) {
-        }
-        protected void setRria2(ReferenceRemotableInterface[] rri) {
-        }
-        public ReferenceRemotableInterface[] rria3;
-        protected ReferenceRemotableInterface[] rria4;
-
-        // References - parametrized Collection of interface with @Remotable
-        public void setRric1(Collection<ReferenceRemotableInterface> rri) {
-        }
-        protected void setRric2(Collection<ReferenceRemotableInterface> rri) {
-        }
-        public Collection<ReferenceRemotableInterface> rric3;
-        protected Collection<ReferenceRemotableInterface> rric4;
-
-        // Properties - interface with @Service and without @Remotable
-        public void setPnri1(PropertyNonRemotableInterface arg) {
-        }
-        protected void setPnri2(PropertyNonRemotableInterface arg) {
-        }
-        public PropertyNonRemotableInterface pnri3;
-        protected PropertyNonRemotableInterface pnri4;
-
-        // Properties - array of interface with @Service and without @Remotable
-        public void setPnria1(PropertyNonRemotableInterface[] arg) {
-        }
-        protected void setPnria2(PropertyNonRemotableInterface[] arg) {
-        }
-        public PropertyNonRemotableInterface[] pnria3;
-        protected PropertyNonRemotableInterface[] pnria4;
-
-        // Properties - parametrized Collection of interface with @Service and without @Remotable
-        public void setPnric1(Collection<PropertyNonRemotableInterface> arg) {
-        }
-        protected void setPnric2(Collection<PropertyNonRemotableInterface> arg) {
-        }
-        public Collection<PropertyNonRemotableInterface> pnric3;
-        protected Collection<PropertyNonRemotableInterface> pnric4;
-        
-        // Properties - Non-parametrized Collection
-        public void setGen1(Collection arg) {
-        }
-        protected void setGen2(Collection arg) {
-        }
-        public Collection gen3;
-        protected Collection gen4;
-        
-        public void serviceOperation1() {
-        }
-    }
-
-    private static class PropertyIntTypeOnConstructor {
-        protected int foo;
-
-        public PropertyIntTypeOnConstructor() {
-        }
-
-        public int getFoo() {
-            return foo;
-        }
-    }
-
-    @Remotable
-    private interface PropertyInterface {
-        void setString1(String val);
-    }
-
-    @Remotable
-    private interface Interface1 {
-    }
-
-    private static class Parent implements Interface1 {
-
-    }
-
-    private static class Child extends Parent {
-        public Child() {
-        }
-
-    }
-
-    private static class SingleInterfaceImpl implements PropertyInterface {
-        public SingleInterfaceImpl() {
-        }
-
-        public void setString1(String val) {
-        }
-
-    }
-
-    private interface HeuristicServiceInterface {
-        void fooOperation(String ref);
-
-        void setInvalid1(); // No parameter
-
-        void setInvalid2(String str, int i); // More than one parameter
-
-        String setInvalid3(String str); // return should be void
-    }
-
-    public static class MockService implements PropertyInterface, RefInterface, HeuristicServiceInterface {
-
-        @Property
-        public void setString1(String val) {
-        }
-
-        @Property
-        public void setString2(String val) {
-        }
-
-        @Reference
-        public void setReference(Ref ref) {
-        }
-
-        @Reference
-        public void setReference2(Ref ref) {
-        }
-
-        public void fooOperation(String ref) {
-
-        }
-
-        public void setInvalid1() {
-        }
-
-        public void setInvalid2(String str, int i) {
-        }
-
-        public String setInvalid3(String str) {
-            return null;
-        }
-
-    }
-
-    @Remotable
-    private interface Ref {
-    }
-
-    private class ComplexProperty {
-    }
-
-    private interface RefInterface {
-        void setReference(Ref ref);
-    }
-
-    private static class RefInterfaceImpl implements RefInterface {
-        public RefInterfaceImpl() {
-        }
-
-        public void setReference(Ref ref) {
-        }
-    }
-
-    private static class SingleInterfaceWithPropertyReferenceImpl implements Interface1 {
-        public SingleInterfaceWithPropertyReferenceImpl() {
-        }
-
-        public void setReference(Ref ref) {
-        }
-
-        public void setProperty(ComplexProperty prop) {
-        }
-    }
-
-    private static class ReferenceCollectionImpl implements Interface1 {
-        public ReferenceCollectionImpl() {
-        }
-
-        public void setCollectionReference(Collection<Ref> ref) {
-        }
-
-        public void setNonGenericCollectionReference(Collection ref) {
-            // [rfeng] By the SCA specification, this should be classified as property
-        }
-
-        public void setListReference(List<Ref> ref) {
-        }
-
-        public void setArrayReference(Ref[] ref) {
-        }
-    }
-
-    private static class PropertyCollectionImpl implements Interface1 {
-        public PropertyCollectionImpl() {
-        }
-
-        public void setCollectionProperty(Collection<ComplexProperty> prop) {
-        }
-
-        public void setCollectionProperty2(Collection<String> prop) {
-        }
-
-        public void setArrayProperty(ComplexProperty[] prop) {
-        }
-
-        public void setArrayProperty2(String[] prop) {
-        }
-    }
-
-    @Remotable
-    private interface RemotableRef {
-    }
-
-    private static class RemotableRefImpl implements Interface1 {
-        protected RemotableRef otherRef;
-
-        public RemotableRefImpl() {
-        }
-
-        public void setRef(RemotableRef ref) {
-
-        }
-    }
-
-    private static class ProtectedRemotableRefFieldImpl implements Interface1 {
-        protected RemotableRef otherRef;
-
-        public ProtectedRemotableRefFieldImpl() {
-        }
-
-        public ProtectedRemotableRefFieldImpl(RemotableRef otherRef) {
-            this.otherRef = otherRef;
-        }
-
-    }
-
-    private static class ProtectedRemotableRefMethodImpl implements Interface1 {
-        public ProtectedRemotableRefMethodImpl() {
-        }
-
-        protected void setOtherRef(RemotableRef otherRef) {
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
deleted file mode 100644
index ed0527d3d7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.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.implementation.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Property;
-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.JavaConstructorImpl;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-
-/**
- * Verifies constructors that have extensible annotation types, i.e. that have
- * parameters marked by annotations which are themselves processed by some other
- * implementation processor
- * 
- * @version $Rev$ $Date$
- */
-public class HeutisticExtensibleConstructorTestCase extends AbstractProcessorTest {
-
-    private org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public HeutisticExtensibleConstructorTestCase() {
-        processor = new HeuristicPojoProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-    }
-
-    private <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
-        for (Constructor<?> constructor : clazz.getConstructors()) {
-            visitConstructor(constructor, type);
-        }
-        processor.visitEnd(clazz, type);
-    }
-
-    /**
-     * Verifies heuristic processing can be called prior to an extension
-     * annotation processors being called.
-     */
-    public void testBarAnnotationProcessedFirst() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo> ctor = Foo.class.getConstructor(String.class, String.class);
-        JavaConstructorImpl<Foo> definition = new JavaConstructorImpl<Foo>(ctor);
-        type.setConstructor(definition);
-        Property property = factory.createProperty();
-        property.setName("myBar");
-        definition.getParameters()[0].setName("myBar");
-        type.getProperties().add(property);
-        visitEnd(Foo.class, type);
-        assertEquals(2, type.getProperties().size());
-    }
-
-    /**
-     * Verifies heuristic processing can be called before an extension
-     * annotation processors is called. <p/> For example, given:
-     * 
-     * <pre>
-     *  Foo(@Bar String prop, @org.osoa.sca.annotations.Property(name = &quot;foo&quot;) String prop2)
-     * </pre>
-     * 
-     * <p/> Heuristic evaluation of
-     * @Property can occur prior to another implementation processor evaluating
-     * @Bar
-     * @throws Exception
-     */
-    public void testBarAnnotationProcessedLast() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        visitEnd(Foo.class, type);
-
-        // now simulate process the bar impl
-        JavaConstructorImpl<?> definition = type.getConstructor();
-        definition.getParameters()[0].setName("myBar");
-        Property property = factory.createProperty();
-        property.setName("myBar");
-        type.getProperties().add(property);
-
-        assertEquals(2, type.getProperties().size());
-        assertEquals("foo", definition.getParameters()[1].getName());
-    }
-
-    /**
-     * Verifies heuristic processing can be called before an extension
-     * annotation processors is called with the extension parameter in a middle
-     * position. Specifically, verifies that the heuristic processor updates
-     * injection names and preserves their ordering.
-     */
-    public void testBarAnnotationProcessedFirstInMiddle() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Constructor<Foo2> ctor = Foo2.class.getConstructor(String.class, String.class, String.class);
-        JavaConstructorImpl<Foo2> definition = new JavaConstructorImpl<Foo2>(ctor);
-        type.setConstructor(definition);
-        // insert placeholder for first param, which would be done by a
-        // processor
-        definition.getParameters()[0].setName("");
-        Property property = factory.createProperty();
-        // Hack to add a property member
-        JavaElementImpl element = new JavaElementImpl("myBar", String.class, null);
-        type.getPropertyMembers().put("myBar", element);
-        property.setName("myBar");
-        definition.getParameters()[1].setName("myBar");
-        type.getProperties().add(property);
-        visitEnd(Foo2.class, type);
-        assertEquals("baz", definition.getParameters()[0].getName());
-        assertEquals(2, type.getProperties().size());
-        assertEquals(1, type.getReferences().size());
-    }
-
-    public @interface Bar {
-
-    }
-
-    public static class Foo {
-        public Foo(@Bar
-        String prop, @org.osoa.sca.annotations.Property(name = "foo")
-        String prop2) {
-        }
-    }
-
-    public static class Foo2 {
-        public Foo2(@org.osoa.sca.annotations.Reference(name = "baz")
-        String prop1, @Bar
-        String prop2, @org.osoa.sca.annotations.Property(name = "foo")
-        String prop3) {
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
deleted file mode 100644
index 70c615ca24..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.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.java.introspect.impl;
-
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.osoa.sca.annotations.Init;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InitProcessorTestCase extends TestCase {
-    
-    private JavaImplementationFactory javaImplementationFactory;
-    
-    public InitProcessorTestCase() {
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-    }
-
-    public void testInit() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Foo.class.getMethod("init");
-        processor.visitMethod(method, type);
-        assertNotNull(type.getInitMethod());
-    }
-
-    public void testBadInit() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Bar.class.getMethod("badInit", String.class);
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalInitException e) {
-            // expected
-        }
-    }
-
-    public void testTwoInit() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Bar.class.getMethod("init");
-        Method method2 = InitProcessorTestCase.Bar.class.getMethod("init2");
-        processor.visitMethod(method, type);
-        try {
-            processor.visitMethod(method2, type);
-            fail();
-        } catch (DuplicateInitException e) {
-            // expected
-        }
-    }
-    
-    public void testProtectedInit() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Bar.class.getDeclaredMethod("protectedInit");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalInitException e) {
-            // expected
-        }
-    }
-
-    public void testPrivateInit() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Bar.class.getDeclaredMethod("privateInit");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalInitException e) {
-            // expected
-        }
-    }
-
-    public void testBadInit2() throws Exception {
-        InitProcessor processor = new InitProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        Method method = InitProcessorTestCase.Bar.class.getDeclaredMethod("badInit2");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalInitException e) {
-            // expected
-        }
-    }
-
-    private class Foo {
-        @Init
-        public void init() {
-        }
-    }
-
-
-    private class Bar {
-        @Init
-        public void init() {
-        }
-
-        @Init
-        public void init2() {
-        }
-
-        @Init
-        public void badInit(String foo) {
-        }
-        
-        @Init
-        public String badInit2() {
-            return null;
-        }        
-
-        @Init
-        protected void protectedInit() {
-        }
-
-        @Init
-        private void privateInit() {
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
deleted file mode 100644
index 388a1aae8b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.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.java.introspect.impl;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-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.implementation.java.introspect.JavaClassVisitor;
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaClassIntrospectorImplTestCase extends TestCase {
-
-    public void testRegister() throws Exception {
-        JavaImplementationFactory factory = new DefaultJavaImplementationFactory();
-        JavaClassVisitor extension = EasyMock.createNiceMock(JavaClassVisitor.class);
-        factory.addClassVisitor(extension);
-    }
-
-    public void testUnegister() throws Exception {
-        JavaImplementationFactory factory = new DefaultJavaImplementationFactory();
-        JavaClassVisitor extension = EasyMock.createNiceMock(JavaClassVisitor.class);
-        factory.addClassVisitor(extension);
-        factory.removeClassVisitor(extension);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testWalk() throws Exception {
-        JavaImplementationFactory factory = new DefaultJavaImplementationFactory();
-        JavaClassVisitor extension = EasyMock.createMock(JavaClassVisitor.class);
-        extension.visitClass(EasyMock.eq(Bar.class), EasyMock.isA(JavaImplementation.class));
-        extension.visitConstructor(EasyMock.isA(Constructor.class), EasyMock.isA(JavaImplementation.class));
-        extension.visitMethod(EasyMock.isA(Method.class), EasyMock.isA(JavaImplementation.class));
-        extension.visitField(EasyMock.isA(Field.class), EasyMock.isA(JavaImplementation.class));
-        extension.visitSuperClass(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementation.class));
-        extension.visitEnd(EasyMock.isA(Class.class), EasyMock.isA(JavaImplementation.class));
-
-        // mock.expects(once()).method("visitClass");
-        // mock.expects(once()).method("visitMethod");
-        // mock.expects(once()).method("visitField");
-        // mock.expects(once()).method("visitConstructor");
-        // mock.expects(once()).method("visitSuperClass");
-        // mock.expects(once()).method("visitEnd");
-        EasyMock.replay(extension);
-        factory.addClassVisitor(extension);
-        factory.createJavaImplementation(Bar.class);
-        EasyMock.verify(extension);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    private class Baz {
-
-    }
-
-    private class Bar extends Baz {
-
-        protected String bar;
-
-        public Bar() {
-        }
-
-        public void bar() {
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
deleted file mode 100644
index aad6b96cf9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.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.implementation.java.introspect.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Contract;
-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.java.JavaImplementation;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ModelHelper {
-
-    public static Property getProperty(JavaImplementation type, String name) {
-        for (Property prop : type.getProperties()) {
-            if (prop.getName().equals(name)) {
-                return prop;
-            }
-        }
-        return null;
-    }
-
-    public static Reference getReference(JavaImplementation type, String name) {
-        for (Reference ref : type.getReferences()) {
-            if (ref.getName().equals(name)) {
-                return ref;
-            }
-        }
-        return null;
-    }
-
-    public static Service getService(JavaImplementation type, String name) {
-        for (Service svc : type.getServices()) {
-            if (svc.getName().equals(name)) {
-                return svc;
-            }
-        }
-        return null;
-    }
-
-    public static boolean matches(Contract contract, Class<?> type) {
-        Interface interface1 = contract.getInterfaceContract().getInterface();
-        if (interface1 instanceof JavaInterface) {
-            return type == ((JavaInterface)interface1).getJavaClass();
-        } else {
-            return false;
-        }
-    }
-
-    public static ComponentService createService(AssemblyFactory factory,
-                                                 JavaInterfaceFactory javaFactory, Class<?> type) {
-        org.apache.tuscany.sca.assembly.ComponentService ref = factory.createComponentService();
-        ref.setName(type.getSimpleName());
-        JavaInterface i = javaFactory.createJavaInterface();
-        i.setJavaClass(type);
-        JavaInterfaceContract ic = javaFactory.createJavaInterfaceContract();
-        ic.setInterface(i);
-        ref.setInterfaceContract(ic);
-        return ref;
-    }
-
-    public static Reference createReference(AssemblyFactory factory,
-                                            JavaInterfaceFactory javaFactory, String name, Class<?> type) {
-        org.apache.tuscany.sca.assembly.Reference ref = factory.createReference();
-        ref.setName(name);
-        JavaInterface i = javaFactory.createJavaInterface();
-        i.setJavaClass(type);
-        JavaInterfaceContract ic = javaFactory.createJavaInterfaceContract();
-        ic.setInterface(i);
-        ref.setInterfaceContract(ic);
-        return ref;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
deleted file mode 100644
index 4a625982b0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCase extends TestCase {
-    private ServiceProcessor serviceProcessor;
-    private PolicyProcessor policyProcessor;
-    private PolicyJavaInterfaceVisitor visitor;
-    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 {
-        serviceProcessor.visitClass(Service1.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service1.class, type);
-        verifyIntents(Service1.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        serviceProcessor.visitClass(Service2.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service2.class, type);
-        verifyIntents(Service2.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service3.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service3.class, type);
-        verifyIntents(Service3.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service4.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service4.class, type);
-        verifyIntents(Service4.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnInterfaceAtMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service5.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service5.class, type);
-        verifyIntents(Service5.class, type);
-    }
-
-    public void testSingleInterfaceWithIntentsOnServiceAndInterfaceAtImplAndInertfaceAndMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service6.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        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();
-        serviceProcessor = new ServiceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        policyProcessor = new PolicyProcessor(new DefaultAssemblyFactory(), new DefaultPolicyFactory());
-        visitor = new PolicyJavaInterfaceVisitor(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/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
deleted file mode 100644
index 8d5e816a08..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getProperty;
-
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.implementation.java.impl.JavaElementImpl;
-import org.osoa.sca.annotations.Property;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PropertyProcessorTestCase extends TestCase {
-
-    JavaImplementation type;
-    PropertyProcessor processor;
-
-    public void testMethodAnnotation() throws Exception {
-        processor.visitMethod(Foo.class.getMethod("setFoo", String.class), type);
-        assertNotNull(getProperty(type, "foo"));
-    }
-
-    public void testMethodRequired() throws Exception {
-        processor.visitMethod(Foo.class.getMethod("setFooRequired", String.class), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "fooRequired");
-        assertNotNull(prop);
-        assertTrue(prop.isMustSupply());
-    }
-
-    public void testMethodName() throws Exception {
-        processor.visitMethod(Foo.class.getMethod("setBarMethod", String.class), type);
-        assertNotNull(getProperty(type, "bar"));
-    }
-
-    public void testFieldAnnotation() throws Exception {
-        processor.visitField(Foo.class.getDeclaredField("baz"), type);
-        assertNotNull(getProperty(type, "baz"));
-    }
-
-    public void testFieldRequired() throws Exception {
-        processor.visitField(Foo.class.getDeclaredField("bazRequired"), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "bazRequired");
-        assertNotNull(prop);
-        assertTrue(prop.isMustSupply());
-    }
-
-    public void testFieldName() throws Exception {
-        processor.visitField(Foo.class.getDeclaredField("bazField"), type);
-        assertNotNull(getProperty(type, "theBaz"));
-    }
-
-    public void testDuplicateFields() throws Exception {
-        processor.visitField(Bar.class.getDeclaredField("dup"), type);
-        try {
-            processor.visitField(Bar.class.getDeclaredField("baz"), type);
-            fail();
-        } catch (DuplicatePropertyException e) {
-            // expected
-        }
-    }
-
-    public void testDuplicateMethods() throws Exception {
-        processor.visitMethod(Bar.class.getMethod("setDupMethod", String.class), type);
-        try {
-            processor.visitMethod(Bar.class.getMethod("setDupSomeMethod", String.class), type);
-            fail();
-        } catch (DuplicatePropertyException e) {
-            // expected
-        }
-    }
-
-    public void testInvalidProperty() throws Exception {
-        try {
-            processor.visitMethod(Bar.class.getMethod("badMethod"), type);
-            fail();
-        } catch (IllegalPropertyException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-        processor = new PropertyProcessor(new DefaultAssemblyFactory());
-    }
-
-    private class Foo {
-
-        @Property
-        protected String baz;
-        @Property(required = true)
-        protected String bazRequired;
-        @Property(name = "theBaz")
-        protected String bazField;
-
-        @Property
-        public void setFoo(String string) {
-        }
-
-        @Property(required = true)
-        public void setFooRequired(String string) {
-        }
-
-        @Property(name = "bar")
-        public void setBarMethod(String string) {
-        }
-
-    }
-
-    private class Bar {
-
-        @Property
-        protected String dup;
-
-        @Property(name = "dup")
-        protected String baz;
-
-        @Property
-        public void setDupMethod(String s) {
-        }
-
-        @Property(name = "dupMethod")
-        public void setDupSomeMethod(String s) {
-        }
-
-        @Property
-        public void badMethod() {
-        }
-
-    }
-
-    private class Multiple {
-        @Property
-        protected List<String> refs1;
-
-        @Property
-        protected String[] refs2;
-
-        @Property
-        public void setRefs3(String[] refs) {
-        }
-
-        @Property
-        public void setRefs4(Collection<String> refs) {
-        }
-
-    }
-
-    private Class<?> getBaseType(JavaElementImpl element) {
-        return JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-    }
-
-    public void testMultiplicityCollection() throws Exception {
-        processor.visitField(Multiple.class.getDeclaredField("refs1"), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "refs1");
-        assertNotNull(prop);
-        assertSame(String.class, getBaseType(type.getPropertyMembers().get(prop.getName())));
-        assertTrue(prop.isMany());
-    }
-
-    public void testMultiplicityArray() throws Exception {
-        processor.visitField(Multiple.class.getDeclaredField("refs2"), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "refs2");
-        assertNotNull(prop);
-        assertSame(String.class, getBaseType(type.getPropertyMembers().get(prop.getName())));
-        assertTrue(prop.isMany());
-    }
-
-    public void testMultiplicityArrayMethod() throws Exception {
-        processor.visitMethod(Multiple.class.getMethod("setRefs3", String[].class), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "refs3");
-        assertNotNull(prop);
-        assertSame(String.class, getBaseType(type.getPropertyMembers().get(prop.getName())));
-        assertTrue(prop.isMany());
-    }
-
-    public void testMultiplicityCollectionMethod() throws Exception {
-        processor.visitMethod(Multiple.class.getMethod("setRefs4", Collection.class), type);
-        org.apache.tuscany.sca.assembly.Property prop = getProperty(type, "refs4");
-        assertNotNull(prop);
-        assertSame(String.class, getBaseType(type.getPropertyMembers().get(prop.getName())));
-        assertTrue(prop.isMany());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
deleted file mode 100644
index d68b1530f0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.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.sca.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getReference;
-
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Multiplicity;
-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.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReferenceProcessorTestCase extends TestCase {
-
-    private JavaImplementation type;
-    private ReferenceProcessor processor;
-
-    public void testMethodAnnotation() throws Exception {
-        processor.visitMethod(ReferenceProcessorTestCase.Foo.class.getMethod("setFoo", Ref.class), type);
-        org.apache.tuscany.sca.assembly.Reference reference = getReference(type, "foo");
-        assertNotNull(reference);
-        assertEquals(Ref.class, ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass());
-    }
-
-    public void testMethodRequired() throws Exception {
-        processor.visitMethod(ReferenceProcessorTestCase.Foo.class.getMethod("setFooRequired", Ref.class), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "fooRequired");
-        assertNotNull(ref);
-        assertEquals(Multiplicity.ONE_ONE, ref.getMultiplicity());
-    }
-
-    public void testMethodName() throws Exception {
-        processor.visitMethod(ReferenceProcessorTestCase.Foo.class.getMethod("setBarMethod", Ref.class), type);
-        assertNotNull(getReference(type, "bar"));
-    }
-
-    public void testFieldAnnotation() throws Exception {
-        processor.visitField(ReferenceProcessorTestCase.Foo.class.getDeclaredField("baz"), type);
-        org.apache.tuscany.sca.assembly.Reference reference = getReference(type, "baz");
-        assertNotNull(reference);
-        assertEquals(Ref.class, ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass());
-    }
-
-    public void testFieldRequired() throws Exception {
-        processor.visitField(ReferenceProcessorTestCase.Foo.class.getDeclaredField("bazRequired"), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "bazRequired");
-        assertNotNull(ref);
-        assertEquals(Multiplicity.ONE_ONE, ref.getMultiplicity());
-    }
-
-    public void testFieldName() throws Exception {
-        processor.visitField(ReferenceProcessorTestCase.Foo.class.getDeclaredField("bazField"), type);
-        assertNotNull(getReference(type, "theBaz"));
-    }
-
-    public void testDuplicateFields() throws Exception {
-        processor.visitField(ReferenceProcessorTestCase.Bar.class.getDeclaredField("dup"), type);
-        try {
-            processor.visitField(ReferenceProcessorTestCase.Bar.class.getDeclaredField("baz"), type);
-            fail();
-        } catch (DuplicateReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testDuplicateMethods() throws Exception {
-        processor.visitMethod(ReferenceProcessorTestCase.Bar.class.getMethod("setDupMethod", Ref.class), type);
-        try {
-            processor.visitMethod(ReferenceProcessorTestCase.Bar.class.getMethod("setDupSomeMethod", Ref.class), type);
-            fail();
-        } catch (DuplicateReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testInvalidProperty() throws Exception {
-        try {
-            processor.visitMethod(ReferenceProcessorTestCase.Bar.class.getMethod("badMethod"), type);
-            fail();
-        } catch (IllegalReferenceException e) {
-            // expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-        processor = new ReferenceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-    }
-
-    private interface Ref {
-    }
-
-    private class Foo {
-
-        @Reference
-        protected Ref baz;
-        @Reference(required = true)
-        protected Ref bazRequired;
-        @Reference(name = "theBaz")
-        protected Ref bazField;
-
-        @Reference
-        public void setFoo(Ref ref) {
-        }
-
-        @Reference(required = true)
-        public void setFooRequired(Ref ref) {
-        }
-
-        @Reference(name = "bar")
-        public void setBarMethod(Ref ref) {
-        }
-
-    }
-
-    private class Bar {
-
-        @Reference
-        protected Ref dup;
-
-        @Reference(name = "dup")
-        protected Ref baz;
-
-        @Reference
-        public void setDupMethod(Ref s) {
-        }
-
-        @Reference(name = "dupMethod")
-        public void setDupSomeMethod(Ref s) {
-        }
-
-        @Reference
-        public void badMethod() {
-        }
-
-    }
-
-    private class Multiple {
-        @Reference(required = true)
-        protected List<Ref> refs1;
-
-        @Reference(required = false)
-        protected Ref[] refs2;
-
-        @Reference(required = true)
-        public void setRefs3(Ref[] refs) {
-        }
-
-        @Reference(required = false)
-        public void setRefs4(Collection<Ref> refs) {
-        }
-
-    }
-
-    public void testMultiplicity1ToN() throws Exception {
-        processor.visitField(Multiple.class.getDeclaredField("refs1"), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "refs1");
-        assertNotNull(ref);
-        assertSame(Ref.class, ((JavaInterface)ref.getInterfaceContract().getInterface()).getJavaClass());
-        assertEquals(Multiplicity.ONE_N, ref.getMultiplicity());
-        // assertEquals(Multiplicity.ONE_ONE, ref.getMultiplicity());
-    }
-
-    public void testMultiplicityTo0ToN() throws Exception {
-        processor.visitField(Multiple.class.getDeclaredField("refs2"), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "refs2");
-        assertNotNull(ref);
-        assertSame(Ref.class, ((JavaInterface)ref.getInterfaceContract().getInterface()).getJavaClass());
-        assertEquals(Multiplicity.ZERO_N, ref.getMultiplicity());
-        // assertFalse(ref.isMustSupply());
-    }
-
-    public void testMultiplicity1ToNMethod() throws Exception {
-        processor.visitMethod(Multiple.class.getMethod("setRefs3", Ref[].class), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "refs3");
-        assertNotNull(ref);
-        assertSame(Ref.class, ((JavaInterface)ref.getInterfaceContract().getInterface()).getJavaClass());
-        assertEquals(Multiplicity.ONE_N, ref.getMultiplicity());
-        // assertEquals(Multiplicity.ONE_ONE, ref.getMultiplicity());
-    }
-
-    public void testMultiplicity0ToNMethod() throws Exception {
-        processor.visitMethod(Multiple.class.getMethod("setRefs4", Collection.class), type);
-        org.apache.tuscany.sca.assembly.Reference ref = getReference(type, "refs4");
-        assertNotNull(ref);
-        assertSame(Ref.class, ((JavaInterface)ref.getInterfaceContract().getInterface()).getJavaClass());
-        assertEquals(Multiplicity.ZERO_N, ref.getMultiplicity());
-        // assertFalse(ref.isMustSupply());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
deleted file mode 100644
index 7bb8e15696..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.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.java.introspect.impl;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.implementation.java.impl.JavaResourceImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ResourceProcessorTestCase extends TestCase {
-
-    JavaImplementation type;
-    ResourceProcessor processor = new ResourceProcessor(new DefaultAssemblyFactory());
-
-    public void testVisitField() throws Exception {
-        Field field = Foo.class.getDeclaredField("bar");
-        processor.visitField(field, type);
-        JavaResourceImpl resource = type.getResources().get("bar");
-        assertFalse(resource.isOptional());
-        assertNull(resource.getMappedName());
-        assertEquals(field.getType(), resource.getElement().getType());
-    }
-
-    public void testVisitMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBar", Bar.class);
-        processor.visitMethod(method, type);
-        JavaResourceImpl resource = type.getResources().get("bar");
-        assertFalse(resource.isOptional());
-        assertNull(resource.getMappedName());
-        assertEquals(method.getParameterTypes()[0], resource.getElement().getType());
-    }
-
-    public void testVisitNamedMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBar2", Bar.class);
-        processor.visitMethod(method, type);
-        JavaResourceImpl resource = type.getResources().get("someName");
-        assertFalse(resource.isOptional());
-        assertEquals("mapped", resource.getMappedName());
-    }
-
-    public void testVisitBadMethod() throws Exception {
-        Method method = Foo.class.getMethod("setBad");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalResourceException e) {
-            // expected
-        }
-    }
-
-    public void testDuplicateResources() throws Exception {
-        Field field = Foo.class.getDeclaredField("bar");
-        processor.visitField(field, type);
-        try {
-            processor.visitField(field, type);
-            fail();
-        } catch (DuplicateResourceException e) {
-            //expected
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-    }
-
-    private class Foo {
-
-        @org.apache.tuscany.sca.implementation.java.introspect.impl.Resource
-        protected Bar bar;
-
-        @org.apache.tuscany.sca.implementation.java.introspect.impl.Resource(optional = true)
-        protected Bar barNotRequired;
-
-        @org.apache.tuscany.sca.implementation.java.introspect.impl.Resource
-        public void setBar(Bar bar) {
-        }
-
-        @org.apache.tuscany.sca.implementation.java.introspect.impl.Resource(name = "someName", mappedName = "mapped")
-        public void setBar2(Bar bar) {
-        }
-
-        @org.apache.tuscany.sca.implementation.java.introspect.impl.Resource
-        public void setBad() {
-        }
-
-    }
-
-    private interface Bar {
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
deleted file mode 100644
index d7de4e522e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.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.java.introspect.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ScopeProcessorTestCase extends TestCase {
-
-    Component parent;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    public void testCompositeScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-
-        processor.visitClass(Composite.class, type);
-        assertEquals(JavaScopeImpl.COMPOSITE, type.getJavaScope());
-    }
-
-    public void testSessionScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(Session.class, type);
-        assertEquals(JavaScopeImpl.SESSION, type.getJavaScope());
-    }
-
-    public void testConversationalScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(Conversation.class, type);
-        assertEquals(JavaScopeImpl.CONVERSATION, type.getJavaScope());
-    }
-
-    public void testRequestScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(Request.class, type);
-        assertEquals(JavaScopeImpl.REQUEST, type.getJavaScope());
-    }
-
-    public void testStatelessScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(Stateless.class, type);
-        assertEquals(JavaScopeImpl.STATELESS, type.getJavaScope());
-    }
-
-    public void testNoScope() throws IntrospectionException {
-        ScopeProcessor processor = new ScopeProcessor(new DefaultAssemblyFactory());
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(None.class, type);
-        assertEquals(JavaScopeImpl.STATELESS, type.getJavaScope());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-        parent = EasyMock.createNiceMock(Component.class);
-    }
-
-    @org.osoa.sca.annotations.Scope("COMPOSITE")
-    private class Composite {
-    }
-
-    @org.osoa.sca.annotations.Scope("SESSION")
-    private class Session {
-    }
-
-    @org.osoa.sca.annotations.Scope("CONVERSATION")
-    private class Conversation {
-    }
-
-    @org.osoa.sca.annotations.Scope("REQUEST")
-    private class Request {
-    }
-
-    @org.osoa.sca.annotations.Scope("STATELESS")
-    private class Stateless {
-    }
-
-    private class None {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
deleted file mode 100644
index 10f0500e4d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.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.implementation.java.introspect.impl;
-
-import static org.apache.tuscany.sca.implementation.java.introspect.impl.ModelHelper.getService;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.interfacedef.InvalidCallbackException;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceCallbackTestCase extends TestCase {
-    private ServiceProcessor processor;
-    private JavaImplementationFactory javaImplementationFactory;
-
-    @Override
-    protected void setUp() throws Exception {
-        processor = new ServiceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        javaImplementationFactory = new DefaultJavaImplementationFactory();
-    }
-
-    public void testMethodCallbackInterface() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooImpl.class, type);
-        org.apache.tuscany.sca.assembly.Service service = getService(type, Foo.class.getSimpleName());
-        assertNotNull(service);
-        Method method = FooImpl.class.getMethod("setCallback", FooCallback.class);
-        processor.visitMethod(method, type);
-        assertEquals(method, type.getCallbackMembers().get(FooCallback.class.getName()).iterator().next().getAnchor());
-    }
-
-    public void testFieldCallbackInterface() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooImpl.class, type);
-        org.apache.tuscany.sca.assembly.Service service = getService(type, Foo.class.getSimpleName());
-        assertNotNull(service);
-        Field field = FooImpl.class.getDeclaredField("callback");
-        processor.visitField(field, type);
-        assertEquals(field, type.getCallbackMembers().get(FooCallback.class.getName()).iterator().next().getAnchor());
-    }
-
-    public void testFieldCallbackInterface1() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(FooImpl1.class, type);
-        org.apache.tuscany.sca.assembly.Service service = getService(type, Foo.class.getSimpleName());
-        assertNotNull(service);
-        Field field1 = FooImpl1.class.getDeclaredField("callbackRef");
-        processor.visitField(field1, type);
-        assertEquals(field1, type.getCallbackMembers().get(FooCallback.class.getName()).iterator().next().getAnchor());
-        
-    }
-    
-    public void testMethodDoesNotMatchCallback() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(BadBarImpl.class, type);
-        Method method = BadBarImpl.class.getMethod("setWrongInterfaceCallback", String.class);
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalCallbackReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testNoParamCallback() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(BadBarImpl.class, type);
-        Method method = BadBarImpl.class.getMethod("setNoParamCallback");
-        try {
-            processor.visitMethod(method, type);
-            fail();
-        } catch (IllegalCallbackReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testFieldDoesNotMatchCallback() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        processor.visitClass(BadBarImpl.class, type);
-        Field field = BadBarImpl.class.getDeclaredField("wrongInterfaceCallback");
-        try {
-            processor.visitField(field, type);
-            fail();
-        } catch (IllegalCallbackReferenceException e) {
-            // expected
-        }
-    }
-
-    public void testBadCallbackInterfaceAnnotation() throws Exception {
-        JavaImplementation type = javaImplementationFactory.createJavaImplementation();
-        try {
-            processor.visitClass(BadFooImpl.class, type);
-            fail();
-        } catch (IntrospectionException e) {
-            // expected
-            assertTrue(e.getCause() instanceof InvalidCallbackException);
-        }
-    }
-
-    @Callback(FooCallback.class)
-    private interface Foo {
-
-    }
-
-    private interface FooCallback {
-
-    }
-
-    @Service(Foo.class)
-    private static class FooImpl implements Foo {
-
-        @Callback
-        protected FooCallback callback;
-        
-        @Callback
-        public void setCallback(FooCallback cb) {
-
-        }
-    }
-    
-    @Service(Foo.class)
-    private static class FooImpl1 implements Foo {
-        @Callback
-        protected CallableReference<FooCallback> callbackRef;
-    }    
-
-    private static class BadBarImpl implements Foo {
-        @Callback
-        protected String wrongInterfaceCallback;
-
-        @Callback
-        public void setWrongInterfaceCallback(String cb) {
-
-        }
-
-        @Callback
-        public void setNoParamCallback() {
-
-        }
-
-    }
-
-    @Callback
-    private interface BadFoo {
-
-    }
-
-    @Service(BadFoo.class)
-    private static class BadFooImpl implements BadFoo {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
deleted file mode 100644
index ef4747f43a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.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.implementation.java.introspect.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-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.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceProcessorTestCase extends TestCase {
-    private ServiceProcessor processor;
-    private JavaImplementation type;
-
-    public void testMultipleInterfaces() throws Exception {
-        processor.visitClass(FooMultiple.class, type);
-        assertEquals(2, type.getServices().size());
-        org.apache.tuscany.sca.assembly.Service service = ModelHelper.getService(type, Baz.class.getSimpleName());
-        assertEquals(Baz.class, ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass());
-        assertEquals(Bar.class, ((JavaInterface)service.getInterfaceContract().getCallbackInterface()).getJavaClass());
-        assertNotNull(ModelHelper.getService(type, Bar.class.getSimpleName()));
-    }
-
-    public void testSingleInterfaces() throws Exception {
-        processor.visitClass(FooSingle.class, type);
-        assertEquals(1, type.getServices().size());
-        assertNotNull(ModelHelper.getService(type, Baz.class.getSimpleName()));
-    }
-
-    public void testMultipleNoService() throws Exception {
-        processor.visitClass(FooMultipleNoService.class, type);
-        assertEquals(0, type.getServices().size());
-    }
-
-    /**
-     * Verifies a service with a callback annotation is recognized
-     */
-    public void testMultipleWithCallbackAnnotation() throws Exception {
-        processor.visitClass(FooMultipleWithCalback.class, type);
-        assertEquals(1, type.getServices().size());
-    }
-
-    public void testRemotableNoService() throws Exception {
-        processor.visitClass(FooRemotableNoService.class, type);
-        assertEquals(1, type.getServices().size());
-        org.apache.tuscany.sca.assembly.Service service = ModelHelper.getService(type, BazRemotable.class.getSimpleName());
-        assertEquals(BazRemotable.class, ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass());
-    }
-
-    public void testNonInterface() throws Exception {
-        processor.visitClass(FooServiceUsingClassImpl.class, type);
-    }
-
-    public void testNoInterfaces() throws Exception {
-        try {
-            processor.visitClass(BadDefinition.class, type);
-        } catch (IllegalServiceDefinitionException e) {
-            //not expected
-            fail();
-        }
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        processor = new ServiceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
-        type = javaImplementationFactory.createJavaImplementation();
-    }
-
-    @Callback(Bar.class)
-    private interface Baz {
-    }
-
-    private interface Bar {
-    }
-
-    private interface Bar2 {
-    }
-
-    @Remotable
-    private interface BazRemotable {
-    }
-
-    @Service(interfaces = {Baz.class, Bar.class})
-    private class FooMultiple implements Baz, Bar {
-
-    }
-
-    @Service(Baz.class)
-    private class FooSingle implements Baz, Bar {
-
-    }
-
-    private class FooMultipleNoService implements Bar, Bar2 {
-
-    }
-
-    private class FooMultipleWithCalback implements Baz, Bar {
-
-    }
-
-    private class FooRemotableNoService implements BazRemotable, Bar {
-
-    }
-
-    @Service(FooSingle.class)
-    private class FooServiceUsingClassImpl extends FooSingle {
-
-    }
-
-
-    @Service()
-    private class BadDefinition extends FooSingle {
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/LICENSE b/tags/java/sca/1.3/modules/implementation-node-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/NOTICE b/tags/java/sca/1.3/modules/implementation-node-runtime/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/pom.xml b/tags/java/sca/1.3/modules/implementation-node-runtime/pom.xml
deleted file mode 100644
index 6d6d29b3c9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/pom.xml
+++ /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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-implementation-node-runtime</artifactId>
-    <name>Apache Tuscany SCA Node Implementation Extension</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-	        <version>1.3</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>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-impl</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.node.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.node*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
deleted file mode 100644
index edf2aefdde..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.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.node.launcher;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.node.SCANode2;
-
-/**
- * Bootstrap class for the SCA node daemon.
- *  
- * @version $Rev$ $Date$
- */
-public class NodeImplementationDaemonBootstrap {
-    private SCANode2 node;
-
-    /**
-     * A node wrappering an instance of a node daemon.
-     */
-    public static class NodeFacade implements SCANode2 {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private SCADomain daemon;
-        
-        private NodeFacade() {
-            runtimeClassLoader = Thread.currentThread().getContextClassLoader();
-        }
-        
-        public void start() {
-            threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-            boolean started = false;
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon = SCADomain.newInstance("NodeDaemon.composite");
-                started = true;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-        
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon.close();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-    }
-    
-    /**
-     * Constructs a new daemon bootstrap.
-     */
-    public NodeImplementationDaemonBootstrap() throws Exception {
-        node = new NodeFacade();
-    }
-    
-    /**
-     * Returns the node representing the daemon.
-     * @return
-     */
-    public SCANode2 getNode() {
-        return node;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
deleted file mode 100644
index f997d26cac..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.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.implementation.node.launcher;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-/**
- * Bootstrap class for standalone SCA nodes.
- *  
- * @version $Rev$ $Date$
- */
-public class NodeImplementationLauncherBootstrap {
-
-    private SCANode2 node;
-
-    /**
-     * A node facade.
-     */
-    public static class NodeFacade implements SCANode2, SCAClient {
-        private ClassLoader threadContextClassLoader;
-        private ClassLoader runtimeClassLoader;
-        private SCANode2 delegate;
-        
-        private NodeFacade(SCANode2 delegate) {
-            runtimeClassLoader = Thread.currentThread().getContextClassLoader();
-            this.delegate = delegate;
-        }
-        
-        public void start() {
-            threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-            boolean started = false;
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                delegate.start();
-                started = true;
-            } finally {
-                if (!started) {
-                    Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-                }
-            }
-        }
-        
-        public void stop() {
-            try {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                delegate.stop();
-            } finally {
-                Thread.currentThread().setContextClassLoader(threadContextClassLoader);
-            }
-        }
-
-        public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-            return (R)((SCAClient)delegate).cast(target);
-        }
-
-        public <B> B getService(Class<B> businessInterface, String serviceName) {
-            return (B)((SCAClient)delegate).getService(businessInterface, serviceName);
-        }
-
-        public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) {
-            return (ServiceReference<B>)((SCAClient)delegate).getServiceReference(businessInterface, referenceName);
-        }
-    }
-    
-    /**
-     * Bootstrap a new SCA node.
-     * 
-     * @param configurationURI
-     */
-    public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI));
-    }
-
-    /**
-     * Bootstrap a new SCA node.
-     * 
-     * @param compositeURI
-     * @param uris
-     * @param locations
-     */
-    public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCAContribution[] contributions = new SCAContribution[uris.length];
-        for (int i = 0; i < uris.length; i++) {
-            contributions[i] = new SCAContribution(uris[i], locations[i]);
-        }
-        node = new NodeFacade(nodeFactory.createSCANode(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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCAContribution[] contributions = new SCAContribution[uris.length];
-        for (int i = 0; i < uris.length; i++) {
-            contributions[i] = new SCAContribution(uris[i], locations[i]);
-        }
-        node = new NodeFacade(nodeFactory.createSCANode(compositeURI, compositeContent, contributions));
-    }
-
-    /**
-     * Returns the SCA node.
-     * 
-     * @return
-     */
-    public SCANode2 getNode() {
-        return node;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
deleted file mode 100644
index 62a822a85e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
deleted file mode 100644
index f505593c0d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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 = NodeImplementationLauncherUtil.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 String[] command = new String[]{ java, "-cp", cp, main , 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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
deleted file mode 100644
index 7abb1335cf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/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.launcher;
-
-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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
deleted file mode 100644
index 5895a8614d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
deleted file mode 100644
index 6cdb18938e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
deleted file mode 100644
index e2a3e4df92..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
deleted file mode 100644
index f6a601a3cd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
deleted file mode 100644
index 47b42c9224..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.SCAClient;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * 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 SCANode2 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
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        node = nodeFactory.createSCANodeFromURL(nodeConfiguration);
-        
-        // Register the Servlet host
-        ServletHostExtensionPoint servletHosts = servletHosts(node);
-        servletHosts.getServletHosts().clear();
-        servletHosts.addServletHost(servletHost);
-
-        // Save the node in the Servlet context 
-        servletContext.setAttribute(SCAClient.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(SCANode2 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;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 306b53be5b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite b/tags/java/sca/1.3/modules/implementation-node-runtime/src/main/resources/NodeDaemon.composite
deleted file mode 100644
index a019fedd6d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/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.launcher.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.launcher.PingServiceImpl"/>
-   		<service name="Servlet">
-   	 		<t:binding.http uri="http://localhost:9990/ping"/>
-   		</service>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
deleted file mode 100644
index c25e952b69..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.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.node;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Test case for node component implementations.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImplementationTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("TestNode.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testNode() {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
deleted file mode 100644
index 55644c27e5..0000000000
--- a/tags/java/sca/1.3/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/composite"
-	xmlns:sc="http://sample/composite"
-	name="TestComposite">
-
-    <component name="TestComponent">
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/tags/java/sca/1.3/modules/implementation-node-runtime/src/test/resources/TestNode.composite
deleted file mode 100644
index d4dc62a42d..0000000000
--- a/tags/java/sca/1.3/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	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/tags/java/sca/1.3/modules/implementation-node/LICENSE b/tags/java/sca/1.3/modules/implementation-node/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/NOTICE b/tags/java/sca/1.3/modules/implementation-node/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/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/tags/java/sca/1.3/modules/implementation-node/pom.xml b/tags/java/sca/1.3/modules/implementation-node/pom.xml
deleted file mode 100644
index 9e1ba2e759..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.node</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.node*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
deleted file mode 100644
index d4755f4071..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
deleted file mode 100644
index 527698ea91..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
deleted file mode 100644
index 9c4fed689b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
deleted file mode 100644
index bbf396a724..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.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.node.builder.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.impl.BaseConfigurationBuilderImpl;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-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 extends BaseConfigurationBuilderImpl implements CompositeBuilder {
-    
-    public NodeCompositeBuilderImpl(AssemblyFactory assemblyFactory,
-                                                  SCABindingFactory scaBindingFactory,
-                                                  InterfaceContractMapper interfaceContractMapper,
-                                                  SCADefinitions policyDefinitions,
-                                                  Monitor monitor) {
-        super(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
-    }
-
-    public void build(Composite composite) throws CompositeBuilderException {
-        configureNodeComponents(composite);
-    }
-
-    /**
-     * Configure the node components in the given composite.
-     * 
-     * @param composite
-     * @throws CompositeBuilderException
-     */
-    private void configureNodeComponents(Composite composite) 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.
-                configureBindingURIs(applicationComposite, defaultBindings);
-            }
-        }
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
deleted file mode 100644
index 1d183513b4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.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.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.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 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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
deleted file mode 100644
index 94ea610314..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
deleted file mode 100644
index 8f6315d969..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.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.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.implementation.node.NodeImplementation;
-
-
-/**
- * The model representing a node implementation in an SCA assembly model.
- *
- * @version $Rev$ $Date$
- */
-class NodeImplementationImpl 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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
deleted file mode 100644
index e695340d45..0000000000
--- a/tags/java/sca/1.3/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.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.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(ModelFactoryExtensionPoint 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/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
deleted file mode 100644
index 201354f89c..0000000000
--- a/tags/java/sca/1.3/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.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.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 QName IMPLEMENTATION_NODE = new QName(Constants.SCA10_TUSCANY_NS, "implementation.node");
-    
-    private AssemblyFactory assemblyFactory;
-    private NodeImplementationFactory implementationFactory;
-    
-    public NodeImplementationProcessor(ModelFactoryExtensionPoint 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/tags/java/sca/1.3/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9378db0875..0000000000
--- a/tags/java/sca/1.3/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.0#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.0#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/tags/java/sca/1.3/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/tags/java/sca/1.3/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
deleted file mode 100644
index b8a63a3b16..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
deleted file mode 100644
index 1dc397659b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-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.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-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.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class CalculateBindingURITestCase extends TestCase {
-    private static final Logger logger = Logger.getLogger(CalculateBindingURITestCase.class.getName());
-    private AssemblyFactory assemblyFactory;
-    private SCABindingFactory scaBindingFactory;
-    private NodeImplementationFactory nodeImplementationFactory;
-    private Monitor monitor;
-    private CompositeBuilder configurationBuilder;
-    private List<Binding> defaultBindings = new ArrayList<Binding>();
-    
-    @Override
-    protected void setUp() throws Exception {
-        assemblyFactory = new DefaultAssemblyFactory();
-        scaBindingFactory = new TestBindingFactory();
-        nodeImplementationFactory = new NodeImplementationFactoryImpl();
-        monitor = new Monitor() {
-            public void problem(Problem problem) {
-                if (problem.getSeverity() == Severity.INFO) {
-                    logger.info(problem.toString());
-                } else if (problem.getSeverity() == Severity.WARNING) {
-                    logger.warning(problem.toString());
-                } else if (problem.getSeverity() == Severity.ERROR) {
-                    if (problem.getCause() != null) {
-                        logger.log(Level.SEVERE, problem.toString(), problem.getCause());
-                    } else {
-                        logger.severe(problem.toString());
-                    }
-                }
-            }
-            public List<Problem> getProblems() {
-                return null;
-            }
-        };
-        configurationBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, null, null, monitor);
-        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;
-    }
-    
-    @Override
-    protected 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
-   
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }
-    
-    public void testComponentServiceBindingDefault() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/s1", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    public void testComponentServiceBindingName() {
-        Composite composite = createComponentServiceBinding();
-        Binding b = composite.getComponents().get(0).getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/n", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }   
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    } 
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }     
-    
-    // top level composite service binding tests
-    
-    public void testCompositeServiceSingleService() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        composite.getServices().remove(1);
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }
-   
-    public void testCompositeServiceBindingDefault() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/s1", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    public void testCompositeServiceBindingName() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/n", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }   
-    
-    public void testCompositeServiceBindingURIRelative() {
-        Composite composite = createTopLevelCompositeServiceBinding();
-        Binding b = composite.getServices().get(0).getBindings().get(0);
-        b.setName("n");
-        b.setURI("b");
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }        
-
-    // nested composite service binding tests
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/c2", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }
-    
-    public void testNestedCompositeServiceBindingDefault() {
-        Composite composite = createNestCompositeServiceBinding();
-        Binding b = ((Composite)composite.getComponents().get(0).getImplementation()).getComponents().get(0).getServices().get(0).getBindings().get(0);
-        
-        try {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/c2/s1", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/c2/n", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }   
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            assertEquals("http://myhost:8080/root/c1/c2/b", b.getURI());
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-            fail();
-        }  
-    }  
-    
-    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 {
-            configurationBuilder.build(nodeComposite(composite));
-
-            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 {
-            configurationBuilder.build(nodeComposite(composite));
-            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 {
-            configurationBuilder.build(nodeComposite(composite));
-            fail();
-        } catch(Exception ex){
-            System.out.println(ex.toString());
-        }  
-    }    
-
-    
-    public class TestBindingFactory implements SCABindingFactory {
-        public SCABinding createSCABinding() {
-            return new TestBindingImpl();
-        }
-    }
-    
-    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/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
deleted file mode 100644
index bc0c3b1507..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.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.implementation.node.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.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.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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * 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);
-        
-        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);
-    }
-
-    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);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
deleted file mode 100644
index c5e6a40f89..0000000000
--- a/tags/java/sca/1.3/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.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.node.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/writing Node implementations.
- * 
- * @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("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/tags/java/sca/1.3/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/tags/java/sca/1.3/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
deleted file mode 100644
index 55644c27e5..0000000000
--- a/tags/java/sca/1.3/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://sample/composite"
-	xmlns:sc="http://sample/composite"
-	name="TestComposite">
-
-    <component name="TestComponent">
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/tags/java/sca/1.3/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
deleted file mode 100644
index 92787d3ac1..0000000000
--- a/tags/java/sca/1.3/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	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/tags/java/sca/1.3/modules/implementation-notification/LICENSE b/tags/java/sca/1.3/modules/implementation-notification/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/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/tags/java/sca/1.3/modules/implementation-notification/NOTICE b/tags/java/sca/1.3/modules/implementation-notification/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/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/tags/java/sca/1.3/modules/implementation-notification/pom.xml b/tags/java/sca/1.3/modules/implementation-notification/pom.xml
deleted file mode 100644
index 64d4046ca8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/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-modules</artifactId>

-        <version>1.3</version>

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

-    </parent>

-

-    <artifactId>tuscany-implementation-notification</artifactId>

-    <name>Apache Tuscany SCA Notification Implementation Extension</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-core-spi</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.3</version>

-        </dependency>

-		        

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</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>1.3</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.implementation.notification</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.implementation.notification*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
deleted file mode 100644
index 3f79ca71e5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.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.notification;

-

-

-/**

- * A default factory for the Notification implementation model.

- *

- * @version $Rev$ $Date$

- */

-public class DefaultNotificationImplementationFactory implements NotificationImplementationFactory {

-    

-    public NotificationImplementationImpl createNotificationImplementation() {

-        return new NotificationImplementationImpl();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
deleted file mode 100644
index 776782ace3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.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.implementation.notification;

-

-import java.util.Map;

-

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Message;

-import org.apache.tuscany.sca.runtime.EndpointReference;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-

-/**

- * @version $Rev$ $Date$

- */

-public class ImmutableMessage implements Message {

-

-    public <T> T getBody() {

-        return null;

-    }

-

-    public EndpointReference getFrom() {

-        return null;

-    }

-

-    public Object getMessageID() {

-        return null;

-    }

-

-    public EndpointReference getTo() {

-        return null;

-    }

-

-    public RuntimeWire getWire() {

-        return null;

-    }

-

-    public boolean isFault() {

-        return false;

-    }

-

-    public <T> void setBody(T arg0) {

-        throw new UnsupportedOperationException();

-    }

-

-    public <T> void setFaultBody(T arg0) {

-        throw new UnsupportedOperationException();

-    }

-

-    public void setFrom(EndpointReference arg0) {

-        throw new UnsupportedOperationException();

-    }

-

-    public void setMessageID(Object arg0) {

-        throw new UnsupportedOperationException();

-    }

-

-    public void setTo(EndpointReference arg0) {

-        throw new UnsupportedOperationException();

-    }

-

-    public Operation getOperation() {

-        return null;

-    }

-

-    public void setOperation(Operation op) {

-        throw new UnsupportedOperationException();

-    }

-

-    /**

-     * @see org.apache.tuscany.sca.invocation.Message#getReplyTo()

-     */

-    public EndpointReference getReplyTo() {

-        return null;

-    }

-

-    public Map<String, Object> getQoSContext() {

-        // TODO Auto-generated method stub

-        return null;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
deleted file mode 100644
index a2e35c5cb6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.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.notification;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.ComponentReference;

-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.Message;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-

-/**

- * Turns invoke into remote message fan-out

- *

- * @version $Rev$ $Date$

- */

-public class NotificationComponentInvoker implements Invoker {

-

-    private static final Message RESPONSE = new ImmutableMessage();

-    private List<InvocationChain> subscriberInvocationChains;

-    private Operation operation;

-    private RuntimeComponent component;

-

-    public NotificationComponentInvoker(Operation operation, RuntimeComponent component) {

-        this.subscriberInvocationChains = null;

-        this.operation = operation;

-        this.component = component;

-    }

-    

-    public Message invoke(Message msg) {

-        addSubscriberInvocationChains();

-

-        // REVIEW Should this be done in separate thread(s)?

-        // REVIEW Should separate copies of message be used?

-        Object msgBody = msg.getBody();

-        

-        for (InvocationChain subscriberInvocationChain : subscriberInvocationChains) {

-            Invoker chainInvoker = subscriberInvocationChain.getHeadInvoker();

-            msg.setBody(msgBody);

-            chainInvoker.invoke(msg);

-        }

-        

-        return RESPONSE;

-    }

-    

-    private void addSubscriberInvocationChains() {

-        if (subscriberInvocationChains == null) {

-            subscriberInvocationChains = new ArrayList<InvocationChain>();

-            for (ComponentReference reference : component.getReferences()) {

-                if (reference.getName().indexOf("$self$") >= 0) {

-                    continue;

-                }

-                RuntimeComponentReference rtCompRef = null;

-                if (reference instanceof RuntimeComponentReference) {

-                    rtCompRef = (RuntimeComponentReference)reference;

-                }

-                else {

-                    throw new RuntimeException("Need a runtime component reference");

-                }

-                for(RuntimeWire wire : rtCompRef.getRuntimeWires()) {

-                    // This is much less efficient now !!

-                    List<InvocationChain> chains = wire.getInvocationChains();

-                    InvocationChain chain = getInvocationChain(chains, operation);

-                    subscriberInvocationChains.add(chain);

-                }

-            }

-        }

-    }

-    

-    private InvocationChain getInvocationChain(List<InvocationChain> chains, Operation operation) {

-        InvocationChain chain = null;

-        for (InvocationChain ch : chains) {

-            if (ch.getTargetOperation().equals(operation)) {

-                chain = ch;

-                break;

-            }

-        }

-        if (chain == null) {

-            for (InvocationChain ch : chains) {

-                if (ch.getTargetOperation().getName().equals(operation.getName())) {

-                    chain = ch;

-                    break;

-                }

-            }

-            if (chain == null) {

-                throw new RuntimeException("Can't find a compatible chain");

-            }

-        }

-        return chain;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
deleted file mode 100644
index cea7038e9c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.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.notification;

-

-/**

- * @version $Rev$ $Date$

- */

-public interface NotificationImplementationFactory {

-

-    NotificationImplementationImpl createNotificationImplementation();

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
deleted file mode 100644
index 594bec75b5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.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.implementation.notification;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.assembly.ComponentType;

-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.assembly.impl.ImplementationImpl;

-

-

-/**

- * Model object for a Notification implementation.

- * 

- * @version $Rev$ $Date$

- */

-public class NotificationImplementationImpl extends ImplementationImpl implements Implementation {

-

-    private String componentTypeName;

-    private String implementationType;

-    private ComponentType componentType;

-

-    

-    public NotificationImplementationImpl() {

-        // Without this, the loader's resolve is not called

-        setUnresolved(true);

-    }

-    

-    public String getComponentTypeName() {

-        return componentTypeName;

-    }

-    

-    public void setComponentTypeName(String componentTypeName) {

-        this.componentTypeName = componentTypeName;

-    }

-    

-    public String getImplementationType() {

-        return implementationType;

-    }

-    

-    public void setImplementationType(String implementationType) {

-        this.implementationType = implementationType;

-    }

-    

-    public ComponentType getComponentType() {

-        return componentType;

-    }

-    

-    public void setComponentType(ComponentType componentType) {

-        this.componentType = componentType;

-    }

-

-    @Override

-    public List<Service> getServices() {

-        return componentType.getServices();

-    }

-

-    @Override

-    public List<Reference> getReferences() {

-        return componentType.getReferences();

-    }

-

-    @Override

-    public int hashCode() {

-        return String.valueOf(getComponentTypeName()).hashCode();

-    }

-    

-    @Override

-    public boolean equals(Object obj) {

-        if (obj == this)

-            return true;

-        else if (obj instanceof NotificationImplementationImpl &&

-            getComponentTypeName().equals(((NotificationImplementationImpl)obj).getComponentTypeName()))

-             return true;

-        else

-            return false;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
deleted file mode 100644
index c8b55c7caa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.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.implementation.notification;

-

-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.ComponentType;

-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-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;

-

-/**

- * Loader for handling Notification <implementation.notification> elements.

- * 

- * @version $Rev$ $Date$

- */

-public class NotificationImplementationProcessor implements StAXArtifactProcessor<NotificationImplementationImpl> {

-

-    protected static final QName IMPLEMENTATION_NOTIFICATION =

-        new QName(Constants.SCA10_TUSCANY_NS, "implementation.notification");

-    

-    private NotificationImplementationFactory implementationFactory;

-

-    public NotificationImplementationProcessor(NotificationImplementationFactory implementationFactory) {

-        this.implementationFactory = implementationFactory;

-    }

-

-    public QName getArtifactType() {

-        return IMPLEMENTATION_NOTIFICATION;

-    }

-    

-    public Class<NotificationImplementationImpl> getModelType() {

-        return NotificationImplementationImpl.class;

-    }

-

-    public NotificationImplementationImpl read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {

-        assert IMPLEMENTATION_NOTIFICATION.equals(reader.getName());

-        String componentTypeName = reader.getAttributeValue(null, "name");

-        String implementationType = reader.getAttributeValue(null, "type");

-

-        NotificationImplementationImpl implementation = implementationFactory.createNotificationImplementation();

-        implementation.setComponentTypeName(componentTypeName);

-        implementation.setImplementationType(implementationType);

-        // Skip to end element

-        while (reader.hasNext()) {

-            if (reader.next() == END_ELEMENT && IMPLEMENTATION_NOTIFICATION.equals(reader.getName())) {

-                break;

-            }

-        }

-        

-        ComponentType componentType = new DefaultAssemblyFactory().createComponentType();

-        componentType.setURI(componentTypeName + ".componentType");

-        componentType.setUnresolved(true);

-        implementation.setComponentType(componentType);

-        

-        return implementation;

-    }

-

-    public void resolve(NotificationImplementationImpl impl, ModelResolver resolver) throws ContributionResolveException {

-        ComponentType componentType = resolver.resolveModel(ComponentType.class, impl.getComponentType());

-        

-        if (componentType.isUnresolved()) {

-            throw new ContributionResolveException("ComponentType still unresolved");

-        }

-        impl.setComponentType(componentType);

-        impl.setUnresolved(false);

-    }

-        

-    public void write(NotificationImplementationImpl model, XMLStreamWriter outputSource)

-            throws ContributionWriteException, XMLStreamException {

-        

-        //FIXME Implement this method

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
deleted file mode 100644
index e9ea71c1d5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.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.notification;

-

-import org.apache.tuscany.sca.assembly.ComponentService;

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.Operation;

-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;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationImplementationProvider implements ImplementationProvider {

-    

-    private RuntimeComponent component;

-

-    /**

-     * Constructs a new Notification implementation provider.

-     */

-    public NotificationImplementationProvider(RuntimeComponent component, NotificationImplementationImpl implementation) {

-        this.component = component;

-    }

-

-    public Invoker createInvoker(RuntimeComponentService service, Operation operation) {

-        NotificationComponentInvoker invoker = new NotificationComponentInvoker(operation, component);

-        return invoker;

-    }

-    

-    public boolean supportsOneWayInvocation() {

-        return false;

-    }

-

-    public void start() {

-        for (ComponentService service : component.getServices()) {

-            if (service.getService() != null) {

-                InterfaceContract interfaceContract = service.getService().getInterfaceContract();

-                if (interfaceContract instanceof WSDLInterfaceContract) {

-                    interfaceContract.getInterface().resetDataBinding("org.apache.axiom.om.OMElement");

-                }

-            }

-        }

-    }

-

-    public void stop() {

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
deleted file mode 100644
index 80785e36e7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.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.notification;

-

-import org.apache.tuscany.sca.provider.ImplementationProvider;

-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationImplementationProviderFactory implements ImplementationProviderFactory<NotificationImplementationImpl> {

-

-    public ImplementationProvider createImplementationProvider(RuntimeComponent component,

-                                                                                           NotificationImplementationImpl implementation) {

-        return new NotificationImplementationProvider(component, implementation);

-    }

-    

-    public Class<NotificationImplementationImpl> getModelType() {

-        return NotificationImplementationImpl.class;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
deleted file mode 100644
index 2795619208..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.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.notification;

-

-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-import org.apache.tuscany.sca.core.ModuleActivator;

-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;

-

-/**

- * @version $Rev$ $Date$

- */

-public class NotificationModuleActivator implements ModuleActivator {

-

-    private NotificationImplementationProcessor implementationLoader;

-    

-    public void start(ExtensionPointRegistry registry) {

-        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-

-        implementationLoader = new NotificationImplementationProcessor(new DefaultNotificationImplementationFactory());

-        processors.addArtifactProcessor(implementationLoader);

-

-        ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);

-        providerFactories.addProviderFactory(new NotificationImplementationProviderFactory());

-    }

-

-    public void stop(ExtensionPointRegistry registry) {

-        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);

-        

-        processors.removeArtifactProcessor(implementationLoader);

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index f8f6975395..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /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.implementation.notification.NotificationModuleActivator

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
deleted file mode 100644
index f9a20edccd..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.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.implementation.notification;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.ComponentReference;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl;

-import org.apache.tuscany.sca.interfacedef.Operation;

-import org.apache.tuscany.sca.invocation.Interceptor;

-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.runtime.EndpointReference;

-import org.apache.tuscany.sca.runtime.RuntimeComponent;

-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;

-import org.apache.tuscany.sca.runtime.RuntimeWire;

-import org.easymock.EasyMock;

-

-/**

- * 

- * @version $Rev$ $Date$

- *

- */

-public class NotificationComponentTestCase extends TestCase {

-

-    public void testLocalNotificationComponent() throws Exception {

-        try {

-        Operation operation = EasyMock.createNiceMock(Operation.class);

-        EasyMock.replay(operation);

-        

-        InvocationChain sub1Chain = EasyMock.createNiceMock(InvocationChain.class);

-        EasyMock.expect(sub1Chain.getTargetOperation()).andReturn(operation);

-        EasyMock.expect(sub1Chain.getHeadInvoker()).andReturn(new MockInterceptor());

-        EasyMock.replay(sub1Chain);

-        List<InvocationChain> sub1Chains = new ArrayList<InvocationChain>();

-        sub1Chains.add(sub1Chain);

-        SCABinding b1 = new SCABindingFactoryImpl().createSCABinding();

-        EndpointReference epr1 = EasyMock.createNiceMock(EndpointReference.class);

-        EasyMock.expect(epr1.getURI()).andReturn("wire1Target");

-        EasyMock.expect(epr1.getBinding()).andReturn(b1);

-        EasyMock.replay(epr1);

-        RuntimeWire sub1Wire = EasyMock.createNiceMock(RuntimeWire.class);

-        EasyMock.expect(sub1Wire.getInvocationChains()).andReturn(sub1Chains);

-        EasyMock.expect(sub1Wire.getTarget()).andReturn(epr1).anyTimes();

-        EasyMock.replay(sub1Wire);

-        ArrayList<RuntimeWire> rtWires1 = new ArrayList<RuntimeWire>();

-        rtWires1.add(sub1Wire);

-        RuntimeComponentReference rtCompRef1 = EasyMock.createNiceMock(RuntimeComponentReference.class);

-        EasyMock.expect(rtCompRef1.getName()).andReturn("sub1Reference");

-        EasyMock.expect(rtCompRef1.getRuntimeWires()).andReturn(rtWires1);

-        EasyMock.replay(rtCompRef1);

-        

-        InvocationChain sub2Chain = EasyMock.createNiceMock(InvocationChain.class);

-        EasyMock.expect(sub2Chain.getTargetOperation()).andReturn(operation);

-        EasyMock.expect(sub2Chain.getHeadInvoker()).andReturn(new MockInterceptor());

-        EasyMock.replay(sub2Chain);

-        List<InvocationChain> sub2Chains = new ArrayList<InvocationChain>();

-        sub2Chains.add(sub2Chain);

-        SCABinding b2 = new SCABindingFactoryImpl().createSCABinding();

-        EndpointReference epr2 = EasyMock.createNiceMock(EndpointReference.class);

-        EasyMock.expect(epr2.getURI()).andReturn("wire2Target");

-        EasyMock.expect(epr2.getBinding()).andReturn(b2);

-        EasyMock.replay(epr2);

-        RuntimeWire sub2Wire = EasyMock.createNiceMock(RuntimeWire.class);

-        EasyMock.expect(sub2Wire.getInvocationChains()).andReturn(sub2Chains);

-        EasyMock.expect(sub2Wire.getTarget()).andReturn(epr2).anyTimes();

-        EasyMock.replay(sub2Wire);

-        ArrayList<RuntimeWire> rtWires2 = new ArrayList<RuntimeWire>();

-        rtWires2.add(sub2Wire);

-        RuntimeComponentReference rtCompRef2 = EasyMock.createNiceMock(RuntimeComponentReference.class);

-        EasyMock.expect(rtCompRef2.getName()).andReturn("sub2Reference");

-        EasyMock.expect(rtCompRef2.getRuntimeWires()).andReturn(rtWires2);

-        EasyMock.replay(rtCompRef2);

-        

-        ArrayList<ComponentReference> references = new ArrayList<ComponentReference>();

-        references.add(rtCompRef1);

-        references.add(rtCompRef2);

-        RuntimeComponent component = EasyMock.createNiceMock(RuntimeComponent.class);

-        EasyMock.expect(component.getName()).andReturn("LocalNotificationComponentTest");

-        EasyMock.expect(component.getReferences()).andReturn(references);

-        EasyMock.replay(component);

-        

-        Invoker localNotificationInvoker = new NotificationComponentInvoker(operation, component);

-        

-        Message msg = EasyMock.createNiceMock(Message.class);

-        EasyMock.expect(msg.getBody()).andReturn("msg").times(3);  // once per sub int + once in notif target invoker

-        EasyMock.replay(msg);

-        localNotificationInvoker.invoke(msg);

-        EasyMock.verify(msg);

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-    

-    class MockInterceptor implements Interceptor {

-        

-        public Message invoke(Message msg) {

-            Assert.assertEquals("msg", msg.getBody());

-            return msg;

-        }

-        

-        public void setNext(Invoker next) {

-            throw new AssertionError();

-        }

-

-        public Interceptor getNext() {

-            throw new AssertionError();

-        }

-

-        public boolean isOptimizable() {

-            throw new AssertionError();

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
deleted file mode 100644
index 89cbd3ec48..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.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.implementation.notification;

-

-import javax.xml.stream.XMLStreamConstants;

-import javax.xml.stream.XMLStreamReader;

-

-import junit.framework.Assert;

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Implementation;

-import org.easymock.EasyMock;

-

-/**

- * 

- * @version $Rev$ $Date$

- *

- */

-public class NotificationImplementationLoaderTestCase extends TestCase {

-

-    public void testRead() throws Exception {

-        try {

-        NotificationImplementationProcessor implementationLoader =

-            new NotificationImplementationProcessor(new DefaultNotificationImplementationFactory());

-

-        XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);

-        EasyMock.expect(reader.getName()).andReturn(NotificationImplementationProcessor.IMPLEMENTATION_NOTIFICATION).times(2);

-        EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("TrafficAdvisoryNotificationTestCase");

-        EasyMock.expect(reader.getAttributeValue(null, "type")).andReturn(null);

-        EasyMock.expect(reader.hasNext()).andReturn(true);

-        EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);

-        EasyMock.replay(reader);

-        

-        Implementation impl = implementationLoader.read(reader);

-        Assert.assertNotNull(impl);

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/tags/java/sca/1.3/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
deleted file mode 100644
index 1fd952a0a8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.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="org.apache.tuscany.sca.implementation.notification.TrafficAdvisory"/>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.java interface="org.apache.tuscany.sca.implementation.notification.TrafficAdvisory"/>

-     </reference>

-</componentType>

diff --git a/tags/java/sca/1.3/modules/implementation-osgi/LICENSE b/tags/java/sca/1.3/modules/implementation-osgi/LICENSE
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/NOTICE b/tags/java/sca/1.3/modules/implementation-osgi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/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/tags/java/sca/1.3/modules/implementation-osgi/pom.xml b/tags/java/sca/1.3/modules/implementation-osgi/pom.xml
deleted file mode 100644
index 04c7696cc6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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>1.3</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.implementation.osgi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.osgi*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.java
deleted file mode 100644
index 73cae46324..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationInterface.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 OSGiImplementationInterface extends Implementation, Extensible {
-
-    String getBundleSymbolicName();
-
-    String getBundleVersion();
-
-    String[] getImports();
-
-    List<ComponentProperty> getReferenceProperties(String referenceName);
-
-    List<ComponentProperty> getServiceProperties(String serviceName);
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
deleted file mode 100644
index 33c790585c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
deleted file mode 100644
index 0264f0b102..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
deleted file mode 100644
index 38befa611b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProvider.java
deleted file mode 100644
index 3b08bbc7dc..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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.OSGiImplementationInterface;
-import org.apache.tuscany.sca.implementation.osgi.context.OSGiAnnotations;
-import org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementation;
-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 OSGiImplementation 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,
-            OSGiImplementationInterface impl,
-            DataBindingExtensionPoint dataBindingRegistry,
-            JavaPropertyValueObjectFactory propertyValueFactory,
-            ProxyFactory proxyFactory,
-            ScopeRegistry scopeRegistry,
-            RequestContextFactory requestContextFactory,
-            MessageFactory messageFactory,
-            InterfaceContractMapper mapper) throws BundleException {
-        
-        
-        this.implementation = (OSGiImplementation)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 OSGiImplementation 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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiImplementationProviderFactory.java
deleted file mode 100644
index 5c9bfc94f0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-
-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.OSGiImplementationInterface;
-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<OSGiImplementationInterface> {
-    
-    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,
-        OSGiImplementationInterface implementation) {
-                
-        try {
-                
-            return new OSGiImplementationProvider(component, 
-                    implementation, 
-                    dataBindings,
-                    propertyFactory,
-                    proxyFactory,
-                    scopeRegistry,
-                    requestContextFactory,
-                    messageFactory,
-                    mapper
-                    );
-                
-        } catch (BundleException e) {
-            throw new RuntimeException(e);
-        }
-        
-    }
-
-    public Class<OSGiImplementationInterface> getModelType() {
-        return OSGiImplementationInterface.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiInstanceWrapper.java
deleted file mode 100644
index ab1c9fedba..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiRemotableInvoker.java
deleted file mode 100644
index d8f19580eb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTargetInvoker.java
deleted file mode 100644
index e464b3b15d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.java
deleted file mode 100644
index 684816b756..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementation.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.xml;
-
-
-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.OSGiImplementationInterface;
-
-
-/**
- * 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 OSGiImplementation extends ImplementationImpl implements OSGiImplementationInterface {
-    
-    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 OSGiImplementation(
-            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;
-    }
-
-    protected 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 OSGiImplementation))
-            return super.equals(obj);
-        OSGiImplementation impl = (OSGiImplementation)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/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
deleted file mode 100644
index 62578bee33..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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<OSGiImplementation> {
-    
-    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<OSGiImplementation> getModelType() {
-        return OSGiImplementation.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 OSGiImplementation 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");
-                }
-            }
-
-        }
-            
-        OSGiImplementation implementation = new OSGiImplementation(
-                    modelFactories,
-                    bundleSymbolicName,
-                    bundleVersion,
-                    importList, 
-                    classList,
-                    refProperties,
-                    serviceProperties);
-        implementation.setCallbackProperties(refCallbackProperties, serviceCallbackProperties);
-           
-        implementation.setUnresolved(true);
-            
-        return implementation;
-        
-    }
-    
-
-    public void resolve(OSGiImplementation 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(OSGiImplementation 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/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 0f2b028e87..0000000000
--- a/tags/java/sca/1.3/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.OSGiImplementationInterface
diff --git a/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 0f0fa03f75..0000000000
--- a/tags/java/sca/1.3/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.invocation.OSGiImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementationInterface

diff --git a/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
deleted file mode 100644
index 2503be0b13..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiPropertyTestCase.java
deleted file mode 100644
index 489df31aa5..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/OSGiTestCase.java
deleted file mode 100644
index 500c15dcc2..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/invocation/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.invocation;
-
-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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
deleted file mode 100644
index 93b4dee033..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
deleted file mode 100644
index d412f6bd6a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
deleted file mode 100644
index feb9ce177e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
deleted file mode 100644
index 630c1502d1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
deleted file mode 100644
index 000c87d2b0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.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.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.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();
-
-        OSGiImplementation osgiImpl = (OSGiImplementation)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/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
deleted file mode 100644
index f22095fbbe..0000000000
--- a/tags/java/sca/1.3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.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.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;
-
-
-/**
- * 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 OSGiImplementation && !(resolved instanceof OSGiImplementation)) {
-                
-                OSGiImplementation impl = ((OSGiImplementation)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/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
deleted file mode 100644
index 254ce99d59..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/osgiproptest.composite
deleted file mode 100644
index 0b31145407..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/osgitest.composite b/tags/java/sca/1.3/modules/implementation-osgi/src/test/resources/osgitest.composite
deleted file mode 100644
index 5465eec8d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/LICENSE b/tags/java/sca/1.3/modules/implementation-resource-runtime/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/NOTICE b/tags/java/sca/1.3/modules/implementation-resource-runtime/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-resource-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/tags/java/sca/1.3/modules/implementation-resource-runtime/pom.xml b/tags/java/sca/1.3/modules/implementation-resource-runtime/pom.xml
deleted file mode 100644
index 93bb6ea2db..0000000000
--- a/tags/java/sca/1.3/modules/implementation-resource-runtime/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.resource.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.resource*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
deleted file mode 100644
index 582795625d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
deleted file mode 100644
index a974f68a7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
deleted file mode 100644
index 47e70b5581..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 656d8c2751..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
deleted file mode 100644
index 03f10e78e8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.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.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.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ResourceImplementationTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("resource.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testResource() throws Exception {
-        Resource resource = scaDomain.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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/resources/content/test.html b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/resources/resource.composite b/tags/java/sca/1.3/modules/implementation-resource-runtime/src/test/resources/resource.composite
deleted file mode 100644
index 4654056cd7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/LICENSE b/tags/java/sca/1.3/modules/implementation-resource/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/NOTICE b/tags/java/sca/1.3/modules/implementation-resource/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-resource/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/tags/java/sca/1.3/modules/implementation-resource/pom.xml b/tags/java/sca/1.3/modules/implementation-resource/pom.xml
deleted file mode 100644
index d8dfcf979b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.resource</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.resource*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
deleted file mode 100644
index 68219de701..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
deleted file mode 100644
index be136ee792..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
deleted file mode 100644
index 95ac452c66..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
deleted file mode 100644
index d4db8772e4..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-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(ModelFactoryExtensionPoint modelFactories) {
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-
-    public ResourceImplementation createResourceImplementation() {
-        return new ResourceImplementationImpl(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
deleted file mode 100644
index 9cad0890a3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
deleted file mode 100644
index 6abef37b1a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.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.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.assembly.builder.impl.ProblemImpl;
-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.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;
-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 QName IMPLEMENTATION_RESOURCE = new QName(Constants.SCA10_TUSCANY_NS, "implementation.resource");
-    
-    private ContributionFactory contributionFactory;
-    private ResourceImplementationFactory implementationFactory;
-    private Monitor monitor;
-
-    public ResourceImplementationProcessor(ModelFactoryExtensionPoint 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 = new ProblemImpl(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 = new ProblemImpl(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/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index b5774c5c5b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
deleted file mode 100644
index f77f723c3e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
deleted file mode 100644
index 7f619ef036..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-script/LICENSE b/tags/java/sca/1.3/modules/implementation-script/LICENSE
deleted file mode 100644
index 4b5ab74408..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-script/NOTICE b/tags/java/sca/1.3/modules/implementation-script/NOTICE
deleted file mode 100644
index 5782e5ee9b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/NOTICE
+++ /dev/null
@@ -1,12 +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 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/tags/java/sca/1.3/modules/implementation-script/pom.xml b/tags/java/sca/1.3/modules/implementation-script/pom.xml
deleted file mode 100644
index ca3aae78a8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/pom.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * 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.3</version>

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

-    </parent>

-

-    <artifactId>tuscany-implementation-script</artifactId>

-    <name>Apache Tuscany SCA Script Implementation Extension</name>

-

-    <dependencies>

-

-        <dependency>

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

-            <artifactId>tuscany-extension-helper</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>1.3</version>

-            <scope>compile</scope>

-        </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>1.3</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>                 

-            </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>junit</groupId>                                      

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.easymock</groupId>

-            <artifactId>easymock</artifactId>

-            <version>2.2</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.easymock</groupId>

-            <artifactId>easymockclassextension</artifactId>

-            <version>2.2</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-           <groupId>commons-logging</groupId>

-           <artifactId>commons-logging</artifactId>

-           <version>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.0</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>

-

-

-    <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.implementation.script</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.implementation.script*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
deleted file mode 100644
index 87820c18ed..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.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.implementation.script;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.extension.helper.utils.ResourceHelper;
-
-/**
- * Represents a Script implementation.
- *
- * @version $Rev$ $Date$
- */
-public class ScriptImplementation {
-
-    protected String scriptName;
-    protected URL scriptURL;
-    protected String scriptSrc;
-    protected String scriptLanguage;
-
-    public String getScript() {
-        return scriptName;
-    }
-
-    public void setScript(String scriptName) {
-        this.scriptName = scriptName;
-    }
-
-    public void setLanguage(String language) {
-        this.scriptLanguage = language;
-    }
-
-    public void setElementText(String elementText) {
-        scriptSrc = elementText;
-    }
-
-    public String getScriptLanguage() {
-        if (scriptLanguage == null || scriptLanguage.length() < 1) {
-            int i = scriptName.lastIndexOf('.');
-            if (i > 0) {
-                scriptLanguage = scriptName.substring(i + 1);
-            }
-        }
-        return scriptLanguage;
-    }
-
-    public String getScriptSrc() {
-        if (scriptSrc == null) {
-            if (scriptName == null) {
-                throw new IllegalArgumentException("script name is null and no inline source used");
-            }
-            if (scriptURL == null) {
-                throw new RuntimeException("No script: " + scriptName);
-            }
-
-            scriptSrc = ResourceHelper.readResource(scriptURL);
-        }
-        return scriptSrc;
-    }
-    
-    public void resolve(ModelResolver resolver) {
-    	
-    	if (scriptName != null) {
-    	    //FIXME The contribution factory should be injected
-    	    ContributionFactory contributionFactory = new DefaultContributionFactory();
-            Artifact artifact = contributionFactory.createArtifact();
-            artifact.setURI(scriptName);
-            artifact = resolver.resolveModel(Artifact.class, artifact);
-            if (artifact.getLocation() != null) {
-                try {
-                    scriptURL = new URL(artifact.getLocation());
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-    	}
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
deleted file mode 100644
index a7c4b9074f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.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.script;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.extension.helper.ImplementationActivator;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.extension.helper.utils.PropertyValueObjectFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class ScriptImplementationActivator implements ImplementationActivator<ScriptImplementation> {
-
-    // TODO: seems wrong to need PropertyValueObjectFactory, could it be on Property somehow? 
-    protected PropertyValueObjectFactory propertyFactory;
-
-    public ScriptImplementationActivator(PropertyValueObjectFactory propertyFactory) {
-        this.propertyFactory = propertyFactory;
-    }
-
-    public Class<ScriptImplementation> getImplementationClass() {
-        return ScriptImplementation.class;
-    }
-
-    public InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, ScriptImplementation implementation) {
-        return new ScriptInvokerFactory(rc, ct, implementation, propertyFactory);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
deleted file mode 100644
index 2ccb414be8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/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;
-
-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 {
-
-    protected ScriptEngine scriptEngine;
-    protected XMLHelper xmlHelper;
-    protected Operation operation;
-
-    public ScriptInvoker(ScriptEngine scriptEngine, XMLHelper xmlHelper, Operation operation) {
-        this.scriptEngine = scriptEngine;
-        this.xmlHelper = xmlHelper;
-        this.operation = operation;
-    }
-
-    protected 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/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
deleted file mode 100644
index 9359590424..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.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.implementation.script;
-
-import java.io.StringReader;
-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.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.core.factory.ObjectCreationException;
-import org.apache.tuscany.sca.core.factory.ObjectFactory;
-import org.apache.tuscany.sca.extension.helper.InvokerFactory;
-import org.apache.tuscany.sca.extension.helper.utils.PropertyValueObjectFactory;
-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.runtime.RuntimeComponent;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class ScriptInvokerFactory implements InvokerFactory {
-
-    protected ScriptEngine scriptEngine;
-    protected XMLHelper xmlHelper;
-    
-    protected RuntimeComponent rc; 
-    protected ComponentType ct; 
-    protected ScriptImplementation implementation;
-    protected PropertyValueObjectFactory propertyFactory;
-
-    
-    /**
-     * @param rc
-     * @param ct
-     * @param implementation
-     * @param propertyFactory
-     */
-    public ScriptInvokerFactory(RuntimeComponent rc,
-                                ComponentType ct,
-                                ScriptImplementation implementation,
-                                PropertyValueObjectFactory propertyFactory) {
-        super();
-        this.rc = rc;
-        this.ct = ct;
-        this.implementation = implementation;
-        this.propertyFactory = propertyFactory;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        init(rc, ct, implementation, propertyFactory);
-        return new ScriptInvoker(scriptEngine, xmlHelper, operation);
-    }
-    
-    protected synchronized void init(RuntimeComponent rc, ComponentType ct, ScriptImplementation implementation, PropertyValueObjectFactory propertyFactory) {
-        if(scriptEngine!=null) {
-            return;
-        }
-        try {
-            scriptEngine = getScriptEngineByExtension(implementation.getScriptLanguage());
-            if (scriptEngine == null) {
-                throw new ObjectCreationException("no script engine found for language: " + implementation.getScriptLanguage());
-            }
-            if (!(scriptEngine instanceof Invocable)) {
-                throw new ObjectCreationException("script engine does not support Invocable: " + scriptEngine);
-            }
-            
-            for (Reference reference : ct.getReferences()) {
-                scriptEngine.put(reference.getName(), createReferenceProxy(reference.getName(), rc));
-            }
-
-            for (Property property : ct.getProperties()) {
-                ObjectFactory<?> propertyValueFactory = propertyFactory.createValueFactory(property);
-                if ( propertyValueFactory != null) {
-                    scriptEngine.put(property.getName(), propertyValueFactory.getInstance());
-                }
-            }
-            
-            scriptEngine.eval(new StringReader(implementation.getScriptSrc()));
-
-        } catch (ScriptException e) {
-            throw new ObjectCreationException(e);
-        }
-
-        // set the databinding and XMLHelper for WSDL interfaces
-        for (Service service : rc.getServices()) {
-            InterfaceContract ic = service.getInterfaceContract();
-            if (ic instanceof WSDLInterfaceContract) {
-                // Set to use the Axiom data binding
-                ic.getInterface().resetDataBinding(OMElement.class.getName());
-                xmlHelper = XMLHelper.getArgHelper(scriptEngine);
-            }
-        }
-    }
-
-    /**
-     * TODO: RuntimeComponent should provide a method like this
-     */
-    @SuppressWarnings("unchecked")
-    protected Object createReferenceProxy(String name, RuntimeComponent component) {
-        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);
-    }
-
-    /**
-     * Hack for now to work around a problem with the JRuby script engine
-     */
-    protected ScriptEngine getScriptEngineByExtension(String scriptExtn) {
-        if ("rb".equals(scriptExtn)) {
-            return new TuscanyJRubyScriptEngine();
-        } else {
-            if ("py".equals(scriptExtn)) {
-                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(scriptExtn);
-        }
-    }
-
-    /**
-     * If the Python home isn't set then let Tuscany suppress messages other than errors
-     * See TUSCANY-1950
-     */
-    protected void pythonCachedir() {
-            if (System.getProperty("python.home") == null) {
-              System.setProperty("python.verbose", "error");
-            }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
deleted file mode 100644
index 5ad84e22ca..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
+++ /dev/null
@@ -1,500 +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.Reader;

-import java.lang.reflect.InvocationHandler;

-import java.lang.reflect.Method;

-import java.lang.reflect.Proxy;

-import java.security.AccessController;

-import java.security.PrivilegedAction;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-

-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.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.javasupport.Java;

-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.runtime.load.LoadService;

-

-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;

-        }

-

-        @Override

-        public ScriptEngine getEngine() {

-            return TuscanyJRubyScriptEngine.this;

-        }

-

-        @Override

-        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 {       

-        return invokeImpl(null, name, args, Object.class);

-    }

-

-    public Object invokeMethod(Object obj, String name, Object[] args) 

-                         throws ScriptException {       

-        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(

-                 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 {

-            setGlobalVariables(ctx);

-            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);

-            if (filename == null) {

-                filename = "<unknown>";

-            }

-            return runtime.parse(script, filename, null, 0);

-        } catch (Exception exp) { 

-            throw new ScriptException(exp);

-        } finally {

-            if (oldGlobals != null) {

-                //setGlobalVariables(oldGlobals);

-            }

-        }

-    }

-

-    private synchronized Node compileScript(Reader reader, ScriptContext ctx) 

-                                 throws ScriptException {        

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();  

-        try {

-            setGlobalVariables(ctx);

-            String filename = (String) ctx.getAttribute(ScriptEngine.FILENAME);

-            if (filename == null) {

-                filename = "<unknown>";

-            }

-            return runtime.parse(reader, filename, null, 0);

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        } finally {

-            if (oldGlobals != null) {

-                //setGlobalVariables(oldGlobals);

-            }

-        }

-    }

-

-    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);

-                        }

-                        return oldValue;

-                    }

-                }

-

-                @Override

-                public Iterator getNames() {                    

-                    List list = new ArrayList();

-                    synchronized (ctx) {

-                        Iterator<Integer> iterator = ctx.getScopes().iterator();

-                        int scope;

-                        while (iterator.hasNext()) {

-                            scope = iterator.next().intValue();

-                            Bindings b = ctx.getBindings(scope);

-                            if (b != null) {

-                                Iterator<String> bIterator = b.keySet().iterator();

-                                while (bIterator.hasNext()) {

-                                    list.add(bIterator.next());

-                                }

-                            }

-                        }

-                    }

-                    for (Iterator names = parent.getNames(); names.hasNext();) {

-                        list.add(names.next());

-                    }

-                    return Collections.unmodifiableList(list).iterator();

-                }

-            });

-    }

-

-    private void setGlobalVariables(GlobalVariables globals) {

-        runtime.setGlobalVariables(globals);

-    }

-

-    private synchronized Object evalNode(Node node, ScriptContext ctx) 

-                            throws ScriptException {

-        GlobalVariables oldGlobals = runtime.getGlobalVariables();

-        try {

-            setGlobalVariables(ctx);

-            return rubyToJava(runtime.eval(node));

-        } catch (RaiseException exp) {

-            RubyException rexp = exp.getException();

-            throw new ScriptException(rexp.toString());

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        } finally {

-            if (oldGlobals != null) {

-                //setGlobalVariables(oldGlobals);

-            }

-        }

-    }

-

-    private void init(String loadPath) {    

-        // Allow privileged access to ready properties. Requires PropertyPermission in security

-        // policy.

-        //runtime = Ruby.getDefaultInstance();

-        runtime = AccessController.doPrivileged(new PrivilegedAction<Ruby>() {

-            public Ruby run() {

-                return Ruby.getDefaultInstance();

-            }

-        });

-        if (loadPath == null) {

-            // Allow privileged access to ready properties. Requires PropertyPermission in security

-            // policy.

-            loadPath = AccessController.doPrivileged(new PrivilegedAction<String>() {

-                public String run() {

-                    return System.getProperty("java.class.path");

-                }

-            });

-        }

-        List list = new ArrayList(Arrays.asList(loadPath.split(File.pathSeparator)));

-        list.add("META-INF/jruby.home/lib/ruby/site_ruby/1.8");

-        list.add("META-INF/jruby.home/lib/ruby/site_ruby/1.8/java");

-        list.add("META-INF/jruby.home/lib/ruby/site_ruby");

-        list.add("META-INF/jruby.home/lib/ruby/1.8");

-        list.add("META-INF/jruby.home/lib/ruby/1.8/java");

-        list.add("lib/ruby/1.8");

-        final List finalList = list;

-        // runtime.getLoadService().init(list);

-        // Allow privileged access to ready properties. Requires PropertyPermission in security

-        // policy.

-        final LoadService loadService = runtime.getLoadService();

-        AccessController.doPrivileged(new PrivilegedAction<Object>() {

-            public Ruby run() {

-                loadService.init(finalList);

-                // loadService.require("java");

-                return null;

-            }

-        });        

-    }

-

-    private Object invokeImpl(final Object obj, String method, 

-                        Object[] args, Class returnType)

-                        throws ScriptException {

-        if (method == null) {

-            throw new NullPointerException("method name is null");

-        }

-

-        try {

-            IRubyObject rubyRecv = obj != null ? 

-                  JavaUtil.convertJavaToRuby(runtime, obj) : runtime.getTopSelf();

-

-            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);

-                }

-            }

-

-            IRubyObject result = rubyRecv.callMethod(runtime.getCurrentContext(), method, rubyArgs);

-            return rubyToJava(result, returnType);

-        } catch (Exception exp) {

-            throw new ScriptException(exp);

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator b/tags/java/sca/1.3/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
deleted file mode 100644
index c8152b606f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.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

-org.apache.tuscany.sca.implementation.script.ScriptImplementationActivator

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
deleted file mode 100644
index fc87f92ef1..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.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.script.itests;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected SCADomain domain;
-    protected T service;
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        service = (T) domain.getService(getServiceClass(), "ClientComponent");
-    }
-    
-    protected abstract Class getServiceClass();
-
-    @Override
-    protected void tearDown() throws Exception {
-        domain.close();
-    }
-
-    protected String getCompositeName() {
-        String className = this.getClass().getName();
-        return className.substring(0, className.length() - 8).replace('.', '/') + ".composite";
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 09239cd38f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/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.dynamic;
-
-import org.apache.tuscany.sca.implementation.script.itests.AbstractSCATestCase;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
-
-    public void testHello() throws Exception {
-        assertEquals("Hello petra", service.sayHello("petra"));
-    }
-    
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
deleted file mode 100644
index 5781f4f2c9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.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.script.itests.dynamic;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface HelloWorld {
-
-    String sayHello(String s);
-    String sayHelloFrom(String s);
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
deleted file mode 100644
index e88e44c7c0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.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.dynamic;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaScriptDynamicRefTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
deleted file mode 100644
index 331d5bcfd4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.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.dynamic;
-
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaScriptHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-    
-    public void testHelloFrom() throws Exception {
-        System.out.println(service.sayHelloFrom("Venkat"));
-        assertEquals("Hello petra from Tuscany", service.sayHelloFrom("petra"));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
deleted file mode 100644
index 1af3a295a4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
deleted file mode 100644
index 6a4f10dbbb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
deleted file mode 100644
index f87cf104f3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
deleted file mode 100644
index 980864869f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
deleted file mode 100644
index ca4bd5ae6a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
deleted file mode 100644
index 93d1949c50..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.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 JavaScripInlineHelloWorldTestCase extends AbstractHelloWorldTestCase {
-    // super class does it all getting composite based on this class name
-}
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
deleted file mode 100644
index 46ed9abce6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
deleted file mode 100644
index d694515829..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
deleted file mode 100644
index e7375253a3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
deleted file mode 100644
index f93edc76d1..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
deleted file mode 100644
index 910d22ec83..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
deleted file mode 100644
index 47cdc03e0e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
deleted file mode 100644
index 60c73359c0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
deleted file mode 100644
index cde96b4b9b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
deleted file mode 100644
index 0e6be74e09..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
deleted file mode 100644
index 6116581356..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
deleted file mode 100644
index dfcd37c46c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
deleted file mode 100644
index 83c2e99469..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
deleted file mode 100644
index 392e16411c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
deleted file mode 100644
index 8866ae6b70..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
deleted file mode 100644
index 77ba095988..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.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"

-           name="JavaScriptHelloWorld">

-

-    <component name="ClientComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js"/>

-        <reference name="delegate" target="DelegateComponent">

-           <interface.java interface="org.apache.tuscany.sca.implementation.script.itests.dynamic.HelloWorld" />

-        </reference>

-    </component>

-

-    <component name="DelegateComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js"/>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
deleted file mode 100644
index 4e71a4a3e6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.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"

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

-           name="JavaScriptHelloWorld">

-

-    <component name="ClientComponent">

-        <tuscany:implementation.script script="org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js"/>

-        <property name="greeter" type="xsd:string">Tuscany</property>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
deleted file mode 100644
index beee72314d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
+++ /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.    
- */
-
-function sayHello(s) {
-   return "Hello " + s;
-}
-
-function sayHelloFrom(s) {
-   return "Hello " + s + " from " + greeter;
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
deleted file mode 100644
index 69a2f2e639..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.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 delegate.sayHello(s);
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
deleted file mode 100644
index ce377e4ed3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
deleted file mode 100644
index 4d32ed9f6b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
deleted file mode 100644
index 7ddf517b96..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.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"

-           name="JavaScriptHelloWorld">

-

-    <component name="ClientComponent">

-        <tuscany:implementation.script language="js">

-

-           function sayHello(s) {

-              return "Hello " + s;

-           }

-

-        </tuscany:implementation.script>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
deleted file mode 100644
index 13cb94d511..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
deleted file mode 100644
index c641b82cd6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
deleted file mode 100644
index bb0ddd002f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
deleted file mode 100644
index 9f89bd373e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
deleted file mode 100644
index eac2ab283f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
deleted file mode 100644
index f5dd0f8fcf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
deleted file mode 100644
index cd2d3bcaea..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
deleted file mode 100644
index 26574c6266..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
deleted file mode 100644
index a3551cefc3..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
deleted file mode 100644
index f72c6e922f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
deleted file mode 100644
index bd754c8d2e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
deleted file mode 100644
index 06f261015e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
deleted file mode 100644
index a7eb446d37..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
deleted file mode 100644
index 64df3ebbef..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
deleted file mode 100644
index 868cfa9eeb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
deleted file mode 100644
index 2844f8b8d9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
deleted file mode 100644
index 175bb79104..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
deleted file mode 100644
index 7581b633cc..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
deleted file mode 100644
index 91085b9eb2..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
deleted file mode 100644
index 535164aae7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
deleted file mode 100644
index 3edd075126..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
deleted file mode 100644
index 5d2216d583..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
deleted file mode 100644
index ad0a932d26..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
deleted file mode 100644
index aee8bf991d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/tags/java/sca/1.3/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
deleted file mode 100644
index 87f0f56082..0000000000
--- a/tags/java/sca/1.3/modules/implementation-script/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/tags/java/sca/1.3/modules/implementation-spring/LICENSE b/tags/java/sca/1.3/modules/implementation-spring/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-spring/NOTICE b/tags/java/sca/1.3/modules/implementation-spring/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/pom.xml b/tags/java/sca/1.3/modules/implementation-spring/pom.xml
deleted file mode 100644
index c32cf10850..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <!-- Temporarily depend on implementation-script for a set of utility classes -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</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>
-
-
-    <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.implementation.spring</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.spring*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAApplicationContext.java
deleted file mode 100644
index b550fc3229..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/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;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCANamespaceHandlerResolver.java
deleted file mode 100644
index 32f575fe46..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/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;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
deleted file mode 100644
index 7c5d0f46d6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SCAParentApplicationContext.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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.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) $
- */
-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, 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 )
-
-    /**
-     * 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 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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
deleted file mode 100644
index 45f00ce1af..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaNamespaceHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * 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.implementation.spring;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
deleted file mode 100644
index dc532ce20d..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaPropertyBeanDefinitionParser.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * 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.implementation.spring;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
deleted file mode 100644
index 1dd44cd752..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaReferenceBeanDefinitionParser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * 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.implementation.spring;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
deleted file mode 100644
index 9dadcd2f49..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/ScaServiceBeanDefinitionParser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- * 
- * 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.implementation.spring;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanNotFoundException.java
deleted file mode 100644
index 35df76fabc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
deleted file mode 100644
index 56af997fae..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.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.implementation.spring;
-
-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.spring.xml.SpringBeanElement;
-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;
-
-    protected SpringImplementation() {
-        this.location = null;
-        this.resource = null;
-        setUnresolved(true);
-        serviceMap = new Hashtable<String, SpringBeanElement>();
-        propertyMap = new Hashtable<String, Class>();
-    } // end method SpringImplementation
-
-    /* Returns the location attribute for this Spring implementation */
-    public String getLocation() {
-        return location;
-    }
-
-    /**
-     * Sets the location attribute for this Spring implementation
-     * location - a URI to the Spring application-context file
-     */
-    public void setLocation(String location) {
-        this.location = location;
-        return;
-    }
-
-    public void setResource(Resource resource) {
-        this.resource = resource;
-    }
-
-    public Resource getResource() {
-        return resource;
-    }
-
-    /* 
-     * Returns the componentType for this Spring implementation 
-     */
-    public ComponentType getComponentType() {
-        return componentType;
-    }
-
-    /*
-     * Sets the componentType for this Spring implementation
-     */
-    public void setComponentType(ComponentType componentType) {
-        this.componentType = componentType;
-    }
-
-    @Override
-    public List<Service> getServices() {
-        return componentType.getServices();
-    }
-
-    @Override
-    public List<Reference> getReferences() {
-        return componentType.getReferences();
-    }
-
-    @Override
-    public List<Property> getProperties() {
-        return componentType.getProperties();
-    }
-
-    /**
-     * 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;
-    } // end method setPropertyClass
-
-    /**
-     * 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);
-    } // end method getPropertyClass
-}
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
deleted file mode 100644
index c886c0390c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-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.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.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 PolicyFactory policyFactory;
-    private PolicyAttachPointProcessor policyProcessor;
-    private Monitor monitor;
-    
-    public SpringImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.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 = new ProblemImpl(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 = new ProblemImpl(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);
-        }
-
-        // 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, 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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.java
deleted file mode 100644
index d7724f1723..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProvider.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.implementation.spring;
-
-import org.apache.tuscany.sca.core.invocation.ProxyFactory;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.java
deleted file mode 100644
index f2bb1fd6e8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProviderFactory.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.implementation.spring;
-
-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.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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvocationException.java
deleted file mode 100644
index 410525a054..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/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;
-
-/**
- * @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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.java
deleted file mode 100644
index 5eeb802727..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringInvoker.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.implementation.spring;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.java
deleted file mode 100644
index b34b1ee0b1..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringOperationNotFoundException.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;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SpringOperationNotFoundException extends Exception {
-
-    private static final long serialVersionUID = -1157790036638157554L;
-
-    public SpringOperationNotFoundException(String msg) {
-        super(msg);
-    }
-    
-    public SpringOperationNotFoundException(Throwable e) {
-        super(e);
-    }
-    
-    public SpringOperationNotFoundException(String msg,Throwable e) {
-        super(msg,e);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.java
deleted file mode 100644
index 3f98180498..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyValueObjectFactory.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.spring;
-
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.java.injection.JavaPropertyValueObjectFactory;
-
-/**
- *
- * Factory class for PropertyValueObjects for Spring implementations
- *
- * 6th May 2007: Chosen a very simple design for this class - since Spring implementations are a form
- * of Java POJO, the simple design chosen for this class is to re-use the PropertyValueObjectFactory
- * implementation from the base implementation-java-runtime package of Tuscany SCA Java, since the
- * same properties are going to be rendered in the same way to simple Tuscany POJOs and to Spring
- * Bean POJOs.  Mike Edwards
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringPropertyValueObjectFactory extends JavaPropertyValueObjectFactory {
-
-    /**
-     * Constructor simply defers to the superclass, along with the complete implementation...
-     */
-    public SpringPropertyValueObjectFactory(Mediator mediator) {
-        super(mediator);
-    } // end constructor JavaPropertyValueObjectFactory(Mediator mediator)
-
-} // end class SpringPropertyValueObjectFactory
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.java
deleted file mode 100644
index b39c5d674e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanElement.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.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>();
-
-    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);
-    }
-
-} // end class SpringBeanElement
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.java
deleted file mode 100644
index 625a46b12b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringBeanIntrospector.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.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.service.ContributionResolveException;
-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.JavaElementImpl;
-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.ScopeProcessor;
-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;
-
-/**
- * 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,
-                                  PolicyFactory policyFactory) {
-
-        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, javaFactory),
-                                        new ResourceProcessor(assemblyFactory),
-                                        new ScopeProcessor(assemblyFactory),
-                                        new ServiceProcessor(assemblyFactory, javaFactory),
-                                        new HeuristicPojoProcessor(assemblyFactory, javaFactory),
-                                        new PolicyProcessor(assemblyFactory, policyFactory)};
-        for (JavaClassVisitor extension : extensions) {
-            javaImplementationFactory.addClassVisitor(extension);
-        }
-
-    } // 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)
-        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());
-        } 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/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.java
deleted file mode 100644
index ceee459e3e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringPropertyElement.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.spring.xml;
-
-/**
- * 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;
-
-    public SpringPropertyElement(String name, String ref) {
-        this.name = name;
-        this.ref = ref;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getRef() {
-        return ref;
-    }
-
-} // end class SpringPropertyElement
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java
deleted file mode 100644
index b3f0b8bbf9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.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.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 String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringPropertyElement
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.java
deleted file mode 100644
index 9e55f30b46..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAReferenceElement.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.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 String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringSCAReferenceElement
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.java
deleted file mode 100644
index 85b29e5684..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAServiceElement.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 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 String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-} // end class SpringSCAServiceElement
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java b/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
deleted file mode 100644
index cf2ebdc701..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringXMLComponentTypeLoader.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
-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 static final String SCA_NS = "http://www.springframework.org/schema/sca";
-    private static final String SPRING_NS = "http://www.springframework.org/schema/beans";
-    private static final QName SERVICE_ELEMENT = new QName(SCA_NS, "service");
-    private static final QName REFERENCE_ELEMENT = new QName(SCA_NS, "reference");
-    private static final QName SCAPROPERTY_ELEMENT = new QName(SCA_NS, "property");
-    private static final QName BEANS_ELEMENT = new QName(SPRING_NS, "beans");
-    private static final QName BEAN_ELEMENT = new QName(SPRING_NS, "bean");
-    private static final QName PROPERTY_ELEMENT = new QName(SPRING_NS, "property");
-    private static final String APPLICATION_CONTEXT = "application-context.xml";
-
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private ClassLoader cl;
-
-    private SpringBeanIntrospector beanIntrospector;
-
-    public SpringXMLComponentTypeLoader(AssemblyFactory assemblyFactory,
-                                        JavaInterfaceFactory javaFactory,
-                                        PolicyFactory policyFactory) {
-        super();
-        this.assemblyFactory = assemblyFactory;
-        this.javaFactory = javaFactory;
-        beanIntrospector =
-            new SpringBeanIntrospector(assemblyFactory, javaFactory, 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>();
-        SpringBeanElement bean = null;
-
-        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");
-
-            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 (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 (REFERENCE_ELEMENT.equals(qname)) {
-                            SpringSCAReferenceElement reference =
-                                new SpringSCAReferenceElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            references.add(reference);
-                        } else if (SCAPROPERTY_ELEMENT.equals(qname)) {
-                            SpringSCAPropertyElement scaproperty =
-                                new SpringSCAPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "type"));
-                            scaproperties.add(scaproperty);
-                        } else if (BEAN_ELEMENT.equals(qname)) {
-                            // TODO FIX THIS !!
-                            //FIXME count is never used
-                            //int count = reader.getAttributeCount();
-                            bean =
-                                new SpringBeanElement(reader.getAttributeValue(null, "id"), reader
-                                    .getAttributeValue(null, "class"));
-                            beans.add(bean);
-                        } else if (PROPERTY_ELEMENT.equals(qname)) {
-                            SpringPropertyElement property =
-                                new SpringPropertyElement(reader.getAttributeValue(null, "name"), reader
-                                    .getAttributeValue(null, "ref"));
-                            bean.addProperty(property);
-                        } // end if
-                        break;
-                    case END_ELEMENT:
-                        if (BEANS_ELEMENT.equals(reader.getName())) {
-                            //System.out.println("Spring TypeLoader - finished read of context file");
-                            completed = true;
-                            break;
-                        } // end if
-                } // end switch
-            } // end while
-
-        } 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
-
-    /**
-     * 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);
-                    // 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);
-                        // 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 = new File(locationAttr);
-
-        if (!locationFile.exists()) {
-            // FIXME hack
-            URL url = cl.getResource(locationAttr);
-            if (url != null) {
-                return new UrlResource(url);
-            }
-            throw new ContributionReadException(
-                                                "SpringXMLLoader getApplicationContextResource: " + "unable to find resource file "
-                                                    + locationFile.toString());
-        }
-
-        if (locationFile.isDirectory()) {
-            try {
-                manifestFile = new File(locationFile, "META-INF/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, APPLICATION_CONTEXT);
-                if (appXmlFile.exists()) {
-                    return new UrlResource(appXmlFile.toURL());
-                }
-            } catch (IOException e) {
-                throw new ContributionReadException("Error reading manifest " + manifestFile);
-            }
-        } 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.toURL() + "!/" + appCtxPath));
-                        }
-                    }
-                }
-                je = jf.getJarEntry(APPLICATION_CONTEXT);
-                if (je != null) {
-                    return new UrlResource(new URL("jar:" + locationFile.toURI().toURL() + "!" + 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: " + 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/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 4b71cef6c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index ab707cfd68..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.SpringImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.spring.SpringImplementation

diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.handlers b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 4e7df50291..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1,3 +0,0 @@
-http\://www.springframework.org/schema/sca=org.springframework.sca.config.ScaNamespaceHandler

-

-

diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.schemas b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 4374e4f1b0..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/sca/spring-sca.xsd=org/springframework/sca/xml/spring-sca.xsd

diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
deleted file mode 100644
index 6fce02664a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/tags/java/sca/1.3/modules/implementation-spring/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
deleted file mode 100644
index e20f4e8158..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
deleted file mode 100644
index 6b2d114756..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.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;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractSCATestCase<T> extends TestCase {
-
-    protected SCADomain domain;
-    protected T service;
-
-    @Override
-    protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
-        service = (T)domain.getService(getServiceClass(), "ClientComponent");
-    }
-
-    protected abstract Class 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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.java
deleted file mode 100644
index f8019cba42..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/AbstractHelloWorldTestCase.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.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"));
-    }
-
-    @Override
-    protected Class<HelloWorld> getServiceClass() {
-        return HelloWorld.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorld.java
deleted file mode 100644
index fd295daaf6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 65ab096855..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/HelloWorldProxy.java
deleted file mode 100644
index bd35e9f3b9..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.osoa.sca.annotations.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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorldTestCase.java
deleted file mode 100644
index 86f979fe15..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReferenceTestCase.java
deleted file mode 100644
index 44016ad249..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorldTestCase.java
deleted file mode 100644
index 74dcf32723..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReferenceTestCase.java
deleted file mode 100644
index 97f91ff91e..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAPropertyTestCase.java
deleted file mode 100644
index 2c46f8c066..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBean.java
deleted file mode 100644
index 4d60bffef8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestBeanImpl.java
deleted file mode 100644
index acad9f2fea..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestHelloWorldBean.java
deleted file mode 100644
index f165bb8b75..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReference.java
deleted file mode 100644
index a1d9b5a2f4..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestReferenceBean.java
deleted file mode 100644
index ab4c07d059..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java b/tags/java/sca/1.3/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/mock/TestSCAPropertyBean.java
deleted file mode 100644
index 0f00c7e480..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitHelloWorld-context.xml
deleted file mode 100644
index 0733f49de8..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringExplicitReference-context.xml
deleted file mode 100644
index c7feddf87f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringHelloWorld-context.xml
deleted file mode 100644
index d59205e066..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringImplicitReference-context.xml
deleted file mode 100644
index f366c6819f..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/SpringSCAProperty-context.xml
deleted file mode 100644
index a181446ffb..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/testReferenceContext.xml
deleted file mode 100644
index aef5a5524b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/META-INF/sca/testServiceContext.xml
deleted file mode 100644
index fb9fb03692..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitHelloWorld.composite
deleted file mode 100644
index 79f4041fe6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringExplicitReference.composite
deleted file mode 100644
index 87353b69ea..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringHelloWorld.composite
deleted file mode 100644
index ebb693d243..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringImplicitReference.composite
deleted file mode 100644
index 9f51277d22..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/org/apache/tuscany/sca/implementation/spring/itests/helloworld/SpringSCAProperty.composite
deleted file mode 100644
index b811122b41..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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="META-INF/sca/SpringSCAProperty-context.xml"/>

-        <property name="TestProperty">Hello</property>

-    </component>

-

-</composite>

diff --git a/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/test.xml b/tags/java/sca/1.3/modules/implementation-spring/src/test/resources/test.xml
deleted file mode 100644
index 477ca69a38..0000000000
--- a/tags/java/sca/1.3/modules/implementation-spring/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.springframework.org/schema/sca/spring-sca.xsd">
-
-    <bean id="testBean" class="org.apache.tuscany.sca.implementation.spring.itests.mock.TestBeanImpl" />
-
-</beans>
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/LICENSE b/tags/java/sca/1.3/modules/implementation-widget-runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/NOTICE b/tags/java/sca/1.3/modules/implementation-widget-runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget-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/tags/java/sca/1.3/modules/implementation-widget-runtime/pom.xml b/tags/java/sca/1.3/modules/implementation-widget-runtime/pom.xml
deleted file mode 100644
index 7b2649617b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget-runtime/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </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>
-        
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-               
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>   
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.widget.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.widget*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
deleted file mode 100644
index 6ea37321e7..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.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.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.URL;
-
-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.assembly.OptimizableBinding;
-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 (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 {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        PrintWriter pw = new PrintWriter(bos);
-
-        pw.println();
-        pw.println("/* Apache Tuscany SCA Widget header */");
-        pw.println();
-        
-        for(ComponentReference reference : component.getReferences()) {
-            for(Binding binding : reference.getBindings()) {
-                String bindingProxyName = WidgetProxyHelper.getJavaScriptProxyFile(binding.getClass().getName());
-                if(bindingProxyName != null) {
-                    generateJavaScriptBindingProxy(pw,bindingProxyName);
-                }
-            }
-        }
-        
-        //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 {
-        
-        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) {
-                    
-                    //FIXME Eventually the binding URI should be initialized from the SCA domain
-                    // for now point to the target binding model directly, assuming that it's available
-                    // in the same node
-                    String targetURI = null;
-                    if (binding instanceof OptimizableBinding) {
-                        Binding targetBinding = ((OptimizableBinding)binding).getTargetBinding();
-                        if (targetBinding != null) {
-                            targetURI = URI.create(targetBinding.getURI()).getPath();
-                        }
-                    }
-                    if (targetURI == null) {
-                        targetURI = URI.create(binding.getURI()).getPath();
-                        if (!targetURI.startsWith("/")) {
-                            targetURI = "/" + targetURI;
-                        }
-                    }
-                    
-                    if(proxyClient.equals("JSONRpcClient")) {
-                        pw.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetURI + "\").Service;");
-                    } else {
-                        pw.println("referenceMap." + referenceName + " = new " + proxyClient + "(\"" + targetURI + "\");");
-                    }
-                }                
-            }
-        }
-        
-        pw.println("function Reference(name) {");
-        pw.println("    return referenceMap[name];");
-        pw.println("}");
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
deleted file mode 100644
index 61176d912c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
deleted file mode 100644
index c57680fa1c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetProxyHelper.java
deleted file mode 100644
index 5a0146a749..0000000000
--- a/tags/java/sca/1.3/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", "binding-atom.js");
-        proxyClient.put("org.apache.tuscany.sca.binding.atom.impl.AtomBindingImpl", "AtomClient");
-        
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding", "binding-jsonrpc.js");
-        proxyClient.put("org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding", "JSONRpcClient");
-
-        proxyFileRegistry.put("org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl", "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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index d0f73cbdbb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-atom.js b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-atom.js
deleted file mode 100644
index 2719e9a9b9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-http.js
deleted file mode 100644
index 60bd841679..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/main/resources/binding-jsonrpc.js
deleted file mode 100644
index ca3c2a8605..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
deleted file mode 100644
index 3b5c6f89b2..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.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.widget;
-
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WidgetImplementationTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("widget.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-    
-    public void testPing() throws Exception {
-        new Socket("127.0.0.1", 8085);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/Catalog.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/Catalog.java
deleted file mode 100644
index 370474f29f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Interface for the Catalog Service.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface Catalog {
-    String[] get();
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/CatalogImpl.java
deleted file mode 100644
index f694c758dc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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 - US$ 2.99");
-        catalog.add("Orange - US$ 3.55");
-        catalog.add("Pear - US$ 1.55");
-    }
-
-    public String[] get() {
-        String[] catalogArray = new String[catalog.size()];
-        catalog.toArray(catalogArray);
-        return catalogArray;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/java/store/ShoppingCartImpl.java
deleted file mode 100644
index d4d2810d5c..0000000000
--- a/tags/java/sca/1.3/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.setEdited(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();
-            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/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/resources/content/store.html b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/resources/content/store.html
deleted file mode 100644
index c2277772bf..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/resources/content/store.html
+++ /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.    

--->

-<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) {

-		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>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/resources/widget.composite b/tags/java/sca/1.3/modules/implementation-widget-runtime/src/test/resources/widget.composite
deleted file mode 100644
index f23d6a20f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget/LICENSE b/tags/java/sca/1.3/modules/implementation-widget/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget/NOTICE b/tags/java/sca/1.3/modules/implementation-widget/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget/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/tags/java/sca/1.3/modules/implementation-widget/pom.xml b/tags/java/sca/1.3/modules/implementation-widget/pom.xml
deleted file mode 100644
index 5aedc1a0b6..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.widget</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.widget*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
deleted file mode 100644
index f47850a05c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
deleted file mode 100644
index 7bb852ae0c..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.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.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;
-    }    
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
deleted file mode 100644
index 2493b97f5c..0000000000
--- a/tags/java/sca/1.3/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.contribution.ModelFactoryExtensionPoint;
-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(ModelFactoryExtensionPoint modelFactories) {
-        assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
-    }
-
-    public WidgetImplementation createWidgetImplementation() {
-        return new WidgetImplementation(assemblyFactory, javaFactory);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
deleted file mode 100644
index eed0d6871b..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.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.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("=");
-        tokens = tokens[0].split(" ");
-        referenceName = tokens[tokens.length -1];
-        
-        if(referenceName != null) {
-            reference = assemblyFactory.createReference();
-            reference.setName(referenceName);            
-        }
-        
-        return reference;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
deleted file mode 100644
index bd91dd7632..0000000000
--- a/tags/java/sca/1.3/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.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.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.builder.impl.ProblemImpl;
-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.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;
-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(ModelFactoryExtensionPoint 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 = new ProblemImpl(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 = new ProblemImpl(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/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6c167a6b31..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
deleted file mode 100644
index fc45baa16d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
deleted file mode 100644
index 3778bd4c50..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/LICENSE b/tags/java/sca/1.3/modules/implementation-xquery/LICENSE
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/NOTICE b/tags/java/sca/1.3/modules/implementation-xquery/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/implementation-xquery/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/tags/java/sca/1.3/modules/implementation-xquery/pom.xml b/tags/java/sca/1.3/modules/implementation-xquery/pom.xml
deleted file mode 100644
index d015834e7a..0000000000
--- a/tags/java/sca/1.3/modules/implementation-xquery/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.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.implementation.xquery</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.xquery*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
deleted file mode 100644
index f5bc5dd9b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
deleted file mode 100644
index bdfd390499..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
deleted file mode 100644
index 63a3a49e13..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
deleted file mode 100644
index 57536e502b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
deleted file mode 100644
index 0c628b3715..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
deleted file mode 100644
index 2190c45e64..0000000000
--- a/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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 the result is returned depending on its type
-     *    (i.e. it could be either a node NodeInfo or Value object). Currently
-     *    no collections are supported, i.e. if there is more then one element
-     *    in the result only the first one will be returned
-     *    
-     *    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;
-        }
-        Item item = iterator.next();
-        if (item == null) {
-            return null;
-        }
-        if (item instanceof NodeInfo) {
-            return item;
-        } else {
-            return Value.asValue(item);
-        }
-    }
-
-    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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
deleted file mode 100644
index 5e77575c3c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
deleted file mode 100644
index 77c8eea511..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
deleted file mode 100644
index 9adce78310..0000000000
--- a/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.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.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.assembly.builder.impl.ProblemImpl;
-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.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;
-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 LOCATION = "location";
-    private static final String IMPLEMENTATION_XQUERY = "implementation.xquery";
-    private static final QName IMPLEMENTATION_XQUERY_QNAME =
-        new QName(Constants.SCA10_TUSCANY_NS, IMPLEMENTATION_XQUERY);
-    
-    private AssemblyFactory assemblyFactory;
-    private JavaInterfaceFactory javaFactory;
-    private ContributionFactory contributionFactory;
-    private Monitor monitor;
-
-    public XQueryImplementationProcessor(ModelFactoryExtensionPoint 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 = new ProblemImpl(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(Constants.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/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
deleted file mode 100644
index 6f18e518bd..0000000000
--- a/tags/java/sca/1.3/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-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 = javaFactory.createJavaInterface(interfaze);
-        //setDataBindingForInterface(callInterface, DataObject.class.getName());
-        service.getInterfaceContract().setInterface(callInterface);
-        if (callInterface.getCallbackClass() != null) {
-            JavaInterface callbackInterface = javaFactory.createJavaInterface(callInterface.getCallbackClass());
-            //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
-        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;
-    }
-
-    /**
-     * 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/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index a51995e56d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 7ccc08d1ee..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/tags/java/sca/1.3/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
deleted file mode 100644
index 33c605de27..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/interface-java-jaxws/LICENSE b/tags/java/sca/1.3/modules/interface-java-jaxws/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-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/tags/java/sca/1.3/modules/interface-java-jaxws/NOTICE b/tags/java/sca/1.3/modules/interface-java-jaxws/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/pom.xml b/tags/java/sca/1.3/modules/interface-java-jaxws/pom.xml
deleted file mode 100644
index d7e9667e7b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/pom.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-java-jaxws</artifactId>
-    <name>Apache Tuscany Java Interface for JAXWS</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </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>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>3.1</version>
-            <scope>compile</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>
-        <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>wsimport</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.example.stock</packageName>
-                            <wsdlDirectory>${basedir}/src/test/resources/wsdl</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>StockExceptionTest.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-
-                    <!-- 
-                    <execution>
-                        <id>wsgen</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>wsgen-test</goal>
-                        </goals>
-                        <configuration>
-                            <sei>org.apache.tuscany.sca.interfacedef.java.jaxws.MyServiceImpl</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>
-
-            <!-- 
-            wsimport cannot handle WSDL files without a service/binding element.
-            CXF wsdl2java plugin does support that. I had to override the default 
-            value of wsdlRoot/testWsdlRoot to a non-existent file to avoid NPE -->
-            <!-- 
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-
-                        <configuration>
-                            <sourceRoot>${basedir}/target/jaxws-source</sourceRoot>
-                            <wsdlRoot>NONE</wsdlRoot>
-                            <testWsdlRoot>NONE</testWsdlRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/Stock.wsdl</wsdl>
-                                    <outputDir>${basedir}/target/jaxws-source</outputDir>
-                                    <packagenames>
-                                        <packagename>com.example.stock.cxf</packagename>
-                                    </packagenames>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </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.interface.java.jaxws</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java.jaxws*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
deleted file mode 100644
index bfc633b00b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.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.interfacedef.java.jaxws;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-public abstract class BaseBeanGenerator implements Opcodes {
-    private static final Map<String, String> COLLECTION_CLASSES = new HashMap<String, String>();
-    static {
-        COLLECTION_CLASSES.put("Ljava/util/Collection;", "java/util/ArrayList");
-        COLLECTION_CLASSES.put("Ljava/util/List;", "java/util/ArrayList");
-        COLLECTION_CLASSES.put("Ljava/util/Set;", "java/util/HashSet");
-        COLLECTION_CLASSES.put("Ljava/util/Queue;", "java/util/LinkedList");
-    }
-    protected static final Map<Object, Class<?>> generatedClasses =
-        Collections.synchronizedMap(new WeakHashMap<Object, Class<?>>());
-
-    protected XMLAdapterExtensionPoint xmlAdapters;
-
-    public byte[] defineClass(ClassWriter cw,
-                              String classDescriptor,
-                              String classSignature,
-                              String namespace,
-                              String name,
-                              BeanProperty[] properties) {
-        // Declare the class
-        declareClass(cw, classDescriptor);
-
-        // Compute the propOrder
-        String[] propOrder = null;
-        if (properties != null && properties.length > 0) {
-            int size = properties.length;
-            propOrder = new String[size];
-            for (int i = 0; i < size; i++) {
-                propOrder[i] = getFieldName(properties[i].getName());
-            }
-        }
-        // Annotate the class
-        annotateClass(cw, name, namespace, propOrder);
-
-        // Decalre the default constructor
-        declareConstructor(cw, classSignature);
-        if (properties != null) {
-            for (BeanProperty p : properties) {
-                boolean isMap = Map.class.isAssignableFrom(p.getType());
-                String xmlAdapterClassSignature = null;
-                if (xmlAdapters != null) {
-                    Class<?> adapterClass = xmlAdapters.getAdapter(p.getType());
-                    if (adapterClass != null) {
-                        xmlAdapterClassSignature = CodeGenerationHelper.getSignature(adapterClass);
-                    }
-                }
-                declareProperty(cw, classDescriptor, classSignature, p.getName(), p.getSignature(), p
-                    .getGenericSignature(), isMap, xmlAdapterClassSignature);
-            }
-        }
-
-        // Close the generation
-        cw.visitEnd();
-        return cw.toByteArray();
-    }
-
-    protected void declareProperty(ClassWriter cw,
-                                   String classDescriptor,
-                                   String classSignature,
-                                   String propName,
-                                   String propClassSignature,
-                                   String propTypeSignature,
-                                   boolean isMap,
-                                   String xmlAdapterClassSignature) {
-        if (propClassSignature.equals(propTypeSignature)) {
-            propTypeSignature = null;
-        }
-        declareField(cw, propName, propClassSignature, propTypeSignature, isMap, xmlAdapterClassSignature);
-        decalreGetter(cw, classDescriptor, classSignature, propName, propClassSignature, propTypeSignature);
-        declareSetter(cw, classDescriptor, classSignature, propName, propClassSignature, propTypeSignature);
-    }
-
-    protected String getFieldName(String propName) {
-        if ("return".equals(propName)) {
-            return "_return";
-        } else {
-            return propName;
-        }
-    }
-
-    protected void declareField(ClassWriter cw,
-                                String propName,
-                                String propClassSignature,
-                                String propTypeSignature,
-                                boolean isMap,
-                                String xmlAdapterClassSignature) {
-        FieldVisitor fv;
-        AnnotationVisitor av0;
-        fv = cw.visitField(ACC_PROTECTED, getFieldName(propName), propClassSignature, propTypeSignature, null);
-
-        // For Map property, we cannot have the XmlElement annotation
-        if (!isMap) {
-            av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true);
-            av0.visit("name", propName);
-            av0.visit("namespace", "");
-            av0.visitEnd();
-        }
-
-        if (xmlAdapterClassSignature != null) {
-            av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true);
-            av0.visit("value", org.objectweb.asm.Type.getType(xmlAdapterClassSignature));
-            av0.visitEnd();
-        }
-
-        fv.visitEnd();
-    }
-
-    protected void declareSetter(ClassWriter cw,
-                                 String classDescriptor,
-                                 String classSignature,
-                                 String propName,
-                                 String propClassSignature,
-                                 String propTypeSignature) {
-        if ("Ljava/util/List;".equals(propClassSignature)) {
-            return;
-        }
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC,
-                           "set" + capitalize(propName),
-                           "(" + propClassSignature + ")V",
-                           propTypeSignature == null ? null : "(" + propTypeSignature + ")V",
-                           null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(57, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitVarInsn(CodeGenerationHelper.getLoadOPCode(propClassSignature), 1);
-        mv.visitFieldInsn(PUTFIELD, classDescriptor, getFieldName(propName), propClassSignature);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        // mv.visitLineNumber(58, l1);
-        mv.visitInsn(RETURN);
-        Label l2 = new Label();
-        mv.visitLabel(l2);
-        mv.visitLocalVariable("this", classSignature, null, l0, l2, 0);
-        mv.visitLocalVariable(getFieldName(propName), propClassSignature, propTypeSignature, l0, l2, 1);
-        mv.visitMaxs(3, 3);
-        mv.visitEnd();
-
-    }
-
-    protected void decalreGetter(ClassWriter cw,
-                                 String classDescriptor,
-                                 String classSignature,
-                                 String propName,
-                                 String propClassSignature,
-                                 String propTypeSignature) {
-        String collectionImplClass = COLLECTION_CLASSES.get(propClassSignature);
-        if (collectionImplClass != null) {
-            decalreCollectionGetter(cw,
-                                    classDescriptor,
-                                    classSignature,
-                                    propName,
-                                    propClassSignature,
-                                    propTypeSignature,
-                                    collectionImplClass);
-            return;
-        }
-
-        String getterName = ("Z".equals(propClassSignature) ? "is" : "get") + capitalize(propName);
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC, getterName, "()" + propClassSignature, propTypeSignature == null ? null
-                : "()" + propTypeSignature, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(48, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, getFieldName(propName), propClassSignature);
-        mv.visitInsn(CodeGenerationHelper.getReturnOPCode(propClassSignature));
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("this", classSignature, null, l0, l1, 0);
-        mv.visitMaxs(2, 1);
-        mv.visitEnd();
-    }
-
-    protected void decalreCollectionGetter(ClassWriter cw,
-                                           String classDescriptor,
-                                           String classSignature,
-                                           String propName,
-                                           String propClassSignature,
-                                           String propTypeSignature,
-                                           String collectionImplClass) {
-        String getterName = "get" + capitalize(propName);
-        String fieldName = getFieldName(propName);
-        MethodVisitor mv =
-            cw.visitMethod(ACC_PUBLIC, getterName, "()" + propClassSignature, propTypeSignature == null ? null
-                : "()" + propTypeSignature, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        mv.visitLineNumber(63, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, fieldName, propClassSignature);
-        Label l1 = new Label();
-        mv.visitJumpInsn(IFNONNULL, l1);
-        Label l2 = new Label();
-        mv.visitLabel(l2);
-        mv.visitLineNumber(64, l2);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitTypeInsn(NEW, collectionImplClass);
-        mv.visitInsn(DUP);
-        mv.visitMethodInsn(INVOKESPECIAL, collectionImplClass, "<init>", "()V");
-        mv.visitFieldInsn(PUTFIELD, classDescriptor, fieldName, propClassSignature);
-        mv.visitLabel(l1);
-        mv.visitLineNumber(66, l1);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, classDescriptor, fieldName, propClassSignature);
-        mv.visitInsn(ARETURN);
-        Label l3 = new Label();
-        mv.visitLabel(l3);
-        mv.visitLocalVariable("this", classSignature, null, l0, l3, 0);
-        mv.visitMaxs(3, 1);
-        mv.visitEnd();
-    }
-
-    protected static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    protected void declareConstructor(ClassWriter cw, String classSignature) {
-        MethodVisitor mv;
-        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        // mv.visitLineNumber(37, l0);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-        mv.visitInsn(RETURN);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("this", classSignature, null, l0, l1, 0);
-        mv.visitMaxs(1, 1);
-        mv.visitEnd();
-    }
-
-    protected void declareClass(ClassWriter cw, String classDescriptor) {
-        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, classDescriptor, null, "java/lang/Object", null);
-    }
-
-    protected void annotateClass(ClassWriter cw, String name, String namespace, String[] propOrder) {
-        AnnotationVisitor av0;
-        // @XmlRootElement
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlRootElement;", true);
-        av0.visit("name", name);
-        av0.visit("namespace", namespace);
-        av0.visitEnd();
-        // @XmlAccessorType
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlAccessorType;", true);
-        av0.visitEnum("value", "Ljavax/xml/bind/annotation/XmlAccessType;", "FIELD");
-        av0.visitEnd();
-        // @XmlType
-        av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlType;", true);
-        av0.visit("name", name);
-        av0.visit("namespace", namespace);
-        if (propOrder != null) {
-            AnnotationVisitor pv = av0.visitArray("propOrder");
-            for (String p : propOrder) {
-                pv.visit(null, p);
-            }
-            pv.visitEnd();
-        }
-        av0.visitEnd();
-    }
-
-    public Class<?> generate(String classDescriptor,
-                             String classSignature,
-                             String namespace,
-                             String name,
-                             BeanProperty[] properties,
-                             GeneratedClassLoader classLoader) {
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        byte[] byteCode = defineClass(cw, classDescriptor, classSignature, namespace, name, properties);
-        String className = classDescriptor.replace('/', '.');
-        Class<?> generated = classLoader.getGeneratedClass(className, byteCode);
-        return generated;
-    }
-
-    public static class BeanProperty {
-        private Class<?> type;
-        private String name;
-        private String signature;
-        private String genericSignature;
-
-        public BeanProperty(String name, Class<?> javaClass, Type type) {
-            super();
-            this.name = name;
-            this.signature = CodeGenerationHelper.getJAXWSSignature(javaClass);
-            this.type = javaClass;
-            this.genericSignature = CodeGenerationHelper.getJAXWSSignature(type);
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getSignature() {
-            return signature;
-        }
-
-        public String getGenericSignature() {
-            return genericSignature;
-        }
-
-        public Class<?> getType() {
-            return type;
-        }
-    }
-
-    public XMLAdapterExtensionPoint getXmlAdapters() {
-        return xmlAdapters;
-    }
-
-    public void setXmlAdapters(XMLAdapterExtensionPoint xmlAdapters) {
-        this.xmlAdapters = xmlAdapters;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
deleted file mode 100644
index b05715b54e..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.objectweb.asm.Opcodes;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CodeGenerationHelper {
-    /**
-     * @param type
-     * @return
-     */
-    public static Class<?> getErasure(Type type) {
-        if (type instanceof Class) {
-            return (Class<?>)type;
-        } else if (type instanceof GenericArrayType) {
-            GenericArrayType arrayType = (GenericArrayType)type;
-            Class<?> componentType = getErasure(arrayType.getGenericComponentType());
-            return Array.newInstance(componentType, 0).getClass();
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType pType = (ParameterizedType)type;
-            return getErasure(pType.getRawType());
-        } else if (type instanceof WildcardType) {
-            WildcardType wType = (WildcardType)type;
-            Type[] types = wType.getUpperBounds();
-            if (types.length == 0) {
-                return Object.class;
-            }
-            return getErasure(types[0]);
-        } else if (type instanceof TypeVariable) {
-            TypeVariable<?> var = (TypeVariable<?>)type;
-            Type[] types = var.getBounds();
-            if (types.length == 0) {
-                return Object.class;
-            }
-            return getErasure(types[0]);
-        }
-        return null;
-    }
-
-    /**
-     * @param type
-     * @return
-     */
-    public static String getJAXWSSignature(Type type) {
-        Class<?> cls = getErasure(type);
-        if (Collection.class.isAssignableFrom(cls) && (type instanceof ParameterizedType)) {
-            ParameterizedType pType = (ParameterizedType)type;
-            Type p = pType.getActualTypeArguments()[0];
-            StringBuffer sb = new StringBuffer();
-            sb.append(getSignature(cls));
-            sb.deleteCharAt(sb.length() - 1); // Remove ;
-            sb.append('<').append(getSignature(getErasure(p))).append(">;");
-            return sb.toString();
-        } else if (Map.class.isAssignableFrom(cls) && (type instanceof ParameterizedType)) {
-            ParameterizedType pType = (ParameterizedType)type;
-            Type key = pType.getActualTypeArguments()[0];
-            Type value = pType.getActualTypeArguments()[1];
-            StringBuffer sb = new StringBuffer();
-            sb.append(getSignature(cls));
-            sb.deleteCharAt(sb.length() - 1); // Remove ;
-            sb.append('<').append(getSignature(getErasure(key))).append(getSignature(getErasure(value))).append(">;");
-            return sb.toString();
-        } else {
-            return getSignature(cls);
-        }
-    }
-
-    /**
-     * @param type
-     * @return
-     */
-    public static String getSignature(Type type) {
-        if (!(type instanceof Class)) {
-            if (type instanceof ParameterizedType) {
-                ParameterizedType pType = (ParameterizedType)type;
-                StringBuffer sb = new StringBuffer();
-                String rawType = getSignature(pType.getRawType());
-                sb.append(rawType.substring(0, rawType.length() - 1));
-                sb.append('<');
-                for (Type t : pType.getActualTypeArguments()) {
-                    String argType = getSignature(t);
-                    sb.append(argType);
-                }
-                sb.append('>');
-                sb.append(rawType.substring(rawType.length() - 1));
-                return sb.toString();
-            }
-            if (type instanceof TypeVariable) {
-                return "T" + ((TypeVariable<?>)type).getName() + ";";
-            }
-            if (type instanceof GenericArrayType) {
-                GenericArrayType arrayType = (GenericArrayType)type;
-                return "[" + getSignature(arrayType.getGenericComponentType());
-            }
-            if (type instanceof WildcardType) {
-                WildcardType wType = (WildcardType)type;
-                Type[] types = wType.getUpperBounds();
-                StringBuffer sb = new StringBuffer();
-                if (types.length == 0 || !(types.length == 1 && types[0] == Object.class)) {
-                    sb.append('+');
-                    for (Type t : types) {
-                        sb.append(getSignature(t));
-                    }
-                }
-                types = wType.getLowerBounds();
-                if (types.length != 0) {
-                    sb.append('-');
-                    for (Type t : wType.getLowerBounds()) {
-                        sb.append(getSignature(t));
-                    }
-                }
-                if (sb.length() == 0) {
-                    return "*";
-                }
-                return sb.toString();
-            }
-        }
-        Class<?> cls = (Class<?>)type;
-        return org.objectweb.asm.Type.getDescriptor(cls);
-    }
-
-    /**
-     * Get the actual type arguments a child class has used to extend a generic base class.
-     *
-     * @param baseClass the base class
-     * @param childClass the child class
-     * @return a list of the raw classes for the actual type arguments.
-     */
-    public static <T> List<Class<?>> resovleTypeArguments(Class<T> baseClass, Class<? extends T> childClass) {
-        Map<Type, Type> resolvedTypes = new HashMap<Type, Type>();
-        Type type = childClass;
-        // start walking up the inheritance hierarchy until we hit baseClass
-        while (!getErasure(type).equals(baseClass)) {
-            if (type instanceof Class) {
-                // there is no useful information for us in raw types, so just keep going.
-                type = ((Class<?>)type).getGenericSuperclass();
-            } else {
-                ParameterizedType parameterizedType = (ParameterizedType)type;
-                Class<?> rawType = getErasure(parameterizedType.getRawType());
-
-                Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
-                TypeVariable<?>[] typeParameters = rawType.getTypeParameters();
-                for (int i = 0; i < actualTypeArguments.length; i++) {
-                    resolvedTypes.put(typeParameters[i], actualTypeArguments[i]);
-                }
-
-                if (!rawType.equals(baseClass)) {
-                    type = rawType.getGenericSuperclass();
-                }
-            }
-        }
-
-        // finally, for each actual type argument provided to baseClass, determine (if possible)
-        // the raw class for that type argument.
-        Type[] actualTypeArguments;
-        if (type instanceof Class) {
-            actualTypeArguments = ((Class<?>)type).getTypeParameters();
-        } else {
-            actualTypeArguments = ((ParameterizedType)type).getActualTypeArguments();
-        }
-        List<Class<?>> typeArgumentsAsClasses = new ArrayList<Class<?>>();
-        // resolve types by chasing down type variables.
-        for (Type baseType : actualTypeArguments) {
-            while (resolvedTypes.containsKey(baseType)) {
-                baseType = resolvedTypes.get(baseType);
-            }
-            typeArgumentsAsClasses.add(getErasure(baseType));
-        }
-        return typeArgumentsAsClasses;
-    }
-
-    /*
-    signatures.put(boolean.class, "Z");
-    signatures.put(byte.class, "B");
-    signatures.put(char.class, "C");
-    signatures.put(short.class, "S");
-    signatures.put(int.class, "I");
-    signatures.put(long.class, "J");
-    signatures.put(float.class, "F");
-    signatures.put(double.class, "D");
-    */
-    public static int getLoadOPCode(String signature) {
-        if ("Z".equals(signature) || "B".equals(signature)
-            || "C".equals(signature)
-            || "S".equals(signature)
-            || "I".equals(signature)) {
-            return Opcodes.ILOAD;
-        }
-
-        if ("J".equals(signature)) {
-            return Opcodes.LLOAD;
-        }
-
-        if ("F".equals(signature)) {
-            return Opcodes.FLOAD;
-        }
-
-        if ("D".equals(signature)) {
-            return Opcodes.DLOAD;
-        }
-
-        return Opcodes.ALOAD;
-
-    }
-
-    public static int getReturnOPCode(String signature) {
-        if ("Z".equals(signature) || "B".equals(signature)
-            || "C".equals(signature)
-            || "S".equals(signature)
-            || "I".equals(signature)) {
-            return Opcodes.IRETURN;
-        }
-
-        if ("J".equals(signature)) {
-            return Opcodes.LRETURN;
-        }
-
-        if ("F".equals(signature)) {
-            return Opcodes.FRETURN;
-        }
-
-        if ("D".equals(signature)) {
-            return Opcodes.DRETURN;
-        }
-        if ("V".equals(signature)) {
-            return Opcodes.RETURN;
-        }
-
-        return Opcodes.ARETURN;
-
-    }
-    
-    /**
-     * Get the package prefix for generated JAXWS artifacts
-     * @param cls
-     * @return
-     */
-    public static String getPackagePrefix(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        if (index == -1) {
-            return "jaxws.";
-        } else {
-            return name.substring(0, index) + ".jaxws.";
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
deleted file mode 100644
index e81de324f1..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.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.interfacedef.java.jaxws;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebFault;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-import org.objectweb.asm.ClassWriter;
-
-public class FaultBeanGenerator extends BaseBeanGenerator {
-    public FaultBeanGenerator() {
-        super();
-    }
-
-    protected BeanProperty[] getProperties(Class<? extends Throwable> exceptionClass) {
-        BeanInfo beanInfo;
-        try {
-            beanInfo = Introspector.getBeanInfo(exceptionClass);
-        } catch (IntrospectionException e) {
-            throw new IllegalArgumentException(e);
-        }
-        List<BeanProperty> props = new ArrayList<BeanProperty>();
-        for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
-            if (pd.getReadMethod() != null) {
-                String name = pd.getReadMethod().getName();
-                if ("getClass".equals(name) || "getStackTrace".equals(name)
-                    || "getCause".equals(name)
-                    || "getLocalizedMessage".equals(name)) {
-                    continue;
-                }
-                // Add the field
-                String field = pd.getName();
-                Method getter = pd.getReadMethod();
-                props.add(new BeanProperty(field, getter.getReturnType(), getter.getGenericReturnType()));
-            }
-        }
-        Collections.sort(props, new Comparator<BeanProperty>() {
-            public int compare(BeanProperty o1, BeanProperty o2) {
-                return o1.getName().compareTo(o2.getName());
-            }
-        });
-        return props.toArray(new BeanProperty[0]);
-    }
-
-    public byte[] generate(Class<? extends Throwable> exceptionClass) {
-        String className = getFaultBeanName(exceptionClass);
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        String classDescriptor = className.replace('.', '/');
-        String classSignature = "L" + classDescriptor + ";";
-        QName element = getElementName(exceptionClass);
-        String namespace = element.getNamespaceURI();
-        String name = element.getLocalPart();
-        return defineClass(cw, classDescriptor, classSignature, namespace, name, getProperties(exceptionClass));
-    }
-
-    public Class<?> generate(Class<? extends Throwable> exceptionClass, GeneratedClassLoader cl) {
-        synchronized (exceptionClass) {
-            Class<?> faultBeanClass = generatedClasses.get(exceptionClass);
-            if (faultBeanClass == null) {
-                String className = getFaultBeanName(exceptionClass);
-                String classDescriptor = className.replace('.', '/');
-                String classSignature = "L" + classDescriptor + ";";
-                QName element = getElementName(exceptionClass);
-                String namespace = element.getNamespaceURI();
-                String name = element.getLocalPart();
-                faultBeanClass =
-                    generate(classDescriptor, classSignature, namespace, name, getProperties(exceptionClass), cl);
-                generatedClasses.put(exceptionClass, faultBeanClass);
-            }
-            return faultBeanClass;
-        }
-    }
-
-    private static String getFaultBeanName(Class<?> exceptionClass) {
-        String faultBeanName = null;
-        WebFault webFault = exceptionClass.getAnnotation(WebFault.class);
-        if (webFault != null) {
-            faultBeanName = webFault.faultBean();
-            if (!"".equals(faultBeanName)) {
-                return faultBeanName;
-            }
-        }
-
-        String name = exceptionClass.getName();
-        int index = name.lastIndexOf('.');
-        String pkg = name.substring(0, index);
-        String clsName = name.substring(index + 1);
-
-        // FIXME: [rfeng] This is a workaround to avoid "Prohibited package name: java.lang.jaxws"
-        if (pkg.startsWith("java.") || pkg.startsWith("javax.")) {
-            pkg = "tuscany";
-        }
-        faultBeanName = (pkg + ".jaxws." + clsName + "Bean");
-        return faultBeanName;
-    }
-
-    public static QName getElementName(Class<? extends Throwable> exceptionClass) {
-        WebFault webFault = exceptionClass.getAnnotation(WebFault.class);
-        String namespace = null;
-        String name = null;
-        if (webFault != null) {
-            namespace = webFault.targetNamespace();
-            name = webFault.name();
-        }
-        if (namespace == null) {
-            namespace = JavaInterfaceUtil.getNamespace(exceptionClass);
-        }
-        if (name == null) {
-            name = exceptionClass.getSimpleName();
-        }
-        return new QName(namespace, name);
-    }
-
-    public static Class<?> generateFaultBeanClass(Class<? extends Throwable> exceptionClass) {
-        FaultBeanGenerator generator = new FaultBeanGenerator();
-        GeneratedClassLoader cl = new GeneratedClassLoader(exceptionClass.getClassLoader());
-        return generator.generate(exceptionClass, cl);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
deleted file mode 100644
index f36dd3a443..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.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.interfacedef.java.jaxws;
-
-import java.security.SecureClassLoader;
-import java.util.HashMap;
-import java.util.Map;
-
-public class GeneratedClassLoader extends SecureClassLoader {
-    private class GeneratedClass {
-        private String className;
-        private byte[] byteCode;
-        private Class<?> cls;
-
-        public GeneratedClass(String className, byte[] byteCode) {
-            super();
-            this.className = className;
-            this.byteCode = byteCode;
-        }
-
-        public synchronized Class<?> getGeneratedClass() {
-            if (cls == null) {
-                cls = defineClass(className, byteCode, 0, byteCode.length);
-            }
-            return cls;
-        }
-    }
-
-    private Map<String, GeneratedClass> generatedClasses = new HashMap<String, GeneratedClass>();
-
-    public GeneratedClassLoader(ClassLoader parentLoader) {
-        super(parentLoader);
-    }
-
-    @Override
-    protected Class<?> findClass(String className) throws ClassNotFoundException {
-        GeneratedClass cls = generatedClasses.get(className);
-        if (cls != null) {
-            return cls.getGeneratedClass();
-        }
-        return super.findClass(className);
-    }
-
-    public synchronized Class<?> getGeneratedClass(String className, byte[] byteCode) {
-        GeneratedClass cls = generatedClasses.get(className);
-        if (cls == null) {
-            cls = new GeneratedClass(className, byteCode);
-            generatedClasses.put(className, cls);
-        }
-        return cls.getGeneratedClass();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
deleted file mode 100644
index 588e123ff1..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.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.interfacedef.java.jaxws;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * A special data type that generate the class on demand
- * @version $Rev$ $Date$
- */
-public class GeneratedDataTypeImpl implements DataType<XMLType> {
-    private XMLAdapterExtensionPoint xmlAdapters;
-    
-    private Class<?> physical;
-    private XMLType logical;
-
-    private Map<Class<?>, Object> metaDataMap;
-    private Method method;
-    private String wrapperClassName;
-    private String wrapperNamespace;
-    private String wrapperName;
-    private boolean request;
-    private GeneratedClassLoader classLoader;
-
-    private Class<? extends Throwable> exceptionClass;
-
-    public GeneratedDataTypeImpl(XMLAdapterExtensionPoint xmlAdapters, Class<? extends Throwable> exceptionClass, GeneratedClassLoader cl) {
-        super();
-        this.exceptionClass = exceptionClass;
-        this.classLoader = cl;
-        QName name = FaultBeanGenerator.getElementName(exceptionClass);
-        this.logical = new XMLType(name, name);
-        this.xmlAdapters = xmlAdapters;
-    }
-
-    public GeneratedDataTypeImpl(XMLAdapterExtensionPoint xmlAdapters,
-                                 Method m,
-                                 String wrapperClassName,
-                                 String wrapperNamespace,
-                                 String wrapperName,
-                                 boolean request,
-                                 GeneratedClassLoader cl) {
-        super();
-        this.method = m;
-        this.wrapperClassName = wrapperClassName;
-        this.wrapperNamespace = wrapperNamespace;
-        this.wrapperName = wrapperName;
-        this.classLoader = cl;
-        this.request = request;
-        QName name = new QName(wrapperNamespace, wrapperName);
-        this.logical = new XMLType(name, name);
-        this.xmlAdapters = xmlAdapters;
-    }
-
-    public String getDataBinding() {
-        return JAXBDataBinding.NAME;
-    }
-
-    public Type getGenericType() {
-        return getPhysical();
-    }
-
-    public XMLType getLogical() {
-        return logical;
-    }
-
-    public synchronized Class<?> getPhysical() {
-        if (physical == null) {
-            if (method != null) {
-                WrapperBeanGenerator generator = new WrapperBeanGenerator();
-                generator.setXmlAdapters(xmlAdapters);
-                physical =
-                    request ? generator.generateRequestWrapper(method, wrapperClassName, wrapperNamespace, wrapperName, classLoader)
-                        : generator.generateResponseWrapper(method, wrapperClassName, wrapperNamespace, wrapperName, classLoader);
-                ;
-            } else if (exceptionClass != null) {
-                FaultBeanGenerator faultBeanGenerator = new FaultBeanGenerator();
-                faultBeanGenerator.setXmlAdapters(xmlAdapters);
-                physical = faultBeanGenerator.generate(exceptionClass, classLoader);
-            }
-        }
-        return physical;
-    }
-
-    public void setDataBinding(String dataBinding) {
-        // NOP
-    }
-
-    public void setGenericType(Type genericType) {
-        // NOP
-    }
-
-    public void setLogical(XMLType logical) {
-        this.logical = logical;
-    }
-
-    public void setPhysical(Class<?> cls) {
-        // NOP
-    }
-
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public <T> T getMetaData(Class<T> type) {
-        return metaDataMap == null ? null : type.cast(metaDataMap.get(type));
-    }
-
-    public <T> void setMetaData(Class<T> type, T metaData) {
-        if (metaDataMap == null) {
-            metaDataMap = new ConcurrentHashMap<Class<?>, Object>();
-        }
-        metaDataMap.put(type, metaData);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
deleted file mode 100644
index a4f2facb4b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebFault;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * JAX-WS ExceptionHandler
- * 
- * @version $Rev$ $Date$
- */
-public class JAXWSFaultExceptionMapper implements FaultExceptionMapper {
-    public static final String GETCAUSE = "getCause";
-    public static final String GETLOCALIZEDMESSAGE = "getLocalizedMessage";
-    public static final String GETSTACKTRACE = "getStackTrace";
-    public static final String GETCLASS = "getClass";
-
-    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
-    private DataBindingExtensionPoint dataBindingExtensionPoint;
-    private XMLAdapterExtensionPoint xmlAdapterExtensionPoint;
-
-
-    public JAXWSFaultExceptionMapper(DataBindingExtensionPoint dataBindingExtensionPoint, XMLAdapterExtensionPoint xmlAdapters) {
-        super();
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-        this.xmlAdapterExtensionPoint = xmlAdapters;
-    }
-
-    /**
-     * The following is quoted from the JAX-WS Specification v2.1
-     * <ul>
-     * <li>WrapperException(String message, FaultBean faultInfo) <br>
-     * A constructor where WrapperException is replaced with the name of the
-     * generated wrapper exception and FaultBean is replaced by the name of the
-     * generated fault bean.
-     * <li> WrapperException(String message, FaultBean faultInfo, Throwable
-     * cause) <br>
-     * A constructor where WrapperException is replaced with the name of the
-     * generated wrapper exception and FaultBean is replaced by the name of the
-     * generated fault bean. The last argument, cause, may be used to convey
-     * protocol specific fault information
-     * </ul>
-     */
-    @SuppressWarnings("unchecked")
-    public Throwable wrapFaultInfo(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause, Operation operation) {
-        Class<?> exceptionClass = exceptionType.getPhysical();
-        if (exceptionClass.isInstance(faultInfo)) {
-            return (Throwable)faultInfo;
-        }
-        DataType<?> faultBeanType = exceptionType.getLogical();
-        Class<?> faultBeanClass = faultBeanType.getPhysical();
-        try {
-            Throwable exc =
-                newInstance((Class<? extends Throwable>)exceptionClass, message, faultBeanClass, faultInfo, cause);
-            // Include the elem name into the FaultException we build so it can be used for matching in the DataTransformationInterceptor
-            // 
-            // Note this may happen even if we find a constructor above, that is the type of the non-generic fault exc may be an instance
-            // of FaultException
-            //
-            if ((exc instanceof FaultException) && (faultBeanType.getLogical() instanceof XMLType)) {
-                FaultException faultExc = (FaultException)exc;
-                DataType<XMLType> faultBeanXMLType = (DataType<XMLType>)faultBeanType;
-                XMLType faultLogical = faultBeanXMLType.getLogical();
-                faultExc.setFaultName(faultLogical.getElementName());
-            }
-            return exc;
-        } catch (Throwable e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Throwable newInstance(Class<? extends Throwable> exceptionClass,
-                                  String message,
-                                  Class<?> faultBeanClass,
-                                  Object faultInfo,
-                                  Throwable cause) throws Exception {
-        Throwable ex = null;
-        Constructor<? extends Throwable> ctor = null;
-        try {
-            // Get the message property
-            Method getMessage = faultBeanClass.getMethod("getMessage");
-            message = (String)getMessage.invoke(faultInfo);
-        } catch (Throwable e) {
-            // Ignore
-        }
-        try {
-            // FIXME: What about if the faultBeanClass is a subclass of the argument type?
-            ctor = exceptionClass.getConstructor(String.class, faultBeanClass, Throwable.class);
-            ex = ctor.newInstance(message, faultInfo, cause);
-        } catch (NoSuchMethodException e1) {
-            try {
-                ctor = exceptionClass.getConstructor(String.class, faultInfo.getClass());
-                ex = ctor.newInstance(message, faultInfo);
-            } catch (NoSuchMethodException e2) {
-                try {
-                    ctor = exceptionClass.getConstructor(String.class, Throwable.class);
-                    ex = ctor.newInstance(message, cause);
-                    populateException(ex, faultInfo);
-                } catch (NoSuchMethodException e3) {
-                    try {
-                        ctor = exceptionClass.getConstructor(String.class);
-                        ex = ctor.newInstance(message);
-                        populateException(ex, faultInfo);
-                    } catch (NoSuchMethodException e4) {
-                        ctor = exceptionClass.getConstructor();
-                        if (ctor != null) {
-                            ex = ctor.newInstance();
-                            populateException(ex, faultInfo);
-                        } else {
-                            ex = new FaultException(message, faultInfo, cause);
-                        }
-                    }
-                }
-            }
-        }
-        return ex;
-    }
-
-    /**
-     * Populate the java exception from the fault bean
-     * @param ex
-     * @param faultBean
-     * @throws Exception
-     */
-    private void populateException(Throwable ex, Object faultBean) throws Exception {
-        PropertyDescriptor props[] = Introspector.getBeanInfo(faultBean.getClass()).getPropertyDescriptors();
-        for (PropertyDescriptor p : props) {
-            Method getter = p.getReadMethod();
-            Method setter = p.getWriteMethod();
-            if (getter == null || setter == null) {
-                continue;
-            }
-            try {
-                Method m = ex.getClass().getMethod(setter.getName(), setter.getParameterTypes());
-                Object pv = getter.invoke(faultBean);
-                m.invoke(ex, pv);
-            } catch (Exception e) {
-                // Ignore;
-            }
-        }
-    }
-
-    public Object getFaultInfo(Throwable exception, Class<?> faultBeanClass, Operation operation) {
-        if (exception == null) {
-            return null;
-        }
-
-        // Check if it's the generic FaultException
-        if (exception instanceof FaultException) {
-            return ((FaultException)exception).getFaultInfo();
-        }
-
-        try {
-            Method method = exception.getClass().getMethod("getFaultInfo", EMPTY_CLASS_ARRAY);
-            return method.invoke(exception, (Object[])null);
-        } catch (NoSuchMethodException e) {
-            // Follow the JAX-WS v2.1 Specification section 3.7
-            return createFaultBean(exception, faultBeanClass);
-        } catch (Throwable e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private Object createFaultBean(Throwable exception, Class<?> faultBeanClass) {
-        /**
-         * For each getter in the exception and its superclasses, a property of the same 
-         * type and name is added to the bean. The getCause, getLocalizedMessage and 
-         * getStackTrace getters from java.lang.Throwable and the getClass getter from 
-         * java.lang.Object are excluded from the list of getters to be mapped.
-         */
-        // Return the exception as-is if it's already the fault bean
-        if (faultBeanClass.isInstance(exception)) {
-            return exception;
-        }
-        try {
-            Object faultBean = null;
-            for (Constructor<?> ctor : faultBeanClass.getConstructors()) {
-                Class<?>[] params = ctor.getParameterTypes();
-                if (params.length == 1 && String.class == params[0]) {
-                    faultBean = ctor.newInstance(exception.getMessage());
-                } else if (params.length == 2 && String.class == params[0]
-                    && Throwable.class.isAssignableFrom(params[1])) {
-                    faultBean = ctor.newInstance(exception.getMessage(), exception);
-                } else if (params.length == 0) {
-                    faultBean = ctor.newInstance();
-                }
-                if (faultBean != null) {
-                    break;
-                }
-            }
-            if (faultBean == null) {
-                return exception;
-            }
-            BeanInfo beanInfo = Introspector.getBeanInfo(exception.getClass());
-            for (PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
-                Method getter = pd.getReadMethod();
-                String name = getter.getName();
-                if (!isMappedGetter(name)) {
-                    continue;
-                }
-                Method setter = null;
-                try {
-                    setter = faultBeanClass.getMethod("set" + capitalize(pd.getName()), getter.getReturnType());
-                } catch (NoSuchMethodException e) {
-                    continue;
-                }
-                Object prop = getter.invoke(exception);
-                setter.invoke(faultBean, prop);
-            }
-            return faultBean;
-        } catch (Throwable ex) {
-            throw new IllegalArgumentException(ex);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public boolean introspectFaultDataType(DataType<DataType> exceptionType, Operation operation, final boolean generatingFaultBean) {
-        QName faultName = null;
-        boolean result = false;
-
-        final Class<?> cls = exceptionType.getPhysical();
-        if (cls == FaultException.class) {
-            return true;
-        }
-        DataType faultType = (DataType)exceptionType.getLogical();
-        Class<?> faultBean = null;
-        final WebFault fault = cls.getAnnotation(WebFault.class);
-        if (fault != null) {
-            if (!"".equals(fault.name()) || !"".equals(fault.targetNamespace())) {
-                QName faultQName = ((XMLType)faultType.getLogical()).getElementName();
-                String faultNS =
-                    "".equals(fault.targetNamespace()) ? faultQName.getNamespaceURI() : fault.targetNamespace();
-                String faultLocal = "".equals(fault.name()) ? faultQName.getLocalPart() : fault.name();
-                faultName = new QName(faultNS, faultLocal);
-                XMLType xmlType = new XMLType(faultName, null);
-                faultType.setLogical(xmlType);
-            }
-            if (!"".equals(fault.faultBean())) {
-                faultBean = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {
-                    public Class<?> run() {
-                        try {
-                            return Class.forName(fault.faultBean(), false, cls.getClassLoader());
-                        } catch (ClassNotFoundException e) {
-                            throw new ServiceRuntimeException(e);
-                        }
-                    }
-                });
-            } else {
-                Method m;
-                try {
-                    m = cls.getMethod("getFaultInfo", (Class[])null);
-                    faultBean = m.getReturnType();
-                } catch (NoSuchMethodException e) {
-                    // Ignore
-                }
-            }
-        }
-
-        if (faultBean == null) {
-            final String faultBeanClassName = CodeGenerationHelper.getPackagePrefix(cls) + cls.getSimpleName() + "Bean";
-            final QName qname = faultName;
-            faultType = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                public DataType<XMLType> run() {
-                    try {
-                        Class<?> faultBean = Class.forName(faultBeanClassName, false, cls.getClassLoader());
-                        return new DataTypeImpl<XMLType>(faultBean, new XMLType(qname, qname));
-                    } catch (ClassNotFoundException e) {
-                        if (generatingFaultBean) {
-                            Class<? extends Throwable> t = (Class<? extends Throwable>)cls;
-                            GeneratedClassLoader cl = new GeneratedClassLoader(t.getClassLoader());
-                            GeneratedDataTypeImpl dt = new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, t, cl);
-                            return dt;
-                        } else {
-                            return new DataTypeImpl<XMLType>(cls, new XMLType(qname, qname));
-                        }
-                    }
-                }
-            });
-        } else {
-            faultType.setDataBinding(null);
-            faultType.setGenericType(faultBean);
-            faultType.setPhysical(faultBean);
-        }
-
-        // TODO: Use the databinding framework to introspect the fault bean class
-        if (faultType.getDataBinding() == null && dataBindingExtensionPoint != null) {
-            faultBean = faultType.getPhysical();
-            result =
-                dataBindingExtensionPoint.introspectType(faultType, operation);
-        }
-        ((DataType) exceptionType).setLogical(faultType);
-
-        /*
-         The introspection of the fault DT may not have calculated the correct element name, 
-         though we may have already done this in this method.  Let's look at the DataType now 
-         that introspection is done, and, if it has an XMLType, let's set the element to the 
-         'faultName' if we calculated one.
-         */
-        if ((faultName != null) && (faultType.getLogical() instanceof XMLType)) {
-            XMLType faultTypeXML = (XMLType)faultType.getLogical();
-            // The element name (if set) should match the fault name
-            faultTypeXML.setElementName(faultName);
-        }
-
-        return result;
-    }
-
-    public static boolean isMappedGetter(String methodName) {
-        if (GETCAUSE.equals(methodName) || GETLOCALIZEDMESSAGE.equals(methodName)
-            || GETSTACKTRACE.equals(methodName)
-            || GETCLASS.equals(methodName)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    public void setDataBindingExtensionPoint(DataBindingExtensionPoint dataBindingExtensionPoint) {
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
deleted file mode 100644
index 1e1a0c4e94..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.java.jaxws;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.xml.namespace.QName;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
-import org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.FaultExceptionMapper;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-
-/**
- * Introspect the java class/interface with JSR-181 and JAXWS annotations
- * 
- * @version $Rev$ $Date$
- */
-public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
-    private static final String JAXB_DATABINDING = JAXBDataBinding.NAME;
-    private static final String GET = "get";
-    private DataBindingExtensionPoint dataBindingExtensionPoint;
-    private FaultExceptionMapper faultExceptionMapper;
-    private XMLAdapterExtensionPoint xmlAdapterExtensionPoint;
-
-
-    public JAXWSJavaInterfaceProcessor(DataBindingExtensionPoint dataBindingExtensionPoint,
-                                       FaultExceptionMapper faultExceptionMapper,
-                                       XMLAdapterExtensionPoint xmlAdapters) {
-        super();
-        this.dataBindingExtensionPoint = dataBindingExtensionPoint;
-        this.faultExceptionMapper = faultExceptionMapper;
-        this.xmlAdapterExtensionPoint = xmlAdapters;
-    }
-
-    public JAXWSJavaInterfaceProcessor() {
-        super();
-    }
-
-    private static String capitalize(String name) {
-        if (name == null || name.length() == 0) {
-            return name;
-        } else {
-            return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-    }
-
-    public void visitInterface(JavaInterface contract) throws InvalidInterfaceException {
-
-        final Class<?> clazz = contract.getJavaClass();
-        WebService webService = clazz.getAnnotation(WebService.class);
-        String tns = JavaXMLMapper.getNamespace(clazz);
-        String localName = clazz.getSimpleName();
-        if (webService != null) {
-            tns = getValue(webService.targetNamespace(), tns);
-            localName = getValue(webService.name(), localName);
-            contract.setQName(new QName(tns, localName));
-            // Mark SEI as Remotable
-            contract.setRemotable(true);
-        }
-        if (!contract.isRemotable()) {
-            return;
-        }
-
-        // SOAP binding (doc/lit/wrapped|bare or rpc/lit)
-        SOAPBinding soapBinding = clazz.getAnnotation(SOAPBinding.class);
-
-        for (Iterator<Operation> it = contract.getOperations().iterator(); it.hasNext();) {
-            final JavaOperation operation = (JavaOperation)it.next();
-            final Method method = operation.getJavaMethod();
-            introspectFaultTypes(operation);
-
-            // SOAP binding (doc/lit/wrapped|bare or rpc/lit)
-            SOAPBinding methodSOAPBinding = method.getAnnotation(SOAPBinding.class);
-            if (methodSOAPBinding == null) {
-                methodSOAPBinding = soapBinding;
-            }
-
-            boolean documentStyle = true;
-            boolean bare = false;
-            if (methodSOAPBinding != null) {
-                bare = methodSOAPBinding.parameterStyle() == SOAPBinding.ParameterStyle.BARE;
-                // For BARE parameter style, the data is in the wrapped format already
-                operation.setWrapperStyle(bare);
-                documentStyle = methodSOAPBinding.style() == Style.DOCUMENT;
-            }
-
-            String operationName = operation.getName();
-            // WebMethod
-            WebMethod webMethod = method.getAnnotation(WebMethod.class);
-            if (webMethod != null) {
-                if (webMethod.exclude()) {
-                    // Exclude the method
-                    it.remove();
-                    continue;
-                }
-                operationName = getValue(webMethod.operationName(), operationName);
-                operation.setName(operationName);
-                operation.setAction(webMethod.action());
-            }
-
-            // Is one way?
-            Oneway oneway = method.getAnnotation(Oneway.class);
-            if (oneway != null) {
-                // JSR 181
-                assert method.getReturnType() == void.class;
-                operation.setNonBlocking(true);
-            }
-
-            // Handle BARE mapping
-            if (bare) {
-                for (int i = 0; i < method.getParameterTypes().length; i++) {
-                    WebParam param = getAnnotation(method, i, WebParam.class);
-                    if (param != null) {
-                        String ns = getValue(param.targetNamespace(), tns);
-                        // Default to <operationName> for doc-bare
-                        String name = getValue(param.name(), documentStyle ? operationName : "arg" + i);
-                        QName element = new QName(ns, name);
-                        Object logical = operation.getInputType().getLogical().get(i).getLogical();
-                        if (logical instanceof XMLType) {
-                            ((XMLType)logical).setElementName(element);
-                        }
-                    }
-                }
-                WebResult result = method.getAnnotation(WebResult.class);
-                if (result != null) {
-                    String ns = getValue(result.targetNamespace(), tns);
-                    // Default to <operationName>Response for doc-bare
-                    String name = getValue(result.name(), documentStyle ? operationName + "Response" : "return");
-                    QName element = new QName(ns, name);
-                    Object logical = operation.getOutputType().getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                }
-                // FIXME: [rfeng] For the BARE mapping, do we need to create a Wrapper?
-                // it's null at this point
-            } else {
-
-                RequestWrapper requestWrapper = method.getAnnotation(RequestWrapper.class);
-                String ns = requestWrapper == null ? tns : getValue(requestWrapper.targetNamespace(), tns);
-                String name =
-                    requestWrapper == null ? operationName : getValue(requestWrapper.localName(), operationName);
-                String wrapperBeanName = requestWrapper == null ? "" : requestWrapper.className();
-                if ("".equals(wrapperBeanName)) {
-                    wrapperBeanName = CodeGenerationHelper.getPackagePrefix(clazz) + capitalize(method.getName());
-                }
-
-                DataType<XMLType> inputWrapperDT = null;
-
-                final String inputWrapperClassName = wrapperBeanName;
-                final String inputNS = ns;
-                final String inputName = name;
-                inputWrapperDT = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                    public DataType<XMLType> run() {
-                        try {
-                            Class<?> wrapperClass = Class.forName(inputWrapperClassName, false, clazz.getClassLoader());
-                            QName qname = new QName(inputNS, inputName);
-                            DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
-                            dataBindingExtensionPoint.introspectType(dt, operation);
-                            return dt;
-                        } catch (ClassNotFoundException e) {
-                            GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());
-                            return new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, method, inputWrapperClassName, inputNS, inputName, true,
-                                                             cl);
-                        }
-                    }
-                });
-
-                QName inputWrapper = inputWrapperDT.getLogical().getElementName();
-
-                ResponseWrapper responseWrapper = method.getAnnotation(ResponseWrapper.class);
-                ns = responseWrapper == null ? tns : getValue(responseWrapper.targetNamespace(), tns);
-                name =
-                    responseWrapper == null ? operationName + "Response" : getValue(responseWrapper.localName(),
-                                                                                    operationName + "Response");
-                wrapperBeanName = responseWrapper == null ? "" : responseWrapper.className();
-                if ("".equals(wrapperBeanName)) {
-                    wrapperBeanName =
-                        CodeGenerationHelper.getPackagePrefix(clazz) + capitalize(method.getName()) + "Response";
-                }
-
-                DataType<XMLType> outputWrapperDT = null;
-                final String outputWrapperClassName = wrapperBeanName;
-                final String outputNS = ns;
-                final String outputName = name;
-
-                outputWrapperDT = AccessController.doPrivileged(new PrivilegedAction<DataType<XMLType>>() {
-                    public DataType<XMLType> run() {
-                        try {
-                            Class<?> wrapperClass =
-                                Class.forName(outputWrapperClassName, false, clazz.getClassLoader());
-                            QName qname = new QName(inputNS, inputName);
-                            DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
-                            dataBindingExtensionPoint.introspectType(dt, operation);
-                            return dt;
-                        } catch (ClassNotFoundException e) {
-                            GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());
-                            return new GeneratedDataTypeImpl(xmlAdapterExtensionPoint, method, outputWrapperClassName, outputNS, outputName,
-                                                             false, cl);
-                        }
-                    }
-                });
-                QName outputWrapper = outputWrapperDT.getLogical().getElementName();
-
-                List<ElementInfo> inputElements = new ArrayList<ElementInfo>();
-                for (int i = 0; i < method.getParameterTypes().length; i++) {
-                    WebParam param = getAnnotation(method, i, WebParam.class);
-                    ns = param != null ? param.targetNamespace() : "";
-                    // Default to "" for doc-lit-wrapped && non-header
-                    ns = getValue(ns, documentStyle && (param == null || !param.header()) ? "" : tns);
-                    name = param != null ? param.name() : "";
-                    name = getValue(name, "arg" + i);
-                    QName element = new QName(ns, name);
-                    Object logical = operation.getInputType().getLogical().get(i).getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                    inputElements.add(new ElementInfo(element, null));
-                }
-
-                List<ElementInfo> outputElements = new ArrayList<ElementInfo>();
-                WebResult result = method.getAnnotation(WebResult.class);
-                // Default to "" for doc-lit-wrapped && non-header
-                ns = result != null ? result.targetNamespace() : "";
-                ns = getValue(ns, documentStyle && (result == null || !result.header()) ? "" : tns);
-                name = result != null ? result.name() : "";
-                name = getValue(name, "return");
-                QName element = new QName(ns, name);
-
-                if (operation.getOutputType() != null) {
-                    Object logical = operation.getOutputType().getLogical();
-                    if (logical instanceof XMLType) {
-                        ((XMLType)logical).setElementName(element);
-                    }
-                    outputElements.add(new ElementInfo(element, null));
-                }
-
-                String db = inputWrapperDT != null ? inputWrapperDT.getDataBinding() : JAXB_DATABINDING;
-                WrapperInfo wrapperInfo =
-                    new WrapperInfo(db, new ElementInfo(inputWrapper, null), new ElementInfo(outputWrapper, null),
-                                    inputElements, outputElements);
-
-                wrapperInfo.setInputWrapperType(inputWrapperDT);
-                wrapperInfo.setOutputWrapperType(outputWrapperDT);
-
-                operation.setWrapper(wrapperInfo);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void introspectFaultTypes(Operation operation) {
-        if (operation != null && operation.getFaultTypes() != null) {
-            for (DataType exceptionType : operation.getFaultTypes()) {
-                faultExceptionMapper.introspectFaultDataType(exceptionType, operation, true);
-                DataType faultType = (DataType)exceptionType.getLogical();
-                if (faultType.getDataBinding() == JavaExceptionDataBinding.NAME) {
-                    // The exception class doesn't have an associated bean class, so
-                    // synthesize a virtual bean by introspecting the exception class.
-                    createSyntheticBean(operation, exceptionType);
-                }
-            }
-        }
-    }
-
-    private void createSyntheticBean(Operation operation, DataType exceptionType) {
-        DataType faultType = (DataType)exceptionType.getLogical();
-        QName faultBeanName = ((XMLType)faultType.getLogical()).getElementName();
-        List<DataType<XMLType>> beanDataTypes = new ArrayList<DataType<XMLType>>();
-        for (Method aMethod : exceptionType.getPhysical().getMethods()) {
-            if (Modifier.isPublic(aMethod.getModifiers()) && aMethod.getName().startsWith(GET)
-                && aMethod.getParameterTypes().length == 0
-                && JAXWSFaultExceptionMapper.isMappedGetter(aMethod.getName())) {
-                String propName = resolvePropertyFromMethod(aMethod.getName());
-                QName propQName = new QName(faultBeanName.getNamespaceURI(), propName);
-                Class propType = aMethod.getReturnType();
-                XMLType xmlPropType = new XMLType(propQName, null);
-                DataType<XMLType> propDT = new DataTypeImpl<XMLType>(propType, xmlPropType);
-                org.apache.tuscany.sca.databinding.annotation.DataType dt =
-                    aMethod.getAnnotation(org.apache.tuscany.sca.databinding.annotation.DataType.class);
-                if (dt != null) {
-                    propDT.setDataBinding(dt.value());
-                }
-                dataBindingExtensionPoint.introspectType(propDT, operation);
-
-                // sort the list lexicographically as specified in JAX-WS spec section 3.7
-                int i = 0;
-                for (; i < beanDataTypes.size(); i++) {
-                    if (beanDataTypes.get(i).getLogical().getElementName().getLocalPart().compareTo(propName) > 0) {
-                        break;
-                    }
-                }
-                beanDataTypes.add(i, propDT);
-            }
-        }
-        operation.getFaultBeans().put(faultBeanName, beanDataTypes);
-    }
-
-    private String resolvePropertyFromMethod(String methodName) {
-        StringBuffer propName = new StringBuffer();
-        propName.append(Character.toLowerCase(methodName.charAt(GET.length())));
-        propName.append(methodName.substring(GET.length() + 1));
-        return propName.toString();
-    }
-
-    private <T extends Annotation> T getAnnotation(Method method, int index, Class<T> annotationType) {
-        Annotation[] annotations = method.getParameterAnnotations()[index];
-        for (Annotation annotation : annotations) {
-            if (annotation.annotationType() == annotationType) {
-                return annotationType.cast(annotation);
-            }
-        }
-        return null;
-    }
-
-    private static String getValue(String value, String defaultValue) {
-        return "".equals(value) ? defaultValue : value;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
deleted file mode 100644
index 412e6e14a6..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.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.interfacedef.java.jaxws;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil;
-
-public class WrapperBeanGenerator extends BaseBeanGenerator {
-
-    public List<Class<?>> generateWrapperBeans(Class<?> sei) {
-        GeneratedClassLoader cl = new GeneratedClassLoader(sei.getClassLoader());
-        List<Class<?>> classes = new ArrayList<Class<?>>();
-        for (Method m : sei.getMethods()) {
-            if (m.getDeclaringClass() == Object.class) {
-                continue;
-            }
-            classes.add(generateRequestWrapper(sei, m, cl));
-            classes.add(generateResponseWrapper(sei, m, cl));
-        }
-        return classes;
-
-    }
-
-    public Class<?> generateRequestWrapper(Class<?> sei, Method m, GeneratedClassLoader cl) {
-        String wrapperNamespace = JavaInterfaceUtil.getNamespace(sei);
-        String wrapperName = m.getName();
-        String wrapperBeanName = capitalize(wrapperName);
-        String wrapperClassName = CodeGenerationHelper.getPackagePrefix(sei) + wrapperBeanName;
-
-        return generateRequestWrapper(m, wrapperClassName, wrapperNamespace, wrapperName, cl);
-    }
-
-    public Class<?> generateRequestWrapper(Method m,
-                                           String wrapperClassName,
-                                           String wrapperNamespace,
-                                           String wrapperName,
-                                           GeneratedClassLoader cl) {
-        synchronized (m.getDeclaringClass()) {
-            MethodKey key = new MethodKey(m, true);
-            Class<?> wrapperClass = generatedClasses.get(key);
-            if (wrapperClass == null) {
-                String wrapperClassDescriptor = wrapperClassName.replace('.', '/');
-                String wrapperClassSignature = "L" + wrapperClassDescriptor + ";";
-
-                Class<?>[] paramTypes = m.getParameterTypes();
-                Type[] genericParamTypes = m.getGenericParameterTypes();
-                BeanProperty[] properties = new BeanProperty[paramTypes.length];
-                for (int i = 0; i < paramTypes.length; i++) {
-                    String propName = "arg" + i;
-                    properties[i] = new BeanProperty(propName, paramTypes[i], genericParamTypes[i]);
-                }
-
-                wrapperClass =
-                    generate(wrapperClassDescriptor,
-                             wrapperClassSignature,
-                             wrapperNamespace,
-                             wrapperName,
-                             properties,
-                             cl);
-                generatedClasses.put(key, wrapperClass);
-            }
-            return wrapperClass;
-
-        }
-    }
-
-    public Class<?> generateResponseWrapper(Class<?> sei, Method m, GeneratedClassLoader cl) {
-        String wrapperNamespace = JavaInterfaceUtil.getNamespace(sei);
-
-        String wrapperName = m.getName() + "Response";
-        String wrapperBeanName = capitalize(wrapperName);
-        String wrapperClassName = CodeGenerationHelper.getPackagePrefix(sei) + wrapperBeanName;
-        return generateResponseWrapper(m, wrapperClassName, wrapperNamespace, wrapperName, cl);
-
-    }
-
-    public Class<?> generateResponseWrapper(Method m,
-                                            String wrapperClassName,
-                                            String wrapperNamespace,
-                                            String wrapperName,
-                                            GeneratedClassLoader cl) {
-        synchronized (m.getDeclaringClass()) {
-            MethodKey key = new MethodKey(m, false);
-            Class<?> wrapperClass = generatedClasses.get(key);
-            if (wrapperClass == null) {
-                String wrapperClassDescriptor = wrapperClassName.replace('.', '/');
-                String wrapperClassSignature = "L" + wrapperClassDescriptor + ";";
-
-                Class<?> returnType = m.getReturnType();
-                BeanProperty[] properties = null;
-                if (returnType != void.class) {
-                    Type genericReturnType = m.getGenericReturnType();
-                    String propName = "return";
-                    properties = new BeanProperty[] {new BeanProperty(propName, returnType, genericReturnType)};
-                }
-                wrapperClass =
-                    generate(wrapperClassDescriptor,
-                             wrapperClassSignature,
-                             wrapperNamespace,
-                             wrapperName,
-                             properties,
-                             cl);
-                generatedClasses.put(key, wrapperClass);
-            }
-            return wrapperClass;
-
-        }
-    }
-
-    private static class MethodKey {
-        private Method m;
-        private boolean request;
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((m == null) ? 0 : m.hashCode());
-            result = prime * result + (request ? 1231 : 1237);
-            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 MethodKey other = (MethodKey)obj;
-            if (m == null) {
-                if (other.m != null)
-                    return false;
-            } else if (!m.equals(other.m))
-                return false;
-            if (request != other.request)
-                return false;
-            return true;
-        }
-
-        public MethodKey(Method m, boolean request) {
-            super();
-            this.m = m;
-            this.request = request;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
deleted file mode 100644
index 1b07e25bad..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.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.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public interface Bean<T> {
-    T getP1();
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
deleted file mode 100644
index d38a21ba52..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.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.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean1 {
-    private String p1;
-    private int p2;
-    public String getP1() {
-        return p1;
-    }
-    public void setP1(String p1) {
-        this.p1 = p1;
-    }
-    public int getP2() {
-        return p2;
-    }
-    public void setP2(int p2) {
-        this.p2 = p2;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
deleted file mode 100644
index 7b9375063d..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.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.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Bean2 implements Bean<String>{
-    private String p1;
-    private int p2;
-    public String getP1() {
-        return p1;
-    }
-    public void setP1(String p1) {
-        this.p1 = p1;
-    }
-    public int getP2() {
-        return p2;
-    }
-    public void setP2(int p2) {
-        this.p2 = p2;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
deleted file mode 100644
index 567591f166..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.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.interfacedef.java.jaxws;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-
-import javax.xml.bind.JAXBContext;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.util.CheckClassAdapter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FaultBeanGeneratorTestCase extends TestCase {
-    public void testGenerate() throws IOException {
-        byte[] content = new FaultBeanGenerator().generate(MyException.class);
-        ClassReader cr = new ClassReader(content);
-        PrintWriter pw = new PrintWriter(System.out);
-        CheckClassAdapter.verify(cr, false, pw);
-    }
-
-    public void testGenerateClass() throws Exception {
-        Class<?> cls = FaultBeanGenerator.generateFaultBeanClass(MyException.class);
-        Assert.assertEquals("org.apache.tuscany.sca.interfacedef.java.jaxws.jaxws.MyExceptionBean", cls.getName());
-        for (Annotation a : cls.getAnnotations()) {
-            System.out.println(a);
-        }
-        //        XmlType xmlType = cls.getAnnotation(XmlType.class);
-        //        System.out.println(xmlType);
-        Object bean = cls.newInstance();
-        JAXBContext context = JAXBContextHelper.createJAXBContext(cls);
-        StringWriter sw = new StringWriter();
-        context.createMarshaller().marshal(bean, sw);
-        System.out.println(sw.toString());
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
deleted file mode 100644
index 4eafc4e1ce..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.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.interfacedef.java.jaxws;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JAXWSJavaInterfaceProcessorTestCase extends TestCase {
-    private JAXWSJavaInterfaceProcessor interfaceProcessor;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        interfaceProcessor = new JAXWSJavaInterfaceProcessor();
-    }
-
-    /**
-     * Test method for
-     * {@link org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor#visitInterface(JavaInterface)}.
-     */
-    public final void testProcessor() throws Exception {
-        DefaultJavaInterfaceFactory iFactory = new DefaultJavaInterfaceFactory();
-        JavaInterface contract = iFactory.createJavaInterface(WebServiceInterfaceWithoutAnnotation.class);
-
-        interfaceProcessor.visitInterface(contract);
-        assertFalse(contract.isRemotable());
-
-        contract = iFactory.createJavaInterface(WebServiceInterfaceWithAnnotation.class);
-        interfaceProcessor.visitInterface(contract);
-        assertTrue(contract.isRemotable());
-
-        Operation op1 = contract.getOperations().get(0);
-        Operation op2 = contract.getOperations().get(1);
-
-        Operation op = null;
-        if ("m1".equals(op1.getName())) {
-            op = op1;
-        } else {
-            op = op2;
-        }
-
-        assertTrue(op.isWrapperStyle());
-
-        if ("M2".equals(op2.getName())) {
-            op = op2;
-        } else {
-            op = op1;
-        }
-        assertTrue(!op.isWrapperStyle() && op.getWrapper() != null);
-
-    }
-
-    @WebService
-    private static interface WebServiceInterfaceWithAnnotation {
-
-        @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-        @WebMethod(operationName = "m1")
-        String m1(String str);
-
-        @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
-        @WebMethod(operationName = "M2")
-        String m2(String str, int i);
-    }
-
-    private static interface WebServiceInterfaceWithoutAnnotation {
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
deleted file mode 100644
index b3c7102a78..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.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.interfacedef.java.jaxws;
-
-import java.lang.reflect.Field;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaReflectionHelperTestCase {
-    @Test
-    public void testErasure() throws Exception {
-        for (Field f : TestGenericClass.class.getDeclaredFields()) {
-            Class<?> cls = CodeGenerationHelper.getErasure(f.getGenericType());
-            System.out.println(cls.getName());
-            Assert.assertSame(f.getType(), cls);
-        }
-    }
-
-    @Test
-    public void testSignature() throws Exception {
-        for (Field f : TestGenericClass.class.getDeclaredFields()) {
-            String sig = CodeGenerationHelper.getSignature(f.getGenericType());
-            System.out.println(sig);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
deleted file mode 100644
index 4df0517de6..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.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.interfacedef.java.jaxws;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class MyException extends Exception {
-    private String error;
-    private int code;
-
-    public MyException() {
-        super();
-    }
-
-    public MyException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MyException(String message) {
-        super(message);
-    }
-
-    public MyException(Throwable cause) {
-        super(cause);
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
deleted file mode 100644
index 78527193d5..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.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.interfacedef.java.jaxws;
-
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * @version $Rev$ $Date$
- */
-@WebService
-public class MyServiceImpl {
-    
-    public MyServiceImpl() {
-        super();
-    }
-
-    @WebMethod
-    public <T extends Bean1> T getBean(T b, Bean2 b2) {
-        return null;
-    }
-    
-    @WebMethod
-    public List<? extends Bean1> getBeans() {
-        return null;
-    }
-    
-    @WebMethod
-    public String convert(String str, int i) throws MyException {
-        return "ME";
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
deleted file mode 100644
index 2ecf822904..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.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.interfacedef.java.jaxws;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestGenericClass <T extends Serializable & List<String>, S> {
-    public TestGenericClass<?, S> i;
-    public T f1;
-    public T[] f2;
-    public S f3;
-    public List<? extends T> list1;
-    public List<?> list2;
-    public List<? extends Serializable> list3;
-    public int f4;
-    public int[] f5;
-    public Map<? super T, S> map;
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
deleted file mode 100644
index 115e89ef2a..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.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.interfacedef.java.jaxws;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TestInterface {
-    int convert(String currency1, String currency2);
-
-    List<Double> getRates(String currency);
-
-    void check(boolean flag);
-
-    String[] list(int[] list);
-
-    int[][] map(String[][] strs);
-
-    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);
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
deleted file mode 100644
index b14ef19939..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.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.interfacedef.java.jaxws;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBContextHelper;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBTypeHelper;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WrapperBeanGeneratorTestCase {
-    @Test
-    public void testGenerate() throws Exception {
-        List<Class<?>> classes = new WrapperBeanGenerator().generateWrapperBeans(TestInterface.class);
-        for (Class<?> cls : classes) {
-            for (Field f : cls.getDeclaredFields()) {
-                System.out.println(f.getName());
-                System.out.println(f.getGenericType());
-                for (Annotation a : f.getAnnotations()) {
-                    System.out.println(a);
-                }
-            }
-            for (Method m : cls.getDeclaredMethods()) {
-                System.out.println(m);
-                for (Annotation a : m.getAnnotations()) {
-                    System.out.println(a);
-                }
-            }
-        }
-        JAXBContext context = JAXBContextHelper.createJAXBContext(classes.toArray(new Class<?>[classes.size()]));
-        for (Class<?> cls : classes) {
-            Object obj = cls.newInstance();
-            StringWriter sw = new StringWriter();
-            context.createMarshaller().marshal(obj, sw);
-            // System.out.println(sw.toString());
-            StringReader sr = new StringReader(sw.toString());
-            context.createUnmarshaller().unmarshal(new StreamSource(sr), cls);
-        }
-    }
-
-    @Test
-    public void testGenerateSchema() throws Exception {
-        List<Class<?>> classes = new WrapperBeanGenerator().generateWrapperBeans(TestInterface.class);
-        JAXBContext context = JAXBContextHelper.createJAXBContext(classes.toArray(new Class<?>[classes.size()]));
-        Map<String, String> results = JAXBTypeHelper.generateSchema(context);
-        for (String xsd : results.values()) {
-            System.out.println(xsd);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
deleted file mode 100644
index 882408ade6..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- 

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT 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.example.com/stock" xmlns:impl="http://www.example.com/stock"

-    xmlns:tns="http://www.example.com/stock" 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://www.example.com/stock" 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" />

-                    <element name="list" minOccurs="0" maxOccurs="unbounded" type="xsd:string" />

-                </sequence>

-            </complexType>

-

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" maxOccurs="unbounded" 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:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
deleted file mode 100644
index a3fd3817cb..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ /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.    

- -->

-<wsdl:definitions targetNamespace="http://www.example.com/stock" xmlns:impl="http://www.example.com/stock"

-    xmlns:tns="http://www.example.com/stock" 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://www.example.com/stock" 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" />

-                        <element name="list" minOccurs="0" maxOccurs="unbounded" type="xsd:string" />

-                    </sequence>

-            </complexType>

-            

-            <element name="stockQuoteOffer">

-                <complexType>

-                    <sequence>

-                        <element name="input" minOccurs="0" maxOccurs="unbounded" 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/tags/java/sca/1.3/modules/interface-java-xml/LICENSE b/tags/java/sca/1.3/modules/interface-java-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/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/tags/java/sca/1.3/modules/interface-java-xml/NOTICE b/tags/java/sca/1.3/modules/interface-java-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/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/tags/java/sca/1.3/modules/interface-java-xml/pom.xml b/tags/java/sca/1.3/modules/interface-java-xml/pom.xml
deleted file mode 100644
index 93b94099bb..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-java-xml</artifactId>
-    <name>Apache Tuscany SCA Java Interface XML Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</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.interface.java.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
deleted file mode 100644
index 5d2d8ed51c..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.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.interfacedef.java.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * Interface Java XML Constants.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaConstants {
-
-    String INTERFACE_JAVA = "interface.java";
-    QName INTERFACE_JAVA_QNAME = new QName(Constants.SCA10_NS, "interface.java");
-    String INTERFACE = "interface";
-    String CALLBACK_INTERFACE = "callbackInterface";
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
deleted file mode 100644
index ae5bf4c56d..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.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.interfacedef.java.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.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.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.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfaceContract>, JavaConstants {
-
-    private JavaInterfaceFactory javaFactory;
-    private Monitor monitor;
-
-    public JavaInterfaceProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.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 = new ProblemImpl(this.getClass().getName(), "interface-javaxml-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(), "interface-javaxml-validation-messages", Severity.ERROR, model, message,(Object[])messageParameters);
-     	     monitor.problem(problem);
-     	 }        
-     }
-    
-    private JavaInterface createJavaInterface(String interfaceName) {
-        JavaInterface javaInterface = javaFactory.createJavaInterface();
-        javaInterface.setUnresolved(true);
-        javaInterface.setName(interfaceName);
-        return javaInterface;
-    }
-
-    public JavaInterfaceContract read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        
-        // Read an <interface.java>
-        JavaInterfaceContract javaInterfaceContract = javaFactory.createJavaInterfaceContract();
-        String interfaceName = reader.getAttributeValue(null, INTERFACE);
-        if (interfaceName != null) {
-            JavaInterface javaInterface = createJavaInterface(interfaceName);
-            javaInterfaceContract.setInterface(javaInterface);
-        }
-
-        String callbackInterfaceName = reader.getAttributeValue(null, CALLBACK_INTERFACE);
-        if (callbackInterfaceName != null) {
-            JavaInterface javaCallbackInterface = createJavaInterface(callbackInterfaceName);
-            javaInterfaceContract.setCallbackInterface(javaCallbackInterface);
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && INTERFACE_JAVA_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        return javaInterfaceContract;
-    }
-    
-    public void write(JavaInterfaceContract javaInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        
-        // Write an <interface.java>
-        writer.writeStartElement(Constants.SCA10_NS, INTERFACE_JAVA);
-        JavaInterface javaInterface = (JavaInterface)javaInterfaceContract.getInterface();
-        
-        if (javaInterface != null && javaInterface.getName() != null) {
-            writer.writeAttribute(INTERFACE, javaInterface.getName());
-        }
-        
-        JavaInterface javaCallbackInterface = (JavaInterface)javaInterfaceContract.getCallbackInterface();
-        if (javaCallbackInterface != null && javaCallbackInterface.getName() != null) {
-            writer.writeAttribute(CALLBACK_INTERFACE, javaCallbackInterface.getName());
-        }
-        
-        writer.writeEndElement();
-    }
-    
-    private JavaInterface resolveJavaInterface(JavaInterface javaInterface, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (javaInterface != null && javaInterface.isUnresolved()) {
-
-            // Resolve the Java interface
-            javaInterface = resolver.resolveModel(JavaInterface.class, javaInterface);
-            if (javaInterface.isUnresolved()) {
-
-                // If the Java interface has never been resolved yet, do it now
-                ClassReference classReference = new ClassReference(javaInterface.getName());
-                classReference = resolver.resolveModel(ClassReference.class, classReference);
-                Class javaClass = classReference.getJavaClass();
-                if (javaClass == null) {
-                    error("ClassNotFoundException", resolver, javaInterface.getName());
-                    return javaInterface;
-                    //throw new ContributionResolveException(new ClassNotFoundException(javaInterface.getName()));
-                }
-                
-                try {                        
-                    // Introspect the Java interface and populate the interface and
-                    // operations
-                    javaFactory.createJavaInterface(javaInterface, javaClass);
-                
-                } catch (InvalidInterfaceException e) {
-                	ContributionResolveException ce = new ContributionResolveException(e);
-                	error("ContributionResolveException", javaFactory, ce);
-                    return javaInterface;
-                	//throw ce;
-                }
-
-                // Cache the resolved interface
-                javaInterface.setUnresolved(false);
-                resolver.addModel(javaInterface);
-            }
-        }
-        return javaInterface;
-    }
-    
-    public void resolve(JavaInterfaceContract javaInterfaceContract, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the interface and callback interface
-        JavaInterface javaInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getInterface(), resolver);
-        javaInterfaceContract.setInterface(javaInterface);
-        
-        JavaInterface javaCallbackInterface = resolveJavaInterface((JavaInterface)javaInterfaceContract.getCallbackInterface(), resolver);
-        javaInterfaceContract.setCallbackInterface(javaCallbackInterface);
-    }
-    
-    public QName getArtifactType() {
-        return INTERFACE_JAVA_QNAME;
-    }
-    
-    public Class<JavaInterfaceContract> getModelType() {
-        return JavaInterfaceContract.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index b3e52e5709..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/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.interfacedef.java.xml.JavaInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.java,model=org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties b/tags/java/sca/1.3/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
deleted file mode 100644
index bc0a7192b5..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/main/resources/interface-javaxml-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.
-#
-#
-ClassNotFoundException = Class Not Found Exception: {0}
-ContributionResolveException = ContributionResolveException occured due to :
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
deleted file mode 100644
index 313f950873..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.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.interfacedef.java.xml;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-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.ConstrainingType;
-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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading Java interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class ReadTestCase extends TestCase {
-
-    private XMLInputFactory inputFactory;
-    private XMLOutputFactory outputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    private CompositeBuilder compositeBuilder;
-
-    @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);
-        
-        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);
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-    }
-
-    public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
-        assertNotNull(constrainingType);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
deleted file mode 100644
index 55fc12d176..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.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.interfacedef.java.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.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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 writing Java 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 testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    public void testReadWriteConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(constrainingType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(constrainingType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
deleted file mode 100644
index 3de6410596..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/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://sample.calculator"
-	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" 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/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
deleted file mode 100644
index dca38c9224..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/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 interface="calculator.CalculatorService" />
-  </service>
-
-  <reference name="divideService">
-        <interface.java interface="calculator.DivideService" />
-  </reference>  
-
-</constrainingType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
deleted file mode 100644
index 23ebf576e5..0000000000
--- a/tags/java/sca/1.3/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/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>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-java/LICENSE b/tags/java/sca/1.3/modules/interface-java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/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/tags/java/sca/1.3/modules/interface-java/NOTICE b/tags/java/sca/1.3/modules/interface-java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/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/tags/java/sca/1.3/modules/interface-java/pom.xml b/tags/java/sca/1.3/modules/interface-java/pom.xml
deleted file mode 100644
index 5941476755..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-java</artifactId>
-    <name>Apache Tuscany SCA Java Interface Model</name>
-
-    <dependencies>
-    	<dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</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.interface.java</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
deleted file mode 100644
index 7853b597d3..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.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.interfacedef.java;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceFactoryImpl;
-import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * A factory for the Java interface model.
- *
- * @version $Rev$ $Date$
- */
-public class DefaultJavaInterfaceFactory extends JavaInterfaceFactoryImpl implements JavaInterfaceFactory {
-    private ModelFactoryExtensionPoint modelFactoryExtensionPoint;
-    private boolean loadedVisitors; 
-    
-    public DefaultJavaInterfaceFactory() {
-    }
-    
-    public DefaultJavaInterfaceFactory(ModelFactoryExtensionPoint modelFactoryExtensionPoint) {
-        this.modelFactoryExtensionPoint = modelFactoryExtensionPoint;
-    }
-    
-    @Override
-    public List<JavaInterfaceVisitor> getInterfaceVisitors() {
-        loadVisitors();
-        return super.getInterfaceVisitors();
-    }
-    
-    /**
-     * Load visitors declared under META-INF/services
-     */
-    @SuppressWarnings("unchecked")
-    private void loadVisitors() {
-        if (loadedVisitors)
-            return;
-        
-        if (modelFactoryExtensionPoint != null) {
-            PolicyFactory policyFactory = modelFactoryExtensionPoint.getFactory(PolicyFactory.class);
-            if (policyFactory != null) {
-                addInterfaceVisitor(new PolicyJavaInterfaceVisitor(policyFactory));
-            }
-        }
-        
-        // Get the databinding service declarations
-        Set<ServiceDeclaration> visitorDeclarations; 
-        try {
-            visitorDeclarations = ServiceDiscovery.getInstance().getServiceDeclarations(JavaInterfaceVisitor.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        // Load data bindings
-        for (ServiceDeclaration visitorDeclaration: visitorDeclarations) {
-            JavaInterfaceVisitor visitor;
-            try {
-                Class<JavaInterfaceVisitor> visitorClass = (Class<JavaInterfaceVisitor>)visitorDeclaration.loadClass();
-                visitor = visitorClass.newInstance();
-            } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InstantiationException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            }
-            addInterfaceVisitor(visitor);
-        }
-        
-        loadedVisitors = true;
-    }
-
-    
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
deleted file mode 100644
index 9c09ef50c2..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.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.interfacedef.java;
-
-import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.interfacedef.Interface;
-
-/**
- * Represents a Java interface.
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaInterface extends Interface, Base {
-
-    /**
-     * Returns the name of the Java interface class.
-     * 
-     * @return the name of the Java interface class
-     */
-    String getName();
-
-    /**
-     * Sets the name of the Java interface class.
-     * 
-     * @param className the name of the Java interface class
-     */
-    void setName(String className);
-
-    /**
-     * Returns the QName of the JAX-WS interface.
-     *
-     * @return the QName of the JAX-WS interface
-     */
-    QName getQName();
-
-    /**
-     * Sets the QName of the JAX-WS interface.
-     *
-     * @param interfaceName the QName of the JAX-WS interface
-     */
-    void setQName(QName interfaceName);
-
-    /**
-     * Returns the Java interface class.
-     * 
-     * @return the Java interface class
-     */
-    Class<?> getJavaClass();
-
-    /**
-     * Sets the Java interface class.
-     * 
-     * @param javaClass the Java interface class
-     */
-    void setJavaClass(Class<?> javaClass);
-
-    /**
-     * Returns the callback class specified in an @Callback annotation.
-     * 
-     * @return the callback class specified in an @Callback annotation
-     */
-    Class<?> getCallbackClass();
-
-    /**
-     * Sets the callback class specified in an @Callback annotation.
-     * 
-     * @param callbackClass the callback class specified in an @Callback annotation
-     */
-    void setCallbackClass(Class<?> callbackClass);
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
deleted file mode 100644
index e3a84c63f0..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.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.interfacedef.java;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * Represents a Java interface contract.
- * JavaInterfaceContract
- *
- * @version $Rev$ $Date$
- */
-public interface JavaInterfaceContract extends InterfaceContract {
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
deleted file mode 100644
index 9225926269..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.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.interfacedef.java;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-
-/**
- * Factory for the Java interface model
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaInterfaceFactory {
-
-    /**
-     * Creates a new Java interface model.
-     * 
-     * @return
-     */
-    JavaInterface createJavaInterface();
-    
-    /**
-     * Creates a new Java interface model from an interface class.
-     * @param interfaceClass the interface class to introspect.
-     * @return
-     */
-    JavaInterface createJavaInterface(Class<?> interfaceClass) throws InvalidInterfaceException;
-    
-    /**
-     * Creates the contents of a Java interface model from an interface class.
-     * @param javaInterface the Java interface model
-     * @param interfaceClass the interface class to introspect.
-     * @return
-     */
-    void createJavaInterface(JavaInterface javaInterface, Class<?> interfaceClass) throws InvalidInterfaceException;
-    
-    /**
-     * Creates a new Java interface contract.
-     * 
-     * @return
-     */
-    JavaInterfaceContract createJavaInterfaceContract();
-
-    /**
-     * Registers the given visitor.
-     * 
-     * @param visitor
-     */
-    void addInterfaceVisitor(JavaInterfaceVisitor visitor);
-
-    /**
-     * Deregisters the given visitor.
-     * 
-     * @param visitor
-     */
-    void removeInterfaceVisitor(JavaInterfaceVisitor visitor);
-
-    /**
-     * Returns a list of interface visitors.
-     * 
-     * @return
-     */
-    List<JavaInterfaceVisitor> getInterfaceVisitors();
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
deleted file mode 100644
index e6cb35cc4b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.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.interfacedef.java;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * Represents a Java operation.
- *
- * @version $Rev$ $Date$
- */
-public interface JavaOperation extends Operation {
-
-    /**
-     * Returns the Java method defining the operation.
-     * @return the Java method
-     */
-    Method getJavaMethod();
-    
-    /**
-     * Sets the Java method defining the operation.
-     * @param method the Java method
-     */
-    void setJavaMethod(Method method);
-
-    /**
-     * Returns the JAX-WS @WebMethod action parameter.
-     * @return the action value
-     */
-    String getAction();
-    
-    /**
-     * Sets the JAX-WS @WebMethod action parameter.
-     * @param action the action value
-     */
-    void setAction(String action);
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
deleted file mode 100644
index d43ebe558b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.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.interfacedef.java.impl;
-
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-
-/**
- * Represents a Java interface contract.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceContractImpl extends InterfaceContractImpl implements JavaInterfaceContract {
-    
-    protected JavaInterfaceContractImpl() {
-    }
-
-    @Override
-    public JavaInterfaceContractImpl clone() throws CloneNotSupportedException {
-        return (JavaInterfaceContractImpl) super.clone();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
deleted file mode 100644
index b1efd6e197..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.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.interfacedef.java.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.java.introspect.JavaInterfaceVisitor;
-
-/**
- * A factory for the Java model.
- *
- * @version $Rev$ $Date$
- */
-public abstract class JavaInterfaceFactoryImpl implements JavaInterfaceFactory {
-    
-    private List<JavaInterfaceVisitor> visitors = new ArrayList<JavaInterfaceVisitor>();
-    private JavaInterfaceIntrospectorImpl introspector;
-    
-    public JavaInterfaceFactoryImpl() {
-        introspector = new JavaInterfaceIntrospectorImpl(this);
-    }
-
-    public JavaInterface createJavaInterface() {
-        return new JavaInterfaceImpl();
-    }
-    
-    public JavaInterface createJavaInterface(Class<?> interfaceClass) throws InvalidInterfaceException {
-        JavaInterface javaInterface = createJavaInterface();
-        introspector.introspectInterface(javaInterface, interfaceClass);
-        return javaInterface;
-    }
-    
-    public void createJavaInterface(JavaInterface javaInterface, Class<?> interfaceClass) throws InvalidInterfaceException {
-        introspector.introspectInterface(javaInterface, interfaceClass);
-    }
-    
-    public JavaInterfaceContract createJavaInterfaceContract() {
-        return new JavaInterfaceContractImpl();
-    }
-
-    public void addInterfaceVisitor(JavaInterfaceVisitor extension) {
-        visitors.add(extension);
-    }
-
-    public void removeInterfaceVisitor(JavaInterfaceVisitor extension) {
-        visitors.remove(extension);
-    }
-
-    public List<JavaInterfaceVisitor> getInterfaceVisitors() {
-        return visitors;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
deleted file mode 100644
index 42e45317b7..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.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.interfacedef.java.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-
-/**
- * Represents a Java interface.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceImpl extends InterfaceImpl implements JavaInterface {
-
-    private String className;
-    private Class<?> javaClass;
-    private Class<?> callbackClass;
-    private QName qname;
-    
-    protected JavaInterfaceImpl() {
-    }
-
-    public String getName() {
-        if (isUnresolved()) {
-            return className;
-        } else if (javaClass != null) {
-            return javaClass.getName();
-        } else {
-            return null;
-        }
-    }
-
-    public void setName(String className) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.className = className;
-    }
-
-    public QName getQName() {
-        return qname;
-    }
-
-    public void setQName(QName interfacename) {
-        qname = interfacename;
-    }
-
-    public Class<?> getJavaClass() {
-        return javaClass;
-    }
-
-    public void setJavaClass(Class<?> javaClass) {
-        this.javaClass = javaClass;
-    }
-    
-    public Class<?> getCallbackClass() {
-        return callbackClass;
-    }
-    
-    public void setCallbackClass(Class<?> callbackClass) {
-        this.callbackClass = callbackClass;
-    }
-    
-    @Override
-    public String toString() {
-        return getName();
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof JavaInterface) {
-            if (getName() != null) {
-                return getName().equals(((JavaInterface)obj).getName());
-            } else {
-                return ((JavaInterface)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
deleted file mode 100644
index b1198824fa..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.interfacedef.java.impl;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-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 org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InvalidCallbackException;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.InvalidOperationException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.OverloadedOperationException;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Default implementation of a Java interface introspector.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceIntrospectorImpl {
-    public static final String IDL_INPUT = "idl:input";
-
-    private static final String UNKNOWN_DATABINDING = null;
-
-    private List<JavaInterfaceVisitor> visitors = new ArrayList<JavaInterfaceVisitor>();
-
-    public JavaInterfaceIntrospectorImpl(JavaInterfaceFactory javaFactory) {
-        this.visitors = javaFactory.getInterfaceVisitors();
-    }
-
-    public void introspectInterface(JavaInterface javaInterface, Class<?> clazz)
-        throws InvalidInterfaceException {
-        javaInterface.setJavaClass(clazz);
-
-        boolean remotable = clazz.isAnnotationPresent(Remotable.class);
-
-        // Consider @javax.ejb.Remote, java.rmi.Remote and javax.ejb.EJBObject
-        // equivalent to @Remotable
-        if (!remotable) {
-            for (Annotation annotation : clazz.getAnnotations()) {
-                if ("javax.ejb.Remote".equals(annotation.annotationType().getName())) {
-                    remotable = true;
-                    break;
-                }
-            }
-        }
-        if (!remotable) {
-            for (Class<?> superInterface : clazz.getInterfaces()) {
-                if (Remote.class == superInterface || "javax.ejb.EJBObject".equals(superInterface.getName())) {
-                    remotable = true;
-                    break;
-                }
-            }
-        }
-
-        javaInterface.setRemotable(remotable);
-
-        boolean conversational = clazz.isAnnotationPresent(Conversational.class);
-        javaInterface.setConversational(conversational);
-
-        Class<?> callbackClass = null;
-        org.osoa.sca.annotations.Callback callback = clazz.getAnnotation(org.osoa.sca.annotations.Callback.class);
-        if (callback != null && !Void.class.equals(callback.value())) {
-            callbackClass = callback.value();
-            if (remotable && !callbackClass.isAnnotationPresent(Remotable.class)) {
-                throw new InvalidCallbackException("Callback must be remotable on a remotable interface");
-            }
-            if (!remotable && callbackClass.isAnnotationPresent(Remotable.class)) {
-                throw new InvalidCallbackException("Callback must not be remotable on a local interface");
-            }
-        } else if (callback != null && Void.class.equals(callback.value())) {
-            throw new InvalidCallbackException("No callback interface specified on annotation");
-        }
-
-        javaInterface.setCallbackClass(callbackClass);
-
-        String ns = JavaXMLMapper.getNamespace(clazz);
-        javaInterface.getOperations().addAll(getOperations(clazz, remotable, conversational, ns));
-
-        for (JavaInterfaceVisitor extension : visitors) {
-            extension.visitInterface(javaInterface);
-        }
-    }
-
-    private Class<?>[] getActualTypes(Type[] types, Class<?>[] rawTypes, Map<String, Type> typeBindings) {
-        Class<?>[] actualTypes = new Class<?>[types.length];
-        for (int i = 0; i < actualTypes.length; i++) {
-            actualTypes[i] = getActualType(types[i], rawTypes[i], typeBindings);
-        }
-        return actualTypes;
-    }
-
-    private Class<?> getActualType(Type type, Class<?> rawType, Map<String, Type> typeBindings) {
-        if (type instanceof TypeVariable<?>) {
-            TypeVariable<?> typeVariable = (TypeVariable<?>)type;
-            type = typeBindings.get(typeVariable.getName());
-            if (type instanceof Class<?>) {
-                return (Class<?>)type;
-            }
-        }
-        return rawType;
-    }
-
-    private <T> List<Operation> getOperations(Class<T> clazz,
-                                              boolean remotable,
-                                              boolean conversational,
-                                              String ns) throws InvalidInterfaceException {
-
-        Set<Type> genericInterfaces = new HashSet<Type>();
-        for (Type t : clazz.getGenericInterfaces()) {
-            genericInterfaces.add(t);
-        }
-        Map<String, Type> typeBindings = new HashMap<String, Type>();
-        for (Type genericInterface : genericInterfaces) {
-            if (genericInterface instanceof ParameterizedType) {
-                ParameterizedType parameterizedType = (ParameterizedType)genericInterface;
-                TypeVariable<?>[] typeVariables = ((Class<?>)parameterizedType.getRawType()).getTypeParameters();
-                Type[] typeArguments = parameterizedType.getActualTypeArguments();
-                for (int i = 0; i < typeArguments.length; i++) {
-                    typeBindings.put(typeVariables[i].getName(), typeArguments[i]);
-                }
-            }
-        }
-
-        Method[] methods = clazz.getMethods();
-        List<Operation> operations = new ArrayList<Operation>(methods.length);
-        Set<String> names = remotable ? new HashSet<String>() : null;
-        for (Method method : methods) {
-            if (method.getDeclaringClass() == Object.class) {
-                // Skip the methods on the Object.class
-                continue;
-            }
-            String name = method.getName();
-            if (remotable && names.contains(name)) {
-                throw new OverloadedOperationException(method);
-            }
-            if (remotable) {
-                names.add(name);
-            }
-
-            Class<?> returnType = getActualType(method.getGenericReturnType(), method.getReturnType(), typeBindings);
-            Class<?>[] parameterTypes =
-                getActualTypes(method.getGenericParameterTypes(), method.getParameterTypes(), typeBindings);
-            Class<?>[] faultTypes =
-                getActualTypes(method.getGenericExceptionTypes(), method.getExceptionTypes(), typeBindings);
-
-            boolean nonBlocking = method.isAnnotationPresent(OneWay.class);
-            if (nonBlocking) {
-                if (!(returnType == void.class)) {
-                    throw new InvalidOperationException(
-                                                        "Method should return 'void' when declared with an @OneWay annotation. " + method,
-                                                        method);
-                }
-                if (!(faultTypes.length == 0)) {
-                    throw new InvalidOperationException(
-                                                        "Method should not declare exceptions with an @OneWay annotation. " + method,
-                                                        method);
-                }
-            }
-
-            ConversationSequence conversationSequence = ConversationSequence.CONVERSATION_NONE;
-            if (method.isAnnotationPresent(EndsConversation.class)) {
-                if (!conversational) {
-                    throw new InvalidOperationException(
-                                                        "Method is marked as end conversation but contract is not conversational",
-                                                        method);
-                }
-                conversationSequence = ConversationSequence.CONVERSATION_END;
-            } else if (conversational) {
-                conversationSequence = ConversationSequence.CONVERSATION_CONTINUE;
-            }
-
-            // Set outputType to null for void
-            XMLType xmlReturnType = new XMLType(new QName(ns, "return"), null);
-            DataType<XMLType> returnDataType =
-                returnType == void.class ? null : new DataTypeImpl<XMLType>(UNKNOWN_DATABINDING, returnType, method
-                    .getGenericReturnType(), xmlReturnType);
-            List<DataType> paramDataTypes = new ArrayList<DataType>(parameterTypes.length);
-            Type[] genericParamTypes = method.getGenericParameterTypes();
-            for (int i = 0; i < parameterTypes.length; i++) {
-                Class paramType = parameterTypes[i];
-                XMLType xmlParamType = new XMLType(new QName(ns, "arg" + i), null);
-                paramDataTypes.add(new DataTypeImpl<XMLType>(UNKNOWN_DATABINDING, paramType, genericParamTypes[i],
-                                                             xmlParamType));
-            }
-            List<DataType> faultDataTypes = new ArrayList<DataType>(faultTypes.length);
-            Type[] genericFaultTypes = method.getGenericExceptionTypes();
-            for (int i = 0; i < faultTypes.length; i++) {
-                Class<?> faultType = faultTypes[i];
-                // Only add checked exceptions
-                // JAXWS Specification v2.1 section 3.7 says RemoteException should not be mapped
-                if (Exception.class.isAssignableFrom(faultType) && (!RuntimeException.class.isAssignableFrom(faultType))
-                    && (!RemoteException.class.isAssignableFrom(faultType))) {
-                    XMLType xmlFaultType = new XMLType(new QName(ns, faultType.getSimpleName()), null);
-                    DataType<XMLType> faultDataType =
-                        new DataTypeImpl<XMLType>(UNKNOWN_DATABINDING, faultType, genericFaultTypes[i], xmlFaultType);
-                    faultDataTypes.add(new DataTypeImpl<DataType>(UNKNOWN_DATABINDING, faultType, genericFaultTypes[i],
-                                                                  faultDataType));
-                }
-            }
-
-            DataType<List<DataType>> inputType =
-                new DataTypeImpl<List<DataType>>(IDL_INPUT, Object[].class, paramDataTypes);
-            JavaOperation operation = new JavaOperationImpl();
-            operation.setName(name);
-            operation.setInputType(inputType);
-            operation.setOutputType(returnDataType);
-            operation.setFaultTypes(faultDataTypes);
-            operation.setConversationSequence(conversationSequence);
-            operation.setNonBlocking(nonBlocking);
-            operation.setJavaMethod(method);
-            operations.add(operation);
-        }
-        return operations;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
deleted file mode 100644
index 2a9e3c5329..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.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.interfacedef.java.impl;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-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.java.JavaOperation;
-
-/**
- * Contains methods for mapping between an operation in a
- * {@link org.apache.tuscany.spi.model.ServiceContract} and a method defined by
- * a Java interface
- * 
- * @version $Rev$ $Date$
- */
-public final class JavaInterfaceUtil {
-
-    private JavaInterfaceUtil() {
-    }
-
-    /**
-     * Return the method on the implementation class that matches the operation.
-     * 
-     * @param implClass the implementation class or interface
-     * @param operation the operation to match
-     * @return the method described by the operation
-     * @throws NoSuchMethodException if no such method exists
-     * @Deprecated
-     */
-    public static Method findMethod(Class<?> implClass, Operation operation) throws NoSuchMethodException {
-        String name = operation.getName();
-        if (operation instanceof JavaOperation) {
-            name = ((JavaOperation)operation).getJavaMethod().getName();
-        }
-        Interface interface1 = operation.getInterface();
-        int numParams = operation.getInputType().getLogical().size();
-        if (interface1 != null && interface1.isRemotable()) {
-            List<Method> matchingMethods = new ArrayList<Method>();
-            for (Method m : implClass.getMethods()) {
-                if (m.getName().equals(name) && m.getParameterTypes().length == numParams) {
-                    matchingMethods.add(m);
-                }
-            }
-            
-            // TUSCANY-2180 If there is only one method then we just match on the name 
-            // (this is the same as the existing behaviour)
-            if (matchingMethods.size() == 1) {
-                return matchingMethods.get(0);
-            }
-            if (matchingMethods.size() > 1) {
-                // TUSCANY-2180 We need to check the parameter types too
-                Class<?>[] paramTypes = getPhysicalTypes(operation);
-                return implClass.getMethod(name, paramTypes);
-            }
-            
-            // No matching method found
-            throw new NoSuchMethodException("No matching method for operation " + operation.getName()
-                + " is found on "
-                + implClass);
-        }
-        Class<?>[] paramTypes = getPhysicalTypes(operation);
-        return implClass.getMethod(name, paramTypes);
-    }
-
-    /**
-     * @Deprecated
-     */
-    private static Class<?>[] getPhysicalTypes(Operation operation) {
-        DataType<List<DataType>> inputType = operation.getInputType();
-        if (inputType == null) {
-            return new Class<?>[] {};
-        }
-        List<DataType> types = inputType.getLogical();
-        Class<?>[] javaTypes = new Class<?>[types.size()];
-        for (int i = 0; i < javaTypes.length; i++) {
-            Type physical = types.get(i).getPhysical();
-            if (physical instanceof Class<?>) {
-                javaTypes[i] = (Class<?>)physical;
-            } else {
-                throw new UnsupportedOperationException();
-            }
-        }
-        return javaTypes;
-    }
-
-    /**
-     * Searches a collection of operations for a match against the given method
-     * 
-     * @param method the method to match
-     * @param operations the operations to match against
-     * @return a matching operation or null
-     * @Deprecated
-     */
-    public static Operation findOperation(Method method, Collection<Operation> operations) {
-        for (Operation operation : operations) {
-            if (match(operation, method)) {
-                return operation;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Determines if the given operation matches the given method
-     * 
-     * @return true if the operation matches, false if does not
-     */
-    private static boolean match(Operation operation, Method method) {
-        Class<?>[] params = method.getParameterTypes();
-        DataType<List<DataType>> inputType = operation.getInputType();
-        List<DataType> types = inputType.getLogical();
-        boolean found = 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())) {
-                    found = false;
-                }
-            }
-        } else {
-            found = false;
-        }
-        return found;
-
-    }
-    
-    private static String getPackageName(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        return index == -1 ? "" : name.substring(0, index);
-    }
-
-    public static String getNamespace(Class<?> cls) {
-        String packageName = getPackageName(cls);
-        if ("".equals(packageName)) {
-            return "";
-        }
-        StringBuffer ns = new StringBuffer("http://");
-        String[] names = packageName.split("\\.");
-        for (int i = names.length - 1; i >= 0; i--) {
-            ns.append(names[i]);
-            if (i != 0) {
-                ns.append('.');
-            }
-        }
-        ns.append('/');
-        return ns.toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
deleted file mode 100644
index 96e37cbc4b..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.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.interfacedef.java.impl;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-
-/**
- * Represents a Java operation. 
- *
- * @version $Rev$ $Date$
- */
-public class JavaOperationImpl extends OperationImpl implements JavaOperation {
-
-    private Method method;
-    private String action;
-
-    public Method getJavaMethod() {
-        return method;
-    }
-
-    public void setJavaMethod(Method method) {
-        this.method = method;
-    }
-
-    public String getAction() {
-        return action;
-    }
-    
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((method == null) ? 0 : method.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final JavaOperationImpl other = (JavaOperationImpl)obj;
-        if (method == null) {
-            if (other.method != null)
-                return false;
-        } else if (!method.equals(other.method))
-            return false;
-        return true;
-    }
-
-    public String toString() {
-        return method == null ? "null" : method.toGenericString();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
deleted file mode 100644
index ed00510a67..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.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.interfacedef.java.impl;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.osoa.sca.annotations.PolicySets;
-import org.osoa.sca.annotations.Requires;
-
-/**
- * Processes an {@link org.osoa.sca.annotations.Requires} annotation
- *
- * @version $Rev$ $Date$
- */
-public class PolicyJavaInterfaceVisitor implements JavaInterfaceVisitor {
-    private PolicyFactory policyFactory;
-
-    public PolicyJavaInterfaceVisitor(PolicyFactory policyFactory) {
-        super();
-        this.policyFactory = policyFactory;
-    }
-
-    private QName getQName(String intentName) {
-        QName qname;
-        if (intentName.startsWith("{")) {
-            int i = intentName.indexOf('}');
-            if (i != -1) {
-                qname = new QName(intentName.substring(1, i), intentName.substring(i + 1));
-            } else {
-                qname = new QName("", intentName);
-            }
-        } else {
-            qname = new QName("", intentName);
-        }
-        return qname;
-    }
-
-    /**
-     * Read policy intents on the given interface or class 
-     * @param clazz
-     * @param requiredIntents
-     */
-    private void readIntentsAndPolicySets(Class<?> clazz, List<Intent> requiredIntents, List<PolicySet> policySets) {
-        Requires intentAnnotation = clazz.getAnnotation(Requires.class);
-        if (intentAnnotation != null) {
-            String[] intentNames = intentAnnotation.value();
-            if (intentNames.length != 0) {
-                for (String intentName : intentNames) {
-
-                    // Add each intent to the list
-                    Intent intent = policyFactory.createIntent();
-                    intent.setName(getQName(intentName));
-                    requiredIntents.add(intent);
-                }
-            }
-        }
-
-        PolicySets policySetAnnotation = clazz.getAnnotation(PolicySets.class);
-        if (policySetAnnotation != null) {
-            String[] policySetNames = policySetAnnotation.value();
-            if (policySetNames.length != 0) {
-                for (String policySetName : policySetNames) {
-
-                    // Add each intent to the list
-                    PolicySet policySet = policyFactory.createPolicySet();
-                    policySet.setName(getQName(policySetName));
-                    policySets.add(policySet);
-                }
-            }
-        }
-    }
-
-    private void readIntents(Requires intentAnnotation, List<Intent> requiredIntents) {
-        //Requires intentAnnotation = method.getAnnotation(Requires.class);
-        if (intentAnnotation != null) {
-            String[] intentNames = intentAnnotation.value();
-            if (intentNames.length != 0) {
-                //Operation operation = assemblyFactory.createOperation();
-                //operation.setName(method.getName());
-                //operation.setUnresolved(true);
-                for (String intentName : intentNames) {
-
-                    // Add each intent to the list, associated with the
-                    // operation corresponding to the annotated method
-                    Intent intent = policyFactory.createIntent();
-                    intent.setName(getQName(intentName));
-                    //intent.getOperations().add(operation);
-                    requiredIntents.add(intent);
-                }
-            }
-        }
-    }
-
-    private void readPolicySets(PolicySets policySetAnnotation, List<PolicySet> policySets) {
-        if (policySetAnnotation != null) {
-            String[] policySetNames = policySetAnnotation.value();
-            if (policySetNames.length != 0) {
-                //Operation operation = assemblyFactory.createOperation();
-                //operation.setName(method.getName());
-                //operation.setUnresolved(true);
-                for (String policySetName : policySetNames) {
-                    // Add each intent to the list, associated with the
-                    // operation corresponding to the annotated method
-                    PolicySet policySet = policyFactory.createPolicySet();
-                    policySet.setName(getQName(policySetName));
-                    //intent.getOperations().add(operation);
-                    policySets.add(policySet);
-                }
-            }
-        }
-    }
-
-    public void visitInterface(JavaInterface javaInterface) throws InvalidInterfaceException {
-
-        if (javaInterface.getJavaClass() != null) {
-            readIntentsAndPolicySets(javaInterface.getJavaClass(), javaInterface.getRequiredIntents(), javaInterface
-                .getPolicySets());
-
-            // Read intents on the service interface methods 
-            List<Operation> operations = javaInterface.getOperations();
-            for (Operation op : operations) {
-                JavaOperation operation = (JavaOperation)op;
-                Method method = operation.getJavaMethod();
-                if (method.getAnnotation(Requires.class) != null || method.getAnnotation(PolicySets.class) != null) {
-                    readIntents(method.getAnnotation(Requires.class), op.getRequiredIntents());
-                    readPolicySets(method.getAnnotation(PolicySets.class), op.getPolicySets());
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
deleted file mode 100644
index 3bc03a528e..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.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.interfacedef.java.introspect;
-
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-
-/**
- * Implementations introspect metadata on a Java interface, populating the
- * corresponding {@link JavaInterface}
- * 
- * @version $Rev$ $Date$
- */
-public interface JavaInterfaceVisitor {
-
-    /**
-     * Visit a java interface
-     * @param javaInterface
-     * @throws InvalidInterfaceException
-     */
-    void visitInterface(JavaInterface javaInterface) throws InvalidInterfaceException;
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/tags/java/sca/1.3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
deleted file mode 100644
index 5ba12ec137..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ /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.interfacedef.java.DefaultJavaInterfaceFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
deleted file mode 100644
index 14b0577f65..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.interfacedef.java.impl;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.OverloadedOperationException;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This test case will test that a Component that has multiple Remotable interfaces
- * that contain methods with the same name will correctly select the right method.
- * 
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceUtilDuplicateRemotableTestCase extends TestCase {
-
-    /**
-     * Test to get the getTime() method from the LocalTimeService
-     *
-     * @throws Exception Test failed
-     */
-    public void testLocalTimeServiceGetTime() throws Exception {
-        doTestLocalTimeServiceGetTime(LocalTimeService.class);
-    }
-
-    /**
-     * Test to get the getTime() method from the LocalTimeService interface from
-     * the specified class
-     *
-     * @param timeServiceClass The class that implements the LocalTimeService
-     * @throws Exception Test failed
-     */
-    private void doTestLocalTimeServiceGetTime(Class timeServiceClass) throws Exception {
-        // Add a getTime() method
-        Operation operation = newOperation("getTime", LocalTimeService.class);
-
-        Method method = JavaInterfaceUtil.findMethod(timeServiceClass, operation);
-        assertEquals("getTime", method.getName());
-        assertEquals(0, method.getParameterTypes().length);
-    }
-
-    /**
-     * Test to get the getTime(String) method from the WorldTimeService
-     *
-     * @throws Exception Test failed
-     */
-    public void testWorldTimeServiceGetTime() throws Exception {
-        doTestWorldTimeServiceGetTime(WorldTimeService.class);
-    }
-
-    /**
-     * Test to get the getTime(String) method from the WorldTimeService interface from
-     * the specified class
-     *
-     * @param timeServiceClass The class that implements the WorldTimeService
-     * @throws Exception Test failed
-     */
-    private void doTestWorldTimeServiceGetTime(Class timeServiceClass) throws Exception {
-        // Add a getTime(String) method
-        Operation operation = newOperation("getTime", WorldTimeService.class, String.class);
-
-        Method method = JavaInterfaceUtil.findMethod(timeServiceClass, operation);
-        assertEquals("getTime", method.getName());
-        assertEquals(1, method.getParameterTypes().length);
-        assertEquals(String.class, method.getParameterTypes()[0]);
-        }
-
-    /**
-     * Test to get the getTime(int) method from the GMTTimeService
-     *
-     * @throws Exception Test failed
-     */
-    public void testGMTTimeServiceGetTime() throws Exception {
-        doTestGMTTimeServiceGetTime(GMTTimeService.class);
-    }
-
-    /**
-     * Test to get the getTime(int) method from the GMTTimeService interface from
-     * the specified class
-     *
-    * @param timeServiceClass The class that implements the WorldTimeService
-     * @throws Exception Test failed
-     */
-    private void doTestGMTTimeServiceGetTime(Class timeServiceClass) throws Exception {
-        // Add a getTime(String) method
-        Operation operation = newOperation("getTime", GMTTimeService.class, Integer.TYPE);
-
-        Method method = JavaInterfaceUtil.findMethod(timeServiceClass, operation);
-        assertEquals("getTime", method.getName());
-        assertEquals(1, method.getParameterTypes().length);
-        assertEquals(Integer.TYPE, method.getParameterTypes()[0]);
-    }
-
-
-    /**
-     * Test to get the getTime() method from the LocalTimeService on the
-     * TimeServiceImpl class
-     *
-     * @throws Exception Test failed
-     */
-    public void testLocalTimeServiceGetTimeFromTimeServiceImpl() throws Exception {
-        doTestLocalTimeServiceGetTime(TimeServiceImpl.class);
-    }
-
-    /**
-     * Test to get the getTime(String) method from the WorldTimeService on the
-     * TimeServiceImpl class
-     *
-     * @throws Exception Test failed
-     */
-    public void testWorldTimeServiceGetTimeFromTimeServiceImpl() throws Exception {
-        doTestWorldTimeServiceGetTime(TimeServiceImpl.class);
-    }
-
-    /**
-     * Test to get the getTime(int) method from the GMTTimeService
-     *
-     * @throws Exception Test failed
-     */
-    public void testGMTTimeServiceGetTimeFromTimeServiceImpl() throws Exception {
-        doTestGMTTimeServiceGetTime(TimeServiceImpl.class);
-    }
-
-    /**
-     * Creates a new operation with the specified name and parameter types
-     *
-     * @param name The name of the operation
-     * @param operationInterface The interface to which the operation belongs
-     * @param parameterTypes The types of the parameters for this operation
-     * @return An operation with the specified name and parameter types
-     */
-    private static Operation newOperation(String name, Class operationInterface, Class... parameterTypes) {
-        // Create and set the operation name
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-
-        // Make the operation remotable
-        Interface iface = new InterfaceImpl();
-        iface.setRemotable(true);
-        operation.setInterface(iface);
-
-        // Construct the parameters
-        List<DataType> types = new ArrayList<DataType>();
-        DataType<List<DataType>> inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        for (Class parameterType : parameterTypes) {
-            DataType type = new DataTypeImpl<Class>(parameterType, Object.class);
-            types.add(type);
-        }
-        operation.setInputType(inputType);
-
-        // Return the created operation
-        return operation;
-    }
-
-    /**
-     * Test case that validates that a @Remotable interface with Overloaded operations
-     * is detected.
-     * 
-     * This test case is for TUSCANY-2194
-     */
-    public void testDuplicateOpeartionOnRemotableInterface()
-    {
-        JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
-        JavaInterfaceIntrospectorImpl introspector = new JavaInterfaceIntrospectorImpl(javaFactory);
-        JavaInterfaceImpl javaInterface = new JavaInterfaceImpl();
-
-        try {
-            introspector.introspectInterface(javaInterface, DuplicateMethodOnRemotableInterface.class);
-            Assert.fail("Should have thrown an exception as @Remotable interface has overloaded methods");
-        } catch (OverloadedOperationException ex) {
-            // As expected
-            // Make sure that the class and method names are in the exception
-            String exMsg = ex.toString();
-            Assert.assertTrue("Method name missing from exception", exMsg.indexOf("aDuplicateMethod") != -1);
-            Assert.assertTrue("Class name missing from exception", 
-                exMsg.indexOf(DuplicateMethodOnRemotableInterface.class.getName()) != -1);
-        } catch (InvalidInterfaceException ex) {
-            // Should have thrown OverloadedOperationException
-            Assert.fail("Should have thrown an OverloadedOperationException but threw " + ex);
-        }
-    }
-
-
-    /**
-     * Sample @Remotable interface that has an overloaded operation which is not 
-     * allowed according to the SCA Assembly Specification.
-     */
-    @Remotable
-    private interface DuplicateMethodOnRemotableInterface {
-        void aNonDuplicateMethod();
-        void aDuplicateMethod();
-        void aDuplicateMethod(String aParam);
-    }
-
-
-    /**
-     * Sample interface needed for the unit tests
-     */
-    @Remotable
-    private interface LocalTimeService {
-
-        /**
-         * Gets the local time
-         *
-         * @return The Local Time
-         */
-        String getTime();
-    }
-
-    /**
-     * Sample interface needed for the unit tests
-     */
-    @Remotable
-    private interface WorldTimeService {
-
-        /**
-         * Gets the time in the specified TimeZone
-         *
-         * @param timeZone A Time Zone
-         *
-         * @return The time in the specified TimeZone
-         */
-        String getTime(String timeZone);
-    }
-
-    /**
-     * Sample interface needed for the unit tests
-     */
-    @Remotable
-    private interface GMTTimeService {
-
-        /**
-         * Gets the time with the specified GMT offset
-         *
-         * @param gmtOffset A GMT offset in hours
-         *
-         * @return The time with the specified GMT offset
-         */
-        String getTime(int gmtOffset);
-    }
-
-    /**
-     * Sample implementation class that implements the three @Remotable interfaces
-     */
-    private class TimeServiceImpl implements LocalTimeService, WorldTimeService, GMTTimeService {
-        /**
-         * Gets the local time
-         *
-         * @return The Local Time
-         */
-        public String getTime() {
-            return "The current local time";
-        }
-
-        /**
-         * Gets the time in the specified TimeZone
-         *
-         * @param timeZone A Time Zone
-         *
-         * @return The time in the specified TimeZone
-         */
-        public String getTime(String timeZone) {
-            return "The current time in TimeZone " + timeZone;
-        }
-
-        /**
-         * Gets the time with the specified GMT offset
-         *
-         * @param gmtOffset A GMT offset in hours
-         *
-         * @return The time with the specified GMT offset
-         */
-        public String getTime(int gmtOffset) {
-            return "The current time with GMT offset of " + gmtOffset;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
deleted file mode 100644
index 66f98adce3..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.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.interfacedef.java.impl;
-
-import static org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil.findOperation;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-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.impl.OperationImpl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceUtilTestCase extends TestCase {
-    private List<Operation> operations;
-
-    public void testNoParamsFindOperation() throws Exception {
-        Method method = Foo.class.getMethod("foo");
-        Operation ret = findOperation(method, operations);
-        assertEquals("foo", ret.getName());
-        assertEquals(0, method.getParameterTypes().length);
-    }
-
-    public void testParamsFindOperation() throws Exception {
-        Method method = Foo.class.getMethod("foo", String.class);
-        Operation ret = findOperation(method, operations);
-        assertEquals("foo", ret.getName());
-        assertEquals(String.class, method.getParameterTypes()[0]);
-    }
-
-    public void testPrimitiveParamFindOperation() throws NoSuchMethodException {
-        Method method = Foo.class.getMethod("foo", Integer.TYPE);
-        Operation operation = findOperation(method, operations);
-        assertEquals(Integer.TYPE, operation.getInputType().getLogical().get(0).getPhysical());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        Operation operation = newOperation("foo");
-        List<DataType> types = new ArrayList<DataType>();
-        DataType<List<DataType>> inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        operation.setInputType(inputType);
-
-        operations = new ArrayList<Operation>();
-        operations.add(operation);
-
-        types = new ArrayList<DataType>();
-        inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        DataType type = new DataTypeImpl<Class>(String.class, Object.class);
-        types.add(type);
-        operation = newOperation("foo");
-        operation.setInputType(inputType);
-        operations.add(operation);
-
-        types = new ArrayList<DataType>();
-        type = new DataTypeImpl<Class>(String.class, Object.class);
-        DataType type2 = new DataTypeImpl<Class>(String.class, Object.class);
-        types.add(type);
-        types.add(type2);
-        inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        operation = newOperation("foo");
-        operation.setInputType(inputType);
-        operations.add(operation);
-
-        types = new ArrayList<DataType>();
-        type = new DataTypeImpl<Class>(Integer.class, Object.class);
-        types.add(type);
-        inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        operation = newOperation("foo");
-        operation.setInputType(inputType);
-        operations.add(operation);
-
-        types = new ArrayList<DataType>();
-        type = new DataTypeImpl<Class>(Integer.TYPE, Object.class);
-        types.add(type);
-        inputType = new DataTypeImpl<List<DataType>>(Object[].class, types);
-        operation = newOperation("foo");
-        operation.setInputType(inputType);
-        operations.add(operation);
-
-    }
-
-    private interface Foo {
-        void foo();
-
-        void foo(String foo);
-
-        void foo(int b);
-    }
-
-    private static Operation newOperation(String name) {
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-        return operation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
deleted file mode 100644
index f90a5cb8a1..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.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.interfacedef.java.introspection.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InvalidOperationException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationalIntrospectionTestCase extends TestCase {
-    private JavaInterfaceFactory javaFactory;
-    
-    @Override
-    protected void setUp() throws Exception {
-        javaFactory = new DefaultJavaInterfaceFactory();
-    }
-
-    private Operation getOperation(Interface i, String name) {
-        for (Operation op : i.getOperations()) {
-            if (op.getName().equals(name)) {
-                return op;
-            }
-        }
-        return null;
-    }
-
-    public void testServiceContractConversationalInformationIntrospection() throws Exception {
-        Interface i = javaFactory.createJavaInterface(Foo.class);
-        assertNotNull(i);
-        assertTrue(i.isConversational());
-        ConversationSequence seq = getOperation(i, "operation").getConversationSequence();
-        assertEquals(ConversationSequence.CONVERSATION_CONTINUE, seq);
-        seq = getOperation(i, "endOperation").getConversationSequence();
-        assertEquals(ConversationSequence.CONVERSATION_END, seq);
-    }
-
-    public void testBadServiceContract() throws Exception {
-        try {
-            javaFactory.createJavaInterface(BadFoo.class);
-            fail();
-        } catch (InvalidOperationException e) {
-            // expected
-        }
-    }
-
-    public void testNonConversationalInformationIntrospection() throws Exception {
-        Interface i = javaFactory.createJavaInterface(NonConversationalFoo.class);
-        assertFalse(i.isConversational());
-        ConversationSequence seq = getOperation(i, "operation")
-            .getConversationSequence();
-        assertEquals(ConversationSequence.CONVERSATION_NONE, seq);
-    }
-
-    @Conversational
-    private interface Foo {
-        void operation();
-
-        @EndsConversation
-        void endOperation();
-    }
-
-    private interface BadFoo {
-        void operation();
-
-        @EndsConversation
-        void endOperation();
-    }
-
-    private interface NonConversationalFoo {
-        void operation();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
deleted file mode 100644
index 14ac8b0134..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.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.interfacedef.java.introspection.impl;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.easymock.EasyMock;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceProcessorRegistryImplTestCase extends TestCase {
-    private JavaInterfaceFactory factory;
-
-    @SuppressWarnings("unchecked")
-    public void testSimpleInterface() throws InvalidInterfaceException {
-        JavaInterface intf = factory.createJavaInterface(Simple.class);
-
-        assertEquals(Simple.class, intf.getJavaClass());
-        List<Operation> operations = intf.getOperations();
-        assertEquals(1, operations.size());
-        Operation baseInt = operations.get(0);
-        assertEquals("baseInt", baseInt.getName());
-
-        QName element = new QName("http://impl.introspection.java.interfacedef.sca.tuscany.apache.org/", "return");
-
-        DataType<XMLType> returnType = baseInt.getOutputType();
-        assertEquals(Integer.TYPE, returnType.getPhysical());
-        assertEquals(element, returnType.getLogical().getElementName());
-
-        List<DataType> parameterTypes = baseInt.getInputType().getLogical();
-        assertEquals(1, parameterTypes.size());
-        DataType<XMLType> arg0 = parameterTypes.get(0);
-        assertEquals(Integer.TYPE, arg0.getPhysical());
-        
-        element = new QName("http://impl.introspection.java.interfacedef.sca.tuscany.apache.org/", "arg0");
-        assertEquals(element, arg0.getLogical().getElementName());
-
-        List<DataType> faultTypes = baseInt.getFaultTypes();
-        assertEquals(1, faultTypes.size());
-        DataType<DataType<XMLType>> fault0 = faultTypes.get(0);
-        assertEquals(IOException.class, fault0.getPhysical());
-        element = new QName("http://impl.introspection.java.interfacedef.sca.tuscany.apache.org/", "IOException");
-        assertEquals(element, fault0.getLogical().getLogical().getElementName());
-    }
-
-    public void testUnregister() throws Exception {
-        JavaInterfaceVisitor extension = createMock(JavaInterfaceVisitor.class);
-        extension.visitInterface(EasyMock.isA(JavaInterface.class));
-        expectLastCall().once();
-        replay(extension);
-        factory.addInterfaceVisitor(extension);
-        factory.createJavaInterface(Base.class);
-        factory.removeInterfaceVisitor(extension);
-        factory.createJavaInterface(Base.class);
-        verify(extension);
-    }
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        factory = new DefaultJavaInterfaceFactory();
-
-    }
-
-    private static interface Base {
-        int baseInt(int param) throws IllegalArgumentException, IOException;
-    }
-
-    private static interface Simple extends Base {
-
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
deleted file mode 100644
index 5a454f176c..0000000000
--- a/tags/java/sca/1.3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.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.interfacedef.java.introspection.impl;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.osoa.sca.annotations.PolicySets;
-import org.osoa.sca.annotations.Requires;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCase extends TestCase {
-    private JavaInterfaceFactory factory = new DefaultJavaInterfaceFactory();
-    private PolicyJavaInterfaceVisitor policyProcessor;
-
-    public void testInterfaceLevel() throws Exception {
-        JavaInterface type = factory.createJavaInterface(Interface1.class);
-        policyProcessor.visitInterface(type);
-        assertEquals(1, type.getRequiredIntents().size());
-        assertEquals(1, type.getPolicySets().size());
-    }
-
-    public void testMethodLevel() throws Exception {
-        JavaInterface type = factory.createJavaInterface(Interface2.class);
-        policyProcessor.visitInterface(type);
-        assertEquals(0, type.getRequiredIntents().size());
-        assertEquals(1, type.getOperations().get(0).getRequiredIntents().size());
-        assertEquals(1, type.getOperations().get(1).getRequiredIntents().size());
-        assertEquals(0, type.getPolicySets().size());
-        assertEquals(1, type.getOperations().get(0).getPolicySets().size());
-        assertEquals(1, type.getOperations().get(1).getPolicySets().size());
-    }
-
-    public void testInterfaceAndMethodLevel() throws Exception {
-        JavaInterface type = factory.createJavaInterface(Interface3.class);
-        policyProcessor.visitInterface(type);
-        assertEquals(1, type.getRequiredIntents().size());
-        assertEquals(1, type.getOperations().get(0).getRequiredIntents().size());
-        assertEquals(1, type.getOperations().get(1).getRequiredIntents().size());
-        assertEquals(1, type.getPolicySets().size());
-        assertEquals(1, type.getOperations().get(0).getPolicySets().size());
-        assertEquals(1, type.getOperations().get(1).getPolicySets().size());
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        policyProcessor = new PolicyJavaInterfaceVisitor(new DefaultPolicyFactory());
-    }
-
-    // @Remotable
-    @Requires( {"transaction.global"})
-    @PolicySets( {"{http://ns1}PS1"})
-    private interface Interface1 {
-        int method1();
-
-        int method2();
-
-        int method3();
-
-        int method4();
-    }
-
-    private interface Interface2 {
-        @Requires( {"transaction.global"})
-        @PolicySets( {"{http://ns1}PS1"})
-        int method1();
-
-        @Requires( {"transaction.local"})
-        @PolicySets( {"{http://ns1}PS2"})
-        int method2();
-    }
-
-    @Requires( {"transaction.global.Interface6"})
-    @PolicySets( {"{http://ns1}PS1"})
-    private interface Interface3 {
-        @Requires( {"transaction.global.Interface6.method1"})
-        @PolicySets( {"{http://ns1}PS2"})
-        int method1();
-
-        @Requires( {"transaction.local.Interface6.method2"})
-        @PolicySets( {"{http://ns1}PS3"})
-        int method2();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/LICENSE b/tags/java/sca/1.3/modules/interface-wsdl-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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/tags/java/sca/1.3/modules/interface-wsdl-xml/NOTICE b/tags/java/sca/1.3/modules/interface-wsdl-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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/tags/java/sca/1.3/modules/interface-wsdl-xml/pom.xml b/tags/java/sca/1.3/modules/interface-wsdl-xml/pom.xml
deleted file mode 100644
index bb71cdbd20..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-wsdl-xml</artifactId>
-    <name>Apache Tuscany SCA WSDL Interface XML Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</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.interface.wsdl.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.wsdl.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
deleted file mode 100644
index c34a8626f7..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.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.interfacedef.wsdl.xml;

-

-import java.io.PrintWriter;

-

-import javax.wsdl.Definition;

-import javax.wsdl.WSDLException;

-import javax.wsdl.extensions.ExtensibilityElement;

-import javax.wsdl.extensions.ExtensionDeserializer;

-import javax.wsdl.extensions.ExtensionRegistry;

-import javax.wsdl.extensions.ExtensionSerializer;

-import javax.xml.namespace.QName;

-

-import org.w3c.dom.Element;

-import org.w3c.dom.NodeList;

-

-/**

- * A WSDL extension processor for extension elements introduced by BPEL - in particular

- * the <partnerLinkType.../> elements

- *

- * @version $Rev$ $Date$

- */

-public class BPELExtensionHandler implements ExtensionSerializer, ExtensionDeserializer {

-

-	private final String localName = "partnerLinkType";

-	private final String roleName = "role";

-

-	/**

-	 * Marshals the BPEL partner link type extension element to XML

-	 * See (@link javax.wsdl.extensions.ExtensionSerializer)

-	 */

-	@SuppressWarnings("unchecked")

-	public void marshall(Class parentType, QName elementType, ExtensibilityElement theElement,

-			PrintWriter writer, Definition def, ExtensionRegistry extReg)

-			throws WSDLException {

-		// The format of the Partner Link Type in XML is as follows:

-		// <foo:partnerLinkType name="bar">

-		//    <foo:role name="somename" portType="xyz:portTypeName"/>

-		//    <foo:role name="othername" portType="xyz:portTypeName2"/>

-		// <foo:partnerLinkType>

-		BPELPartnerLinkTypeExt thePLinkType = (BPELPartnerLinkTypeExt) theElement;

-		QName theType = thePLinkType.getElementType();

-

-		writer.println("<" + theType.toString() +

-				       " name=\"" + thePLinkType.getName() + "\">");

-		for( int i = 0; i < 2; i++ ) {

-			if( thePLinkType.getRoleName( i ) != null ) {

-				writer.println( "<" + theType.getPrefix() + ":role"

-						       + " name=\"" + thePLinkType.getRoleName(i) + "\" portType=\""

-						       + thePLinkType.getRolePortType(i) + "\">");

-			} // end if

-		} // end for

-		writer.println("</" + theType.toString() + ">");

-	} // end marshall

-

-	/**

-	 * Unmarshals the BPEL partner link type element from XML

-	 * See (@link javax.wsdl.extensions.ExtensionDeserializer)

-	 * The format of the Partner Link Type in XML is as follows:

-	 *   <foo:partnerLinkType name="bar">

-	 *       <foo:role name="somename" portType="xyz:portTypeName"/>

-	 *       <foo:role name="othername" portType="xyz:portTypeName2"/>

-	 *   <foo:partnerLinkType>

-	 *

-	 *   One role is mandatory, the second is optional.

-	 */

-	@SuppressWarnings("unchecked")

-	public ExtensibilityElement unmarshall(Class theClass, QName elementType,

-			Element theElement, Definition def, ExtensionRegistry extReg)

-			throws WSDLException {

-		// System.out.println("BPELExtensionHandler unmarshall called");

-

-		// Check that this elementType really is a partnerLinkType element

-		if( !elementType.getLocalPart().equals(localName) ) return null;

-		BPELPartnerLinkTypeExt theExtension = new BPELPartnerLinkTypeExt();

-		theExtension.setElementType(elementType);

-		theExtension.setName( theElement.getAttribute("name") );

-

-		//Fetch the child "role" elements

-		NodeList theRoles = theElement.getElementsByTagNameNS("*", roleName);

-		for ( int i=0; i < theRoles.getLength(); i++ ) {

-			if( i > 1 ) break;

-			Element roleNode = (Element)theRoles.item(i);

-			String roleName = roleNode.getAttribute("name");

-			String portType = roleNode.getAttribute("portType");

-			// The PortType attribute is a QName in prefix:localName format - convert to a QName

-			QName rolePortType = getQNameValue( def, portType );

-			theExtension.setRole( i, roleName, rolePortType );

-		} // end for

-		return theExtension;

-	} // end unmarshall

-

-

-    /**

-     * Returns a QName from a string.

-     * @param definition - a WSDL Definition

-     * @param value - the String from which to form the QName in the form "pref:localName"

-     * @return

-     */

-    protected QName getQNameValue(Definition definition, String value) {

-        if (value != null && definition != null) {

-            int index = value.indexOf(':');

-            String prefix = index == -1 ? "" : value.substring(0, index);

-            String localName = index == -1 ? value : value.substring(index + 1);

-            String ns = definition.getNamespace(prefix);

-            if (ns == null) {

-                ns = "";

-            }

-            return new QName(ns, localName, prefix);

-        } else {

-            return null;

-        }

-    } // end getQNameValue

-

-} // end BPELExtensionHandler

diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
deleted file mode 100644
index 67124832f3..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.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.interfacedef.wsdl.xml;

-

-import javax.wsdl.extensions.ExtensibilityElement;

-import javax.xml.namespace.QName;

-

-/**

- * A class to serve as the extensibility element for BPEL partnerLinkType elements

- *

- * @version $Rev$ $Date$

- */

-public class BPELPartnerLinkTypeExt implements ExtensibilityElement {

-

-	private QName elementType = null;

-	private String linkTypeName = null;

-	private String[] roleNames = new String[2];

-	private QName[] rolePortTypes = new QName[2];

-

-	// -- methods required by the Extensibility Element interface

-	public QName getElementType() {

-		return elementType;

-	}

-

-	public Boolean getRequired() {

-		return true;

-	}

-

-	public void setElementType(QName theName ) {

-		elementType = theName;

-	}

-

-	public void setRequired(Boolean required) {

-		// intentionally left blank

-	}

-

-	// -- other methods

-

-	public void setName( String theName ) {

-		linkTypeName = theName;

-	}

-

-	public String getName() {

-		return linkTypeName;

-	}

-

-	public void setRole( int i, String name, QName portType ) {

-		if( i > 1 ) return;

-		roleNames[i] = name;

-		rolePortTypes[i] = portType;

-	}

-

-	public String getRoleName( int i ) {

-		if( i > 1 ) return null;

-		return roleNames[i];

-	}

-

-	public QName getRolePortType( int i ) {

-		if( i > 1 ) return null;

-		return rolePortTypes[i];

-	}

-

-} // end BPELPartnerLinkTypeExt

diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
deleted file mode 100644
index f9ddda6d98..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.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.interfacedef.wsdl.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * Constants for WSDL.
- *
- * @version $Rev$ $Date$
- */
-public interface WSDLConstants {
-
-    String INTERFACE_WSDL = "interface.wsdl";
-    QName INTERFACE_WSDL_QNAME = new QName(Constants.SCA10_NS, "interface.wsdl");
-    String INTERFACE = "interface";
-    String CALLBACK_INTERFACE = "callbackInterface";
-    String WSDL_LOCATION = "wsdlLocation";
-    String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
-    QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
deleted file mode 100644
index 6302913c25..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.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.interfacedef.wsdl.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-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.xsd.XSDefinition;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-/**
- * An ArtifactProcessor for WSDL documents.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLDocumentProcessor implements URLArtifactProcessor<WSDLDefinition> {
-
-    public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions");
-    public static final QName WSDL11_IMPORT = new QName("http://schemas.xmlsoap.org/wsdl/", "import");
-    public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema");
-
-    private static final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-    private WSDLFactory factory;
-    private XSDFactory xsdFactory;
-    private Monitor monitor;
-
-    public WSDLDocumentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(WSDLFactory.class);
-        this.xsdFactory = modelFactories.getFactory(XSDFactory.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 = new ProblemImpl(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-    public WSDLDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
-        try {
-            WSDLDefinition definition = indexRead(artifactURL);
-            definition.setURI(artifactURI);
-            return definition;
-        } catch (Exception e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", artifactURL, ce);
-            //throw ce;
-        	return null;
-        }
-    }
-
-    public void resolve(WSDLDefinition model, ModelResolver resolver) throws ContributionResolveException {
-        if (model == null) return;
-    	
-        Definition definition = model.getDefinition();
-        if (definition != null) {
-            for (Object imports : definition.getImports().values()) {
-                List importList = (List)imports;
-                for (Object i : importList) {
-                    Import imp = (Import)i;
-                    if (imp.getDefinition() != null) {
-                        continue;
-                    }
-                    if (imp.getLocationURI() == null) {
-                        // FIXME: [rfeng] By the WSDL 1.1 Specification, the location attribute is required
-                        // We need to resolve it by QName
-                        WSDLDefinition proxy = factory.createWSDLDefinition();
-                        proxy.setUnresolved(true);
-                        proxy.setNamespace(imp.getNamespaceURI());
-                        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, proxy);
-                        if (resolved != null && !resolved.isUnresolved()) {
-                            imp.setDefinition(resolved.getDefinition());
-                            if (!model.getImportedDefinitions().contains(resolved)) {
-                                model.getImportedDefinitions().add(resolved);
-                            }
-                        }
-                    } else {
-                        String location = imp.getLocationURI();
-                        URI uri = URI.create(location);
-                        if (uri.isAbsolute()) {
-                            WSDLDefinition resolved;
-                            try {
-                                resolved = read(null, uri, uri.toURL());
-                                imp.setDefinition(resolved.getDefinition());
-                                if (!model.getImportedDefinitions().contains(resolved)) {
-                                    model.getImportedDefinitions().add(resolved);
-                                }
-                            } catch (Exception e) {
-                            	ContributionResolveException ce = new ContributionResolveException(e);
-                            	error("ContributionResolveException", resolver, ce);
-                                //throw ce;
-                            }
-                        } else {
-                            if (location.startsWith("/")) {
-                                // This is a relative URI against a contribution
-                                location = location.substring(1);
-                                // TODO: Need to resolve it against the contribution
-                            } else {
-                                // This is a relative URI against the WSDL document
-                                URI baseURI = URI.create(model.getDefinition().getDocumentBaseURI());
-                                URI locationURI = baseURI.resolve(location);
-                                WSDLDefinition resolved;
-                                try {
-                                    resolved = read(null, locationURI, locationURI.toURL());
-                                    imp.setDefinition(resolved.getDefinition());
-                                    if (!model.getImportedDefinitions().contains(resolved)) {
-                                        model.getImportedDefinitions().add(resolved);
-                                    }
-                                } catch (Exception e) {
-                                	ContributionResolveException ce = new ContributionResolveException(e);
-                                	error("ContributionResolveException", resolver, ce);
-                                    //throw ce;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public String getArtifactType() {
-        return ".wsdl";
-    }
-
-    public Class<WSDLDefinition> getModelType() {
-        return WSDLDefinition.class;
-    }
-
-    /**
-     * Read the namespace for the WSDL definition and inline schemas
-     * 
-     * @param doc
-     * @return
-     * @throws IOException
-     * @throws XMLStreamException
-     */
-    protected WSDLDefinition indexRead(URL doc) throws Exception {
-        WSDLDefinition wsdlDefinition = factory.createWSDLDefinition();
-        wsdlDefinition.setUnresolved(true);
-        wsdlDefinition.setLocation(doc.toURI());
-
-        InputStream is = doc.openStream();
-        try {
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            int eventType = reader.getEventType();
-            int index = 0;
-            while (true) {
-                if (eventType == XMLStreamConstants.START_ELEMENT) {
-                    if (WSDL11.equals(reader.getName())) {
-                        String tns = reader.getAttributeValue(null, "targetNamespace");
-                        wsdlDefinition.setNamespace(tns);
-                        // The definition is marked as resolved but not loaded
-                        wsdlDefinition.setUnresolved(false);
-                        wsdlDefinition.setDefinition(null);
-                    }
-                    if (XSD.equals(reader.getName())) {
-                        String tns = reader.getAttributeValue(null, "targetNamespace");
-                        XSDefinition xsd = xsdFactory.createXSDefinition();
-                        xsd.setUnresolved(true);
-                        xsd.setNamespace(tns);
-                        xsd.setLocation(URI.create(doc.toURI() + "#" + index));
-                        index++;
-                        // The definition is marked as resolved but not loaded
-                        xsd.setUnresolved(false);
-                        xsd.setSchema(null);
-                        wsdlDefinition.getXmlSchemas().add(xsd);
-                    }
-                }
-                if (reader.hasNext()) {
-                    eventType = reader.next();
-                } else {
-                    break;
-                }
-            }
-            return wsdlDefinition;
-        } finally {
-            is.close();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
deleted file mode 100644
index e04a4d6743..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.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.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-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.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.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.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-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;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {
-
-    private WSDLFactory wsdlFactory;
-    private Monitor monitor;
-
-    public WSDLInterfaceProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-     }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "interface-wsdlxml-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(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }        
-    }
-    
-    /**
-     * Create a WSDL interface from a URI.
-     * @param uri
-     * @return
-     * @throws ContributionReadException
-     */
-    private WSDLInterface createWSDLInterface(String uri) throws ContributionReadException {
-        
-    	WSDLInterface wsdlInterface = null;        
-
-        // Read a QName in the form:
-        // namespace#wsdl.interface(name)
-        int index = uri.indexOf('#');
-        if (index == -1) {
-        	error("InvalidWSDLInterfaceAttr", wsdlFactory, uri);
-            //throw new ContributionReadException("Invalid WSDL interface attribute: " + uri);
-        } else {
-        	wsdlInterface = wsdlFactory.createWSDLInterface();
-            wsdlInterface.setUnresolved(true);
-            String namespace = uri.substring(0, index);
-            String name = uri.substring(index + 1);
-            name = name.substring("wsdl.interface(".length(), name.length() - 1);
-            wsdlInterface.setName(new QName(namespace, name));
-        }       
-        
-        return wsdlInterface;
-    }
-
-    public WSDLInterfaceContract read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        // Read an <interface.wsdl>
-        WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract();
-        
-        // Read wsdlLocation
-        String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION);
-        wsdlInterfaceContract.setLocation(location);
-        
-        String uri = reader.getAttributeValue(null, INTERFACE);
-        if (uri != null) {
-            WSDLInterface wsdlInterface = createWSDLInterface(uri);
-            if (wsdlInterface != null)
-                wsdlInterfaceContract.setInterface(wsdlInterface);
-        }
-        
-        uri = reader.getAttributeValue(null, CALLBACK_INTERFACE);
-        if (uri != null) {
-            WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri);
-            if (wsdlCallbackInterface != null)
-                wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);
-        }
-            
-        // Skip to end element
-        while (reader.hasNext()) {
-            if (reader.next() == END_ELEMENT && INTERFACE_WSDL_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        return wsdlInterfaceContract;
-    }
-    
-    public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // Write an <interface.wsdl>
-        writer.writeStartElement(Constants.SCA10_NS, INTERFACE_WSDL);
-
-        // Write interface name
-        WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface();
-        if (wsdlInterface != null) {
-            QName qname = wsdlInterface.getName();
-            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";
-            writer.writeAttribute(INTERFACE, uri);
-        }
-
-        WSDLInterface wsdlCallbackInterface = (WSDLInterface)wsdlInterfaceContract.getCallbackInterface();
-        if (wsdlCallbackInterface != null) {
-            QName qname = wsdlCallbackInterface.getName();
-            String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")";
-            writer.writeAttribute(CALLBACK_INTERFACE, uri);
-        }
-        
-        // Write location
-        if (wsdlInterfaceContract.getLocation() != null) {
-            writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsdlInterfaceContract.getLocation());
-        }
-        
-        writer.writeEndElement();
-    }
-    
-    private WSDLInterface resolveWSDLInterface(WSDLInterface wsdlInterface, ModelResolver resolver) throws ContributionResolveException {
-        
-        if (wsdlInterface != null && wsdlInterface.isUnresolved()) {
-
-            // Resolve the WSDL interface
-            wsdlInterface = resolver.resolveModel(WSDLInterface.class, wsdlInterface);
-            if (wsdlInterface.isUnresolved()) {
-
-                // If the WSDL interface has never been resolved yet, do it now
-                // First, resolve the WSDL definition for the given namespace
-                WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-                wsdlDefinition.setUnresolved(true);
-                wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI());
-                WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition);
-                if (!resolved.isUnresolved()) {
-                    wsdlDefinition.setDefinition(resolved.getDefinition());
-                    wsdlDefinition.setLocation(resolved.getLocation());
-                    wsdlDefinition.setURI(resolved.getURI());
-                    wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions());
-                    wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());
-                    wsdlDefinition.setUnresolved(false);
-                    WSDLObject<PortType> portType = wsdlDefinition.getWSDLObject(PortType.class, wsdlInterface.getName());
-                    if (portType != null) {                        
-                        // Introspect the WSDL portType and add the resulting
-                        // WSDLInterface to the resolver
-                        try {
-                            wsdlDefinition.setDefinition(portType.getDefinition());
-                            wsdlInterface = wsdlFactory.createWSDLInterface(portType.getElement(), wsdlDefinition, resolver);
-                            wsdlInterface.setWsdlDefinition(wsdlDefinition);
-                            resolver.addModel(wsdlInterface);
-                        } catch (InvalidInterfaceException e) {
-                        	ContributionResolveException ce = new ContributionResolveException(e);
-                        	error("ContributionResolveException", wsdlFactory, ce);
-                            //throw ce;
-                        }                        
-                    }
-                    else {
-                    	warning("WsdlInterfaceDoesNotMatch", wsdlDefinition, wsdlInterface.getName());
-                    }
-                }
-            }
-        }
-        return wsdlInterface;
-    }
-    
-    public void resolve(WSDLInterfaceContract wsdlInterfaceContract, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the interface and callback interface
-        WSDLInterface wsdlInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getInterface(), resolver);
-        wsdlInterfaceContract.setInterface(wsdlInterface);
-        
-        WSDLInterface wsdlCallbackInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getCallbackInterface(), resolver);
-        wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface);
-    }
-    
-    public QName getArtifactType() {
-        return WSDLConstants.INTERFACE_WSDL_QNAME;
-    }
-    
-    public Class<WSDLInterfaceContract> getModelType() {
-        return WSDLInterfaceContract.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
deleted file mode 100644
index 0004774afa..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.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.interfacedef.wsdl.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.AttributeExtensible;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.ExtensionDeserializer;
-import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.extensions.ExtensionSerializer;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensionDeserializer;
-import javax.wsdl.extensions.UnknownExtensionSerializer;
-import javax.wsdl.extensions.schema.Schema;
-import javax.wsdl.xml.WSDLLocator;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionRuntimeException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
-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;
-import org.xml.sax.InputSource;
-
-/**
- * A Model Resolver for WSDL models.
- * 
- * @version $Rev: 557916 $ $Date: 2007-07-20 01:04:40 -0700 (Fri, 20 Jul 2007) $
- */
-public class WSDLModelResolver implements ModelResolver {
-    //Schema element names
-    public static final String ELEM_SCHEMA = "schema";
-
-    //Schema URI
-    public static final String NS_URI_XSD_1999 = "http://www.w3.org/1999/XMLSchema";
-    public static final String NS_URI_XSD_2000 = "http://www.w3.org/2000/10/XMLSchema";
-    public static final String NS_URI_XSD_2001 = "http://www.w3.org/2001/XMLSchema";
-
-    //Schema QNames
-    public static final QName Q_ELEM_XSD_1999 = new QName(NS_URI_XSD_1999, ELEM_SCHEMA);
-    public static final QName Q_ELEM_XSD_2000 = new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
-    public static final QName Q_ELEM_XSD_2001 = new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
-    public static final List<QName> XSD_QNAME_LIST =
-        Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
-    
-    // ---- Policy WSDL Attachments
-    
-    public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://www.osoa.org/xmlns/sca/1.0", "requires");
-    public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://www.osoa.org/xmlns/sca/1.0", "endsConversation");
-    
-    // ---- Stuff added for BPEL extension elements ---  Mike Edwards 01/05/2008
-    public static final String ELEM_PLINKTYPE = "partnerLinkType";
-    public static final String NS_BPEL_1_1 = "http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
-    public static final QName BPEL_PLINKTYPE = new QName( NS_BPEL_1_1, ELEM_PLINKTYPE );
-    // ---- end of BPEL extension stuff
-
-    private Contribution contribution;
-    private Map<String, List<WSDLDefinition>> map = new HashMap<String, List<WSDLDefinition>>();
-
-    private ExtensionRegistry wsdlExtensionRegistry;
-
-    private WSDLFactory wsdlFactory;
-    private javax.wsdl.factory.WSDLFactory wsdl4jFactory;
-    private ContributionFactory contributionFactory;
-    private XSDFactory xsdFactory;
-
-    public WSDLModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-
-        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        this.wsdl4jFactory = modelFactories.getFactory(javax.wsdl.factory.WSDLFactory.class);
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.xsdFactory = modelFactories.getFactory(XSDFactory.class);
-
-        wsdlExtensionRegistry = this.wsdl4jFactory.newPopulatedExtensionRegistry();
-        // REVIEW: [rfeng] Disable the schema extension for WSDL4J to avoid aggressive loading 
-        ExtensionDeserializer deserializer = new UnknownExtensionDeserializer();
-        ExtensionSerializer serializer = new UnknownExtensionSerializer();
-        for (QName schema : XSD_QNAME_LIST) {
-            wsdlExtensionRegistry.registerSerializer(Types.class, schema, serializer);
-            wsdlExtensionRegistry.registerDeserializer(Types.class, schema, deserializer);
-        }
-        // ---- Policy WSDL Extensions
-        wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE);
-        wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE);
-        
-        // ---- BPEL additions
-        serializer = new BPELExtensionHandler();
-        deserializer = new BPELExtensionHandler();
-        wsdlExtensionRegistry.registerSerializer(Definition.class, BPEL_PLINKTYPE, serializer);
-        wsdlExtensionRegistry.registerDeserializer(Definition.class, BPEL_PLINKTYPE, deserializer);
-        // ---- end of BPEL additions
-    }
-
-    /**
-     * Implementation of a WSDL locator.
-     */
-    private class WSDLLocatorImpl implements WSDLLocator {
-        private InputStream inputStream;
-        private URL base;
-        private String latestImportURI;
-
-        public WSDLLocatorImpl(URL base, InputStream is) {
-            this.base = base;
-            this.inputStream = is;
-        }
-
-        public void close() {
-            try {
-                inputStream.close();
-            } catch (IOException e) {
-                // Ignore
-            }
-        }
-
-        public InputSource getBaseInputSource() {
-            try {
-                return XMLDocumentHelper.getInputSource(base, inputStream);
-            } catch (IOException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-
-        public String getBaseURI() {
-            return base.toString();
-        }
-
-        public InputSource getImportInputSource(String parentLocation, String importLocation) {
-            try {
-                if (importLocation == null) {
-                    throw new IllegalArgumentException("Required attribute 'location' is missing.");
-                }
-
-                URL url = null;
-                if (importLocation.startsWith("/")) {
-                    // The URI is relative to the contribution
-                    String uri = importLocation.substring(1);
-
-                    Artifact proxyArtifact = contributionFactory.createArtifact();
-                    proxyArtifact.setURI(uri);
-
-                    //use contribution resolution (this supports import/export)
-                    Artifact importedArtifact =
-                        contribution.getModelResolver().resolveModel(Artifact.class, proxyArtifact);
-                    if (importedArtifact.getLocation() != null) {
-                        //get the artifact URL
-                        url = new URL(importedArtifact.getLocation());
-                    }
-                } else {
-                    url = new URL(new URL(parentLocation), importLocation);
-                }
-                if (url == null) {
-                    return null;
-                }
-                latestImportURI = url.toString();
-                return XMLDocumentHelper.getInputSource(url);
-            } catch (Exception e) {
-                throw new ContributionRuntimeException(e);
-            }
-        }
-
-        public String getLatestImportURI() {
-            return latestImportURI;
-        }
-
-    }
-
-    public void addModel(Object resolved) {
-        WSDLDefinition definition = (WSDLDefinition)resolved;
-        for (XSDefinition d : definition.getXmlSchemas()) {
-            if (contribution != null) {
-                contribution.getModelResolver().addModel(d);
-            }
-        }
-        List<WSDLDefinition> list = map.get(definition.getNamespace());
-        if (list == null) {
-            list = new ArrayList<WSDLDefinition>();
-            map.put(definition.getNamespace(), list);
-        }
-        list.add(definition);
-    }
-
-    public Object removeModel(Object resolved) {
-        WSDLDefinition definition = (WSDLDefinition)resolved;
-        List<WSDLDefinition> list = map.get(definition.getNamespace());
-        if (list == null) {
-            return null;
-        } else {
-            return list.remove(definition);
-        }
-    }
-
-    /**
-     * Create a facade Definition which imports all the definitions
-     * 
-     * @param definitions A list of the WSDL definitions under the same target namespace
-     * @return The aggregated WSDL definition
-     */
-    private WSDLDefinition aggregate(List<WSDLDefinition> definitions) {
-        if (definitions == null || definitions.size() == 0) {
-            return null;
-        }
-        if (definitions.size() == 1) {
-            WSDLDefinition d = definitions.get(0);
-            loadOnDemand(d);
-            return d;
-        }
-        WSDLDefinition aggregated = wsdlFactory.createWSDLDefinition();
-        for (WSDLDefinition d : definitions) {
-            loadOnDemand(d);
-        }
-        Definition facade = wsdl4jFactory.newDefinition();
-        String ns = definitions.get(0).getNamespace();
-        facade.setQName(new QName(ns, "$aggregated$"));
-        facade.setTargetNamespace(ns);
-
-        for (WSDLDefinition d : definitions) {
-            if (d.getDefinition() != null) {
-                javax.wsdl.Import imp = facade.createImport();
-                imp.setNamespaceURI(d.getNamespace());
-                imp.setDefinition(d.getDefinition());
-                imp.setLocationURI(d.getDefinition().getDocumentBaseURI());
-                facade.addImport(imp);
-                aggregated.getXmlSchemas().addAll(d.getXmlSchemas());
-                aggregated.getImportedDefinitions().add(d);
-            }
-        }
-        aggregated.setDefinition(facade);
-        definitions.clear();
-        definitions.add(aggregated);
-        return aggregated;
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
-        // Lookup a definition for the given namespace
-        String namespace = ((WSDLDefinition)unresolved).getNamespace();
-        if (namespace == null) {
-            return modelClass.cast(unresolved);
-        }
-        List<WSDLDefinition> list = map.get(namespace);
-        WSDLDefinition resolved = aggregate(list);
-        if (resolved != null && !resolved.isUnresolved()) {
-            return modelClass.cast(resolved);
-        }
-
-        // No definition found, delegate the resolution to the imports
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                if (namespaceImport.getNamespace().equals(namespace)) {
-
-                    // Delegate the resolution to the namespace import resolver
-                    resolved =
-                        namespaceImport.getModelResolver().resolveModel(WSDLDefinition.class,
-                                                                        (WSDLDefinition)unresolved);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            } else if (import_ instanceof DefaultImport) {
-                
-                // Delegate the resolution to the default import resolver
-                resolved =
-                    import_.getModelResolver().resolveModel(WSDLDefinition.class,
-                                                                    (WSDLDefinition)unresolved);
-                if (!resolved.isUnresolved()) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-        return modelClass.cast(unresolved);
-    }
-
-    /**
-     * Load the WSDL definition on demand
-     * @param def
-     */
-    private void loadOnDemand(WSDLDefinition def) {
-        if (def.getDefinition() == null && def.getLocation() != null) {
-            // Load the definition on-demand
-            try {
-                loadDefinition(def);
-            } catch (ContributionReadException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    // private Map<String, WSDLDefinition> loadedDefinitions = new Hashtable<String, WSDLDefinition>();
-
-    /**
-     * Load the WSDL definition and inline schemas
-     * 
-     * @param wsdlDef
-     * @throws ContributionReadException
-     */
-    private void loadDefinition(WSDLDefinition wsdlDef) throws ContributionReadException {
-        if (wsdlDef.getDefinition() != null || wsdlDef.getLocation() == null) {
-            return;
-        }
-        try {
-            URL artifactURL = wsdlDef.getLocation().toURL();
-            // Read a WSDL document
-            InputStream is = artifactURL.openStream();
-            WSDLReader reader = wsdl4jFactory.newWSDLReader();
-            reader.setFeature("javax.wsdl.verbose", false);
-            reader.setFeature("javax.wsdl.importDocuments", true);
-            // FIXME: We need to decide if we should disable the import processing by WSDL4J
-            // reader.setFeature("javax.wsdl.importDocuments", false);
-            reader.setExtensionRegistry(wsdlExtensionRegistry);  // use a custom registry
-
-            WSDLLocatorImpl locator = new WSDLLocatorImpl(artifactURL, is);
-            Definition definition = reader.readWSDL(locator);
-            wsdlDef.setDefinition(definition);
-
-            // If this definition imports any definitions from other namespaces,
-            // set the correct WSDLDefinition import relationships.
-            for (Map.Entry<String, List<javax.wsdl.Import>> entry :
-                    ((Map<String, List<javax.wsdl.Import>>)definition.getImports()).entrySet()) {
-                if (!entry.getKey().equals(definition.getTargetNamespace())) { 
-                    WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-                    wsdlDefinition.setUnresolved(true);
-                    wsdlDefinition.setNamespace(entry.getKey());
-                    WSDLDefinition resolved = resolveModel(WSDLDefinition.class, wsdlDefinition);
-                    if (!resolved.isUnresolved()) {
-                        for (javax.wsdl.Import imp : entry.getValue()) {
-                            if (resolved.getDefinition().getDocumentBaseURI().equals(imp.getDefinition().getDocumentBaseURI())) {
-                                // this WSDLDefinition contains the imported document
-                                wsdlDef.getImportedDefinitions().add(resolved);
-                            } else {
-                                // this is a facade, so look in its imported definitions
-                                for (WSDLDefinition def : resolved.getImportedDefinitions()) {
-                                    if (def.getDefinition().getDocumentBaseURI().equals(imp.getDefinition().getDocumentBaseURI())) {
-                                        wsdlDef.getImportedDefinitions().add(def);
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            //Read inline schemas 
-            readInlineSchemas(wsdlDef, definition);
-        } catch (WSDLException e) {
-            throw new ContributionReadException(e);
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    private Document promote(Element element) {
-        Document 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();
-            if (nodeMap != null) {
-                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();
-        }
-        doc.setDocumentURI(element.getOwnerDocument().getDocumentURI());
-        return doc;
-    }
-
-    /**
-     * Populate the inline schemas including those from the imported definitions
-     * 
-     * @param definition
-     * @param schemaCollection
-     */
-    private void readInlineSchemas(WSDLDefinition wsdlDefinition, Definition definition) {
-        if (contribution == null) {
-            // Check null for test cases
-            return;
-        }
-        Types types = definition.getTypes();
-        if (types != null) {
-            int index = 0;
-            for (Object ext : types.getExtensibilityElements()) {
-                ExtensibilityElement extElement = (ExtensibilityElement)ext;
-                Element element = null;
-                if (XSD_QNAME_LIST.contains(extElement.getElementType())) {
-                    if (extElement instanceof Schema) {
-                        element = ((Schema)extElement).getElement();
-                    } else if (extElement instanceof UnknownExtensibilityElement) {
-                        element = ((UnknownExtensibilityElement)extElement).getElement();
-                    }
-                }
-                if (element != null) {
-                    Document doc = promote(element);
-                    XSDefinition xsDefinition = xsdFactory.createXSDefinition();
-                    xsDefinition.setUnresolved(true);
-                    xsDefinition.setNamespace(element.getAttribute("targetNamespace"));
-                    xsDefinition.setDocument(doc);
-                    xsDefinition.setLocation(URI.create(doc.getDocumentURI() + "#" + index));
-                    XSDefinition resolved =
-                        contribution.getModelResolver().resolveModel(XSDefinition.class, xsDefinition);
-                    if (resolved != null && !resolved.isUnresolved()) {
-                        if (!wsdlDefinition.getXmlSchemas().contains(resolved)) {
-                            // Don't add resolved because it may be an aggregate that
-                            // contains more than we need.  The resolver will have
-                            // set the specific schema we need into unresolved.
-                            wsdlDefinition.getXmlSchemas().add(xsDefinition);
-                        }
-                    }
-                    index++;
-                }
-            }
-        }
-        for (Object imports : definition.getImports().values()) {
-            List impList = (List)imports;
-            for (Object i : impList) {
-                javax.wsdl.Import anImport = (javax.wsdl.Import)i;
-                // Read inline schemas 
-                if (anImport.getDefinition() != null) {
-                    readInlineSchemas(wsdlDefinition, anImport.getDefinition());
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9666a6dbd8..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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.interfacedef.wsdl.xml.WSDLInterfaceProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#interface.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 553c764233..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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.interfacedef.wsdl.xml.WSDLDocumentProcessor;type=.wsdl,model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 30d2039e80..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/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.interfacedef.wsdl.xml.WSDLModelResolver;model=org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
deleted file mode 100644
index 2f8c3e0500..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ /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.
-#
-#
-ContributionReadException = ContributionReadException occured due to :
-ContributionResolveException = ContributionResolveException occured due to :
-InvalidWSDLInterfaceAttr = Invalid WSDL interface attribute: {0}
-WsdlInterfaceDoesNotMatch = The #wsdl.interface({0}) specified does not match with WSDL Definitions
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
deleted file mode 100644
index f0228edb1f..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.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.interfacedef.wsdl;
-
-import junit.framework.TestCase;
-
-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.ExtensibleURLArtifactProcessor;
-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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-/**
- * Test case for WSDLOperation.
- *
- * @version $Rev$ $Date$
- */
-public abstract class AbstractWSDLTestCase extends TestCase {
-    protected URLArtifactProcessor<Object> documentProcessor;
-    protected ModelResolver resolver;
-    protected WSDLFactory wsdlFactory;
-    protected XSDFactory xsdFactory;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        xsdFactory = modelFactories.getFactory(XSDFactory.class);
-        
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        Contribution contribution = contributionFactory.createContribution();
-        ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        resolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-        contribution.setModelResolver(resolver);
-        
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
deleted file mode 100644
index dc7e1ced38..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.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.interfacedef.wsdl.introspect;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.interfacedef.wsdl.AbstractWSDLTestCase;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-
-/**
- * Test case for InterfaceWSDLIntrospectorImpl.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceIntrospectorTestCase extends AbstractWSDLTestCase {
-    private static final QName PORTTYPE_NAME = new QName("http://example.com/stockquote.wsdl", "StockQuotePortType");
-
-    private PortType portType;
-    private WSDLDefinition definition;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        URL url = getClass().getResource("../xml/stockquote.wsdl");
-        definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-    }
-
-    @SuppressWarnings("unchecked")
-    public final void testIntrospectPortType() throws InvalidInterfaceException {
-        WSDLInterface contract = wsdlFactory.createWSDLInterface(portType, definition, resolver);
-        Assert.assertEquals(contract.getName().getLocalPart(), "StockQuotePortType");
-        List<Operation> operations = contract.getOperations();
-        Assert.assertEquals(1, operations.size());
-        Operation operation = operations.get(0);
-        Assert.assertEquals("getLastTradePrice", operation.getName());
-        DataType<List<DataType>> inputType = operation.getInputType();
-        Assert.assertEquals(1, inputType.getLogical().size());
-        DataType<XMLType> returnType = operation.getOutputType();
-        Assert.assertNotNull(returnType);
-        Assert.assertEquals(0, operation.getFaultTypes().size());
-        // Assert.assertEquals(1,
-        // operation.getWrapper().getInputChildElements().size());
-        // Assert.assertEquals(1,
-        // operation.getWrapper().getOutputChildElements().size());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
deleted file mode 100644
index c392b92f8a..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.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.interfacedef.wsdl.introspect;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.interfacedef.wsdl.AbstractWSDLTestCase;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.impl.WSDLOperationIntrospectorImpl;
-
-/**
- * Test case for WSDLOperation.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLOperationIntrospectorTestCase extends AbstractWSDLTestCase {
-    private static final QName PORTTYPE_NAME =
-        new QName("http://example.com/stockquote.wsdl", "StockQuotePortType");
-
-
-    @SuppressWarnings("unchecked")
-    public final void testWrappedOperation() throws Exception {
-        URL url = getClass().getResource("../xml/stockquote.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-        Operation operation = portType.getOperation("getLastTradePrice", null, null);
-
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-
-        DataType<List<DataType>> inputType = op.getInputType();
-        Assert.assertEquals(1, inputType.getLogical().size());
-        DataType<XMLType> type = inputType.getLogical().get(0);
-        Assert.assertEquals(new QName("http://example.com/stockquote.xsd", "getLastTradePrice"), type.getLogical().getElementName());
-
-        DataType<XMLType> outputType = op.getOutputType();
-        Assert.assertEquals(new QName("http://example.com/stockquote.xsd", "getLastTradePriceResponse"),
-                            outputType.getLogical().getElementName());
-        Assert.assertTrue(op.isWrapperStyle());
-
-        DataType<List<DataType>> unwrappedInputType = op.getWrapper().getWrapperInfo().getUnwrappedInputType();
-        List<DataType> childTypes = unwrappedInputType.getLogical();
-        Assert.assertEquals(1, childTypes.size());
-        DataType<XMLType> childType = childTypes.get(0);
-        Assert.assertEquals(new QName(null, "tickerSymbol"), childType.getLogical().getElementName());
-
-        childType = op.getWrapper().getWrapperInfo().getUnwrappedOutputType();
-        Assert.assertEquals(new QName(null, "price"), childType.getLogical().getElementName());
-    }
-
-    public final void testUnwrappedOperation() throws Exception {
-        URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("unwrapped-stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-
-        Operation operation = portType.getOperation("getLastTradePrice1", null, null);
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-        Assert.assertFalse(op.isWrapperStyle());
-        Assert.assertEquals(1, op.getInputType().getLogical().size());
-
-        operation = portType.getOperation("getLastTradePrice2", null, null);
-        op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-        Assert.assertFalse(op.isWrapperStyle());
-        Assert.assertEquals(2, op.getInputType().getLogical().size());
-    }
-
-    public final void testInvalidWSDL() throws Exception {
-        URL url = getClass().getResource("../xml/invalid-stockquote.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("invalid-stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-
-        Operation operation = portType.getOperation("getLastTradePrice", null, null);
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-
-        try {
-            op.isWrapperStyle();
-            fail("InvalidWSDLException should have been thrown");
-        } catch (InvalidInterfaceException e) {
-            // Expected
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
deleted file mode 100644
index cf379a1b11..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.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.interfacedef.wsdl.introspect;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.AbstractWSDLTestCase;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.policy.Intent;
-
-/**
- * Test case for InterfaceWSDLIntrospectorImpl.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLPolicyAnnotatedInterfaceIntrospectorTestCase extends AbstractWSDLTestCase {
-    private static final QName PORTTYPE_NAME = new QName("http://example.com/stockquote.wsdl", "StockQuotePortType");
-    private static final QName INTENT = new QName("http://example.com/stockquote.wsdl", "PolicyIntent");
-
-    private PortType portType;
-    private WSDLDefinition definition;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        URL url = getClass().getResource("/policy/stockquote_policy.wsdl");
-        definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-    }
-
-    @SuppressWarnings("unchecked")
-    public final void testIntrospectPortType() throws InvalidInterfaceException {
-        WSDLInterface contract = wsdlFactory.createWSDLInterface(portType, definition, resolver);
-        Assert.assertEquals(contract.getName().getLocalPart(), "StockQuotePortType");
-        Assert.assertTrue(contract.isConversational());
-        
-        boolean foundIntent = false;
-        
-        for(Intent intent : contract.getRequiredIntents()) {
-            if(INTENT.equals(intent.getName())) {
-                foundIntent = true;
-            }
-        }
-        
-        Assert.assertTrue(foundIntent);
-        
-        for(Operation operation : contract.getOperations()) {
-            if(operation.getName().equals("cancel")) {
-                Assert.assertEquals(operation.getConversationSequence(), ConversationSequence.CONVERSATION_END);
-            }
-        }
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
deleted file mode 100644
index ff18c65c69..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.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.interfacedef.wsdl.introspect;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.wsdl.AbstractWSDLTestCase;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.impl.WSDLOperationIntrospectorImpl;
-
-/**
- * Test case for WSDLOperation.
- *
- * @version $Rev$ $Date$
- */
-public class WrapperStyleOperationTestCase extends AbstractWSDLTestCase {
-    private static final QName PORTTYPE_NAME = new QName("http://example.com/stockquote.wsdl", "StockQuotePortType");
-
-    public final void testWrappedOperation() throws Exception {
-        URL url = getClass().getResource("../xml/stockquote.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-        Operation operation = portType.getOperation("getLastTradePrice", null, null);
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-        Assert.assertTrue(op.isWrapperStyle());
-        Assert.assertEquals(1, op.getWrapper().getInputChildElements().size());
-        Assert.assertEquals(1, op.getWrapper().getOutputChildElements().size());
-    }
-
-    public final void testUnwrappedOperation() throws Exception {
-        URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("unwrapped-stockquote.wsdl"), url);
-        resolver.addModel(definition);
-        definition = resolver.resolveModel(WSDLDefinition.class, definition);
-        PortType portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
-        Operation operation = portType.getOperation("getLastTradePrice1", null, null);
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-        Assert.assertFalse(op.isWrapperStyle());
-        operation = portType.getOperation("getLastTradePrice2", null, null);
-        op = new WSDLOperationIntrospectorImpl(xsdFactory, operation, definition, "org.w3c.dom.Node", resolver);
-        Assert.assertFalse(op.isWrapperStyle());
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
deleted file mode 100644
index f23b0d2b59..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.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.interfacedef.wsdl.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.AssemblyFactory;
-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.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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @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);
-        
-        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);
-    }
-
-    public void testReadComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ComponentType componentType = (ComponentType)staxProcessor.read(reader);
-        assertNotNull(componentType);
-    }
-
-    public void testReadConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
-        assertNotNull(constrainingType);
-    }
-
-    public void testReadComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        Composite composite = (Composite)staxProcessor.read(reader);
-        assertNotNull(composite);
-
-        compositeBuilder.build(composite);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
deleted file mode 100644
index cd98bdace5..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.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.interfacedef.wsdl.xml;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Import;
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.wsdl.AbstractWSDLTestCase;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WSDLDocumentProcessorTestCase extends AbstractWSDLTestCase {
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Test
-    public void testWSDL() throws Exception {
-       
-        URL url = getClass().getResource("/wsdl/helloworld-service.wsdl");
-        WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-service.wsdl"), url);
-        
-        Assert.assertNull(definition.getDefinition());
-        Assert.assertEquals("http://helloworld", definition.getNamespace());
-        URL url1 = getClass().getResource("/wsdl/helloworld-interface.wsdl");
-        WSDLDefinition definition1 = (WSDLDefinition)documentProcessor.read(null, URI.create("wsdl/helloworld-interface.wsdl"), url1);
-        Assert.assertNull(definition1.getDefinition());
-        Assert.assertEquals("http://helloworld", definition1.getNamespace());
-
-        resolver.addModel(definition);
-        resolver.addModel(definition1);
-        resolver.resolveModel(WSDLDefinition.class, definition);
-        resolver.resolveModel(WSDLDefinition.class, definition1);
-        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, definition);
-        List imports = (List)definition.getDefinition().getImports().get("http://helloworld");
-        Assert.assertNotNull(imports);
-        Assert.assertNotNull(((Import)imports.get(0)).getDefinition());
-        Assert.assertNotNull(resolved.getDefinition().getPortType(new QName("http://helloworld", "HelloWorld")));
-        Assert.assertNotNull(resolved.getDefinition().getService(new QName("http://helloworld", "HelloWorldService")));
-        
-        assertNotNull(resolved.getXmlSchemaType(new QName("http://greeting", "Name")));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
deleted file mode 100644
index c27a1dbd70..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.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.interfacedef.wsdl.xml;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-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.interfacedef.wsdl.WSDLDefinition;
-
-/**
- * Test reading WSDL interfaces.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLTestCase extends TestCase {
-
-    private ExtensibleURLArtifactProcessor documentProcessor;
-    private WSDLModelResolver wsdlResolver;
-
-    @Override
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        wsdlResolver = new WSDLModelResolver(null, modelFactories);
-    }
-
-    public void testReadWSDLDocument() throws Exception {
-        URL url = getClass().getResource("example.wsdl");
-        WSDLDefinition definition = documentProcessor.read(null, new URI("example.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(definition);
-        assertNull(definition.getDefinition());
-        assertEquals(definition.getNamespace(), "http://www.example.org");
-    }
-
-    public void testReadWSDLImports() throws Exception {
-        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");
-        QName aPortType = new QName("http://helloworld", "HelloWorld");
-
-        URL url = getClass().getResource("test1.wsdl");
-        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test1Defn);
-        wsdlResolver.addModel(test1Defn);
-        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);
-        //binding is a part of test1.wsdl
-        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));
-        //porttype is part of test2.wsdl
-        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));
-    }
-
-    public void testReadSameNamespaceWSDLDocument() throws Exception {
-        QName aBinding = new QName("http://helloworld", "HelloWorldSoapBinding");
-        QName aPortType = new QName("http://helloworld", "HelloWorld");
-
-        URL url = getClass().getResource("test2.wsdl");
-        WSDLDefinition test2Defn = documentProcessor.read(null, new URI("test2.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test2Defn);
-        wsdlResolver.addModel(test2Defn);
-        test2Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test2Defn);
-
-        //bindings are a part of test1.wsdl so should not be found
-        assertNull(test2Defn.getDefinition().getBinding(aBinding));
-        assertNotNull(test2Defn.getDefinition().getPortType(aPortType));
-
-        url = getClass().getResource("test1.wsdl");
-        WSDLDefinition test1Defn = documentProcessor.read(null, new URI("test1.wsdl"), url, WSDLDefinition.class);
-        assertNotNull(test1Defn);
-        wsdlResolver.addModel(test1Defn);
-
-        test1Defn = wsdlResolver.resolveModel(WSDLDefinition.class, test1Defn);
-
-        assertNotNull(test1Defn.getDefinition().getPortType(aPortType));
-        assertNotNull(test1Defn.getDefinition().getBinding(aBinding));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
deleted file mode 100644
index 6448291f41..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.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.interfacedef.wsdl.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.ComponentType;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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 testReadWriteComponentType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
-        ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(componentType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    public void testReadWriteConstrainingType() throws Exception {
-        InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
-        ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(constrainingType);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(constrainingType, outputFactory.createXMLStreamWriter(bos));
-    }
-
-    public void testReadWriteComposite() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Calculator.composite");
-        Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
-        assertNotNull(composite);
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
deleted file mode 100644
index eb276a1908..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.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.interfacedef.wsdl.xml;
-
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLDocumentHelperTestCase {
-    private URL wsdl;
-    private URL xsd;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        wsdl = getClass().getResource("/wsdl/helloworld-interface.wsdl");
-    }
-
-    @Test
-    public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(wsdl, XMLDocumentHelper.WSDL11, true, "targetNamespace");
-        Assert.assertEquals("http://helloworld", tns);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
deleted file mode 100644
index 875fdf35d2..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/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://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)"
-        	wsdli:wsdlLocation="http://tempuri.org"/>
-    </service>
-
-    <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/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
deleted file mode 100644
index 3eb81b61bd..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ /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.
--->
-<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:calc="http://calc"
-    targetNamespace="http://calc"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-	name="CalculatorComponent">
-
-  <service name="CalculatorService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"
-        	wsdli:wsdlLocation="http://tempuri.org"/>
-  </service>
-
-  <reference name="divideService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Divide)"/>
-  </reference>  
-
-</constrainingType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
deleted file mode 100644
index aea7046a3d..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.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"
-	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
-
-  <service name="CalculatorService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"
-        	wsdli:wsdlLocation="http://tempuri.org"/>
-  </service>
-
-  <reference name="divideService">
-        <interface.wsdl interface="http://sample/calculator#wsdl.interface(Divide)"/>
-  </reference>  
-
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
deleted file mode 100644
index 5e8e5dad0d..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ /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.    
--->
-<wsdl:definitions targetNamespace="http://www.example.org"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  name="example">
-
-    <wsdl:portType name="HelloWorld">
-    </wsdl:portType>
-</wsdl:definitions>
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
deleted file mode 100644
index ad81fc7867..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ /dev/null
@@ -1,58 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice1">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
deleted file mode 100644
index 241ec15d36..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/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/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
deleted file mode 100644
index 39cd5547d9..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ /dev/null
@@ -1,58 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
deleted file mode 100644
index 8e26f7b4b5..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ /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.    
--->
-<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="test2.wsdl" 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/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
deleted file mode 100644
index c2210f4a94..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ /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.    
--->
-<schema targetNamespace="http://www.example.com/Customer" xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ipo="http://www.example.com/IPO" xmlns:tns="http://www.example.com/Customer">
-    <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-    <complexType name="Customer">
-        <sequence>
-            <element name="customerID" type="string"></element>
-            <element name="name" type="string"></element>
-            <element name="order" type="ipo:PurchaseOrderType" />
-        </sequence>
-    </complexType>
-    <element name="customer" type="tns:Customer"></element>
-
-</schema>
-
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
deleted file mode 100644
index 529b395fd5..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.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 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">
-
-            <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd" />
-
-            <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:definitions>
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
deleted file mode 100644
index 666a7e4069..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ /dev/null
@@ -1,76 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" xmlns:xsd1="http://example.com/stockquote.xsd"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput1">
-        <part name="body" element="xsd1:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput1">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-
-    <message name="GetLastTradePriceInput2">
-        <part name="body" element="xsd1:getLastTradePrice" />
-        <part name="other" type="xsd:string"/>
-    </message>
-
-    <message name="GetLastTradePriceOutput2">
-        <part name="body" element="xsd1:getLastTradePriceResponse" />
-    </message>
-    
-    <portType name="StockQuotePortType">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice1">
-            <input message="tns:GetLastTradePriceInput1" />
-            <output message="tns:GetLastTradePriceOutput1" />
-        </operation>
-        <operation name="getLastTradePrice2">
-            <input message="tns:GetLastTradePriceInput2" />
-            <output message="tns:GetLastTradePriceOutput2" />
-        </operation>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
deleted file mode 100644
index 7cdf801692..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
+++ /dev/null
@@ -1,62 +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/stockquote.wsdl"
-    xmlns:tns="http://example.com/stockquote.wsdl" 
-    xmlns:xsd="http://example.com/stockquote.xsd"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://example.com/stockquote.xsd" xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="getLastTradePrice">
-                <complexType>
-                    <sequence>
-                        <element name="tickerSymbol" type="string" />
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="getLastTradePriceResponse">
-                <complexType>
-                    <sequence>
-                        <element name="price" type="float" />
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="GetLastTradePriceInput">
-        <part name="body" element="xsd:getLastTradePrice" />
-    </message>
-
-    <message name="GetLastTradePriceOutput">
-        <part name="body" element="xsd:getLastTradePriceResponse" />
-    </message>
-
-    <portType name="StockQuotePortType" sca:requires="sca:conversational tns:PolicyIntent">
-        <operation name="getLastTradePrice">
-            <input message="tns:GetLastTradePriceInput" />
-            <output message="tns:GetLastTradePriceOutput" />
-        </operation>
-        <operation name="cancel" sca:endsConversation="true"/>
-    </portType>
-
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
deleted file mode 100644
index b0b6644e7f..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/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/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
deleted file mode 100644
index 0a7979e308..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/wsdl/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/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
deleted file mode 100644
index 635ca25bfc..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
+++ /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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-    <include schemaLocation="name.xsd" />
-    <complexType name="Greeting">
-        <sequence>
-            <element name="message" type="string" />
-            <element name="name" type="Name" />
-        </sequence>
-    </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
deleted file mode 100644
index bb0c9bc7b7..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
+++ /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.
--->
-<schema targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-    <import namespace="http://greeting" schemaLocation="greeting.xsd" />
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
deleted file mode 100644
index 300de931ec..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
+++ /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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-
-    <complexType name="Name">
-        <sequence>
-            <element name="firstName" type="string" />
-            <element name="lastName" type="string" />
-        </sequence>
-    </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/LICENSE b/tags/java/sca/1.3/modules/interface-wsdl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/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/tags/java/sca/1.3/modules/interface-wsdl/NOTICE b/tags/java/sca/1.3/modules/interface-wsdl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/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/tags/java/sca/1.3/modules/interface-wsdl/pom.xml b/tags/java/sca/1.3/modules/interface-wsdl/pom.xml
deleted file mode 100644
index 8c7b41755b..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface-wsdl</artifactId>
-    <name>Apache Tuscany SCA WSDL Interface Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-xsd</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-         <dependency>
-             <groupId>wsdl4j</groupId>
-             <artifactId>wsdl4j</artifactId>
-             <version>1.6.2</version>
-         </dependency>
-    </dependencies>
-
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-    <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.interface.wsdl</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.wsdl*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
deleted file mode 100644
index 2a5dd07d08..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.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.interfacedef.wsdl;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.wsdl.impl.WSDLFactoryImpl;
-
-/**
- * A factory for the WSDL model.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultWSDLFactory extends WSDLFactoryImpl implements WSDLFactory {
-
-    public DefaultWSDLFactory(ModelFactoryExtensionPoint modelFactories) {
-        super(modelFactories);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
deleted file mode 100644
index 039e75f437..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLElement;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-
-/**
- * Represents a WSDL definition.
- * WSDLDefinition
- *
- * @version $Rev$ $Date$
- */
-public interface WSDLDefinition extends Base {
-
-    /**
-     * Returns the WSDL definition model, if there are more than one WSDL definition under the 
-     * same namespace, the definition will be a facade which imports all the physical WSDL 
-     * definitions
-     * 
-     * @return the WSDL definition model
-     */
-    Definition getDefinition();
-
-    /**
-     * Sets the WSDL definition model
-     * @param definition the WSDL definition model
-     */
-    void setDefinition(Definition definition);
-
-    /**
-     * Returns the namespace of this WSDL definition.
-     * @return the namespace of this WSDL definition
-     */
-    String getNamespace();
-
-    /**
-     * Sets the namespace of this WSDL definition.
-     * @param namespace the namespace of this WSDL definition
-     */
-    void setNamespace(String namespace);
-
-    /**
-     * Get a list of inline XML schema definitions
-     * @return A list of inline XML schema definitions
-     */
-    List<XSDefinition> getXmlSchemas();
-
-    /**
-     * Get the location of the WSDL file
-     * @return The location of the WSDL file
-     */
-    URI getLocation();
-
-    /**
-     * Set the location of the WSDL file
-     * @param url
-     */
-    void setLocation(URI url);
-
-    /**
-     * Get the contribution artifact URI of the WSDL document
-     * @return The URI of the WSDL document
-     */
-    URI getURI();
-
-    /**
-     * Set the contribution artifact URI of the WSDL document
-     * @param uri
-     */
-    void setURI(URI uri);
-
-    /**
-     * Get the WSDL definitions imported by this definition
-     * @return A list of imported WSDL definitions
-     */
-    List<WSDLDefinition> getImportedDefinitions();
-
-    /**
-     * Get an XSD element by QName
-     * @param name
-     * @return
-     */
-    XmlSchemaElement getXmlSchemaElement(QName name);
-
-    /**
-     * Get an XSD type by QName
-     * @param name
-     * @return
-     */
-    XmlSchemaType getXmlSchemaType(QName name);
-    
-    /**
-     * Get the WSDL object by type and name
-     * @param <T>
-     * @param type javax.wsdl.Service/PortType/Binding/Message.class
-     * @param name The QName of the object
-     * @return WSDLObject
-     */
-    <T extends WSDLElement> WSDLObject<T> getWSDLObject(Class<T> type, QName name);
-
-    /**
-     * Get the generated binding for a WSDLDefinition
-     * @return the WSDL binding
-     */
-    Binding getBinding();
-
-    /**
-     * Set the generated binding for a WSDLDefinition
-     * @param binding the WSDL binding
-     */
-    void setBinding(Binding binding);
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
deleted file mode 100644
index 95985dcc28..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.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.interfacedef.wsdl;
-
-import javax.wsdl.PortType;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-
-/**
- * Factory for the WSDL model.
- * 
- * @version $Rev$ $Date$
- */
-public interface WSDLFactory {
-
-    /**
-     * Creates a new WSDL interface.
-     * 
-     * @return a new WSDL interface
-     */
-    WSDLInterface createWSDLInterface();
-    
-    /**
-     * Creates a new WSDL interface from a WSDL portType.
-     *
-     * @param portType the portType to inspect
-     * @return a WSDLInterface corresponding to the WSDL portType
-     */
-    WSDLInterface createWSDLInterface(PortType portType, WSDLDefinition wsdlDefinition, ModelResolver resolver) throws InvalidInterfaceException;
-
-    /**
-     * Creates the contents of a WSDL interface from a WSDL portType.
-     *
-     * @param portType the portType to inspect
-     * @return a WSDLInterface corresponding to the WSDL portType
-     */
-    void createWSDLInterface(WSDLInterface wsdlInterface, PortType portType, WSDLDefinition wsdlDefinition, ModelResolver resolver) throws InvalidInterfaceException;
-
-    /**
-     * Creates a new WSDL definition.
-     * 
-     * @return a new WSDL definition
-     */
-    WSDLDefinition createWSDLDefinition();
-    
-    /**
-     * Creates a new WSDL interface contract.
-     * 
-     * @return
-     */
-    WSDLInterfaceContract createWSDLInterfaceContract();
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
deleted file mode 100644
index c0da060af2..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.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.interfacedef.wsdl;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.interfacedef.Interface;
-
-
-/**
- * Represents a WSDL interface.
- *
- * @version $Rev$ $Date$
- */
-public interface WSDLInterface extends Interface, Base {
-
-    /**
-     * Returns the name of the WSDL interface.
-     *
-     * @return the name of the WSDL interface
-     */
-    QName getName();
-
-    /**
-     * Sets the name of the WSDL interface.
-     *
-     * @param interfaceName the name of the WSDL interface
-     */
-    void setName(QName interfaceName);
-
-    /**
-     * Returns the WSDL interface portType.
-     *
-     * @return the WSDL interface portType
-     */
-    PortType getPortType();
-
-    /**
-     * Sets the WSDL interface portType
-     *
-     * @param portType the WSDL interface portType
-     */
-    void setPortType(PortType portType);
-
-    WSDLDefinition getWsdlDefinition();
-
-    void setWsdlDefinition(WSDLDefinition wsdlDefinition);
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
deleted file mode 100644
index 59db17116b..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.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.interfacedef.wsdl;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-
-/**
- * Represents a WSDL interface contract.
- * 
- * @version $Rev$ $Date$
- */
-public interface WSDLInterfaceContract extends InterfaceContract {
-
-    /**
-     * Sets the WSDL location. 
-     * @param location the WSDL location
-     */
-    void setLocation(String location);
-
-    /**
-     * Returns the WSDL location
-     * @return the WSDL location
-     */
-    String getLocation();
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
deleted file mode 100644
index 9253f58702..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.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.interfacedef.wsdl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLElement;
-
-/**
- * Model for objects in a WSDL definition
- * @version $Rev$ $Date$
- */
-public interface WSDLObject<T extends WSDLElement> {
-    /**
-     * Get the owning definition where the element is declared
-     * @return The owning definition
-     */
-    Definition getDefinition();
-
-    /**
-     * Set the owning definition
-     * @param definition
-     */
-    void setDefinition(Definition definition);
-
-    /**
-     * Get the WSDL element such as Service, PortType, Binding or Message
-     * @return The WSDL element
-     */
-    T getElement();
-
-    /**
-     * Set the WSDL element
-     * @param element
-     */
-    void setElement(T element);
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
deleted file mode 100644
index d73cccb714..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.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.interfacedef.wsdl;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * WSDL 1.1 Operation
- * @version $Rev$ $Date$
- */
-public interface WSDLOperation extends Operation {
-    /**
-     * Get the underlying WSDL operation
-     * @return
-     */
-    javax.wsdl.Operation getWsdlOperation();
-    
-    /**
-     * Set the underlying WSDL operation
-     * @param operation
-     */
-    void setWsdlOperation(javax.wsdl.Operation operation);
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
deleted file mode 100644
index 1e7b4faa32..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.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.interfacedef.wsdl.impl;
-
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-
-/**
- * An exception to indicate the WSDL definition is invalid
- *
- * @version $Rev$ $Date$
- */
-public class InvalidWSDLException extends InvalidInterfaceException {
-    private static final long serialVersionUID = 3742887584293256519L;
-
-    public InvalidWSDLException(String message) {
-        super(message);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
deleted file mode 100644
index 16e9cf43f3..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl.impl;
-
-import static org.apache.tuscany.sca.xsd.impl.XSDefinitionImpl.getXmlSchemaObject;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Message;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLElement;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-
-/**
- * Represents a WSDL definition.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLDefinitionImpl implements WSDLDefinition {
-
-    private Definition definition;
-    private String namespace;
-    private URI location;
-    private URI uri;
-    private List<WSDLDefinition> imported = new ArrayList<WSDLDefinition>();
-    private List<XSDefinition> schemas = new ArrayList<XSDefinition>();
-    private boolean unresolved;
-    private Binding binding;
-
-    protected WSDLDefinitionImpl() {
-    }
-
-    public Definition getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(Definition definition) {
-        this.definition = definition;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    public String getNamespace() {
-        if (isUnresolved()) {
-            return namespace;
-        } else if (definition != null) {
-            return definition.getTargetNamespace();
-        } else {
-            return namespace;
-        }
-    }
-
-    public void setNamespace(String namespace) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        } else {
-            this.namespace = namespace;
-        }
-    }
-
-    /*
-    @Override
-    public int hashCode() {
-        return String.valueOf(getNamespace()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof WSDLDefinition) {
-            WSDLDefinition def = (WSDLDefinition)obj;
-            if (getNamespace() != null) {
-                return getNamespace().equals(def.getNamespace());
-            } else {
-                return def.getNamespace() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-    */
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getXmlSchemas()
-     */
-    public List<XSDefinition> getXmlSchemas() {
-        return schemas;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getLocation()
-     */
-    public URI getLocation() {
-        return location;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#setLocation(java.net.URI)
-     */
-    public void setLocation(URI url) {
-        this.location = url;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getURI()
-     */
-    public URI getURI() {
-        return uri;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#setURI(java.net.URI)
-     */
-    public void setURI(URI uri) {
-        this.uri = uri;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getImportedDefinitions()
-     */
-    public List<WSDLDefinition> getImportedDefinitions() {
-        return imported;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((location == null) ? 0 : location.hashCode());
-        result = prime * result + ((namespace == null) ? 0 : namespace.hashCode());
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (!(obj instanceof WSDLDefinitionImpl))
-            return false;
-        final WSDLDefinitionImpl other = (WSDLDefinitionImpl)obj;
-        if (location == null) {
-            if (other.location != null)
-                return false;
-        } else if (!location.equals(other.location))
-            return false;
-        if (namespace == null) {
-            if (other.namespace != null)
-                return false;
-        } else if (!namespace.equals(other.namespace))
-            return false;
-        return true;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getXmlSchemaElement(javax.xml.namespace.QName)
-     */
-    public XmlSchemaElement getXmlSchemaElement(QName name) {
-        XmlSchemaCollection schemaCollection = null;
-        for (XSDefinition xsd : schemas) {
-            if (schemaCollection == null && xsd.getSchemaCollection() != null) {
-                schemaCollection = xsd.getSchemaCollection();
-            }
-            XmlSchema schema = xsd.getSchema();
-            XmlSchemaElement element = getXmlSchemaObject(schema, name, XmlSchemaElement.class);
-            if (element != null) {
-                return element;
-            }
-        }
-        if (schemaCollection != null) {
-            return schemaCollection.getElementByQName(name);
-        }
-        return null;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition#getXmlSchemaType(javax.xml.namespace.QName)
-     */
-    public XmlSchemaType getXmlSchemaType(QName name) {
-        XmlSchemaCollection schemaCollection = null;
-        for (XSDefinition xsd : schemas) {
-            if (xsd.getSchemaCollection() != null) {
-                schemaCollection = xsd.getSchemaCollection();
-            }
-            XmlSchema schema = xsd.getSchema();
-            XmlSchemaType type = getXmlSchemaObject(schema, name, XmlSchemaType.class);
-            if (type != null) {
-                return type;
-            }
-        }
-        if (schemaCollection != null) {
-            return schemaCollection.getTypeByQName(name);
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T extends WSDLElement> WSDLObject<T> getWSDLObject(Definition definition, Class<T> type, QName name) {
-        if (definition == null) {
-            return null;
-        }
-        Map<QName, WSDLElement> map = null;
-        if (type == PortType.class) {
-            map = definition.getPortTypes();
-        } else if (type == Service.class) {
-            map = definition.getServices();
-        } else if (type == Binding.class) {
-            map = definition.getBindings();
-        } else if (type == Message.class) {
-            map = definition.getMessages();
-        } else {
-            throw new IllegalArgumentException("Invalid type: " + type.getName());
-        }
-        if (map.containsKey(name)) {
-            return (WSDLObject<T>)new WSDLObjectImpl(definition, map.get(name));
-        } else {
-            for (Object imports : definition.getImports().values()) {
-                List<Import> importList = (List<Import>)imports;
-                for (Import i : importList) {
-                    definition = i.getDefinition();
-                    WSDLObject<T> element = getWSDLObject(definition, type, name);
-                    if (element != null) {
-                        return element;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public <T extends WSDLElement> WSDLObject<T> getWSDLObject(Class<T> type, QName name) {
-        return getWSDLObject(definition, type, name);
-    }
-
-    public Binding getBinding() {
-        return binding;
-    }
-
-    public void setBinding(Binding binding) {
-        this.binding = binding;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
deleted file mode 100644
index 1f2263e1c9..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.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.interfacedef.wsdl.impl;
-
-import javax.wsdl.PortType;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-
-/**
- * A factory for the WSDL model.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class WSDLFactoryImpl implements WSDLFactory {
-    
-    private WSDLInterfaceIntrospectorImpl introspector;
-    
-    public WSDLFactoryImpl(ModelFactoryExtensionPoint modelFactories) {
-        introspector = new WSDLInterfaceIntrospectorImpl(modelFactories);
-    }
-
-    public WSDLInterface createWSDLInterface() {
-        return new WSDLInterfaceImpl();
-    }
-    
-    public WSDLInterface createWSDLInterface(PortType portType,
-                                             WSDLDefinition wsdlDefinition,
-                                             ModelResolver resolver) throws InvalidInterfaceException {
-        WSDLInterface wsdlInterface = createWSDLInterface();
-        introspector.introspectPortType(wsdlInterface, portType, wsdlDefinition, resolver);
-        return wsdlInterface;
-    }
-    
-    public void createWSDLInterface(WSDLInterface wsdlInterface,
-                                    PortType portType,
-                                    WSDLDefinition wsdlDefinition,
-                                    ModelResolver resolver) throws InvalidInterfaceException {
-        introspector.introspectPortType(wsdlInterface, portType, wsdlDefinition, resolver);
-    }
-    
-    public WSDLDefinition createWSDLDefinition() {
-        return new WSDLDefinitionImpl();
-    }
-    
-    public WSDLInterfaceContract createWSDLInterfaceContract() {
-        return new WSDLInterfaceContractImpl();
-    }
-
-    public WSDLInterfaceIntrospectorImpl getWSDLInterfaceIntrospector() {
-        return introspector;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
deleted file mode 100644
index e10bc0d178..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.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.interfacedef.wsdl.impl;
-
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractImpl;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-
-/**
- * Represents a WSDL interface contract.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceContractImpl extends InterfaceContractImpl implements WSDLInterfaceContract {
-    private String location;
-    
-    protected WSDLInterfaceContractImpl() {
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-    
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    @Override
-    public WSDLInterfaceContractImpl clone() throws CloneNotSupportedException {
-        return (WSDLInterfaceContractImpl) super.clone();
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
deleted file mode 100644
index 3719bbd79a..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.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.interfacedef.wsdl.impl;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-
-/**
- * Represents a WSDL interface.
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceImpl extends InterfaceImpl implements WSDLInterface {
-
-    private QName name;
-    private PortType portType;
-    private WSDLDefinition wsdlDefinition;
-
-    protected WSDLInterfaceImpl() {
-        setRemotable(true);
-    }
-
-    public QName getName() {
-        if (isUnresolved()) {
-            return name;
-        } else {
-            return portType.getQName();
-        }
-    }
-
-    public void setName(QName interfaceName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.name = interfaceName;
-    }
-    
-    public PortType getPortType() {
-        return portType;
-    }
-
-    public void setPortType(PortType portType) {
-        this.portType = portType;
-    }
-
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof WSDLInterface) {
-            if (getName() != null) {
-                return getName().equals(((WSDLInterface)obj).getName());
-            } else {
-                return ((WSDLInterface)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    public WSDLDefinition getWsdlDefinition() {
-        return wsdlDefinition;
-    }
-
-    public void setWsdlDefinition(WSDLDefinition wsdlDefinition) {
-        this.wsdlDefinition = wsdlDefinition;
-    }
-
-    @Override
-    public WSDLInterfaceImpl clone() throws CloneNotSupportedException {
-        return (WSDLInterfaceImpl) super.clone();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
deleted file mode 100644
index 5b0d95ac46..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.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.interfacedef.wsdl.impl;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-/**
- * Introspector for creating WSDLInterface definitions from WSDL PortTypes.
- *
- * @version $Rev$ $Date$
- */
-public class WSDLInterfaceIntrospectorImpl {
-    private static final QName POLICY_REQUIRES = new QName("http://www.osoa.org/xmlns/sca/1.0", "requires");
-    private static final QName POLICY_CONVERSATIONAL = new QName("http://www.osoa.org/xmlns/sca/1.0", "conversational");
-    public static final QName POLICY_END_CONVERSATION = new QName("http://www.osoa.org/xmlns/sca/1.0", "endsConversation");
-    
-    private XSDFactory xsdFactory;
-    private PolicyFactory policyFactory;
-    
-    public WSDLInterfaceIntrospectorImpl(ModelFactoryExtensionPoint modelFactories) {
-        this.xsdFactory = modelFactories.getFactory(XSDFactory.class);;
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);;
-    }
-
-    // FIXME: Do we want to deal with document-literal wrapped style based on the JAX-WS Specification?
-    private List<Operation> introspectOperations(PortType portType, WSDLDefinition wsdlDefinition, ModelResolver resolver) throws InvalidWSDLException {
-        List<Operation> operations = new ArrayList<Operation>();
-        for (Object o : portType.getOperations()) {
-            javax.wsdl.Operation wsdlOp = (javax.wsdl.Operation)o;
-            Operation operation = getOperation(wsdlOp, wsdlDefinition, resolver, xsdFactory);
-            if(isEndConversation(wsdlOp)) {
-                operation.setConversationSequence(ConversationSequence.CONVERSATION_END);
-            }
-            operations.add(operation);
-        }
-        return operations;
-    }
-
-    public void introspectPortType(WSDLInterface wsdlInterface, PortType portType, WSDLDefinition wsdlDefinition, ModelResolver resolver) throws InvalidWSDLException {
-        processIntents(wsdlInterface, portType);
-        wsdlInterface.setPortType(portType);
-        wsdlInterface.getOperations().addAll(introspectOperations(portType, wsdlDefinition, resolver));
-        wsdlInterface.setConversational(isConversational(portType));
-    }
-
-    public static Operation getOperation(javax.wsdl.Operation wsdlOp,
-                                         WSDLDefinition wsdlDefinition,
-                                         ModelResolver resolver,
-                                         XSDFactory xsdFactory) throws InvalidWSDLException {
-        WSDLOperationIntrospectorImpl op = new WSDLOperationIntrospectorImpl(xsdFactory, wsdlOp, wsdlDefinition, null, resolver);
-        return op.getOperation();
-    }
-    
-    private void processIntents(WSDLInterface wsdlInterface, PortType portType) {
-        Object o =  portType.getExtensionAttribute(POLICY_REQUIRES);
-        if(o != null && o instanceof Vector) {
-            Vector<QName> policyAttributes = (Vector<QName>) o;
-            
-            Enumeration<QName> policyItents = policyAttributes.elements();
-            while(policyItents.hasMoreElements()) {
-                QName intentName = policyItents.nextElement();
-                
-                //ignores conversational, as it will have it's own
-                //attribute in the wsdl interface model
-                if(! intentName.equals(POLICY_CONVERSATIONAL)) {
-                    //process the intent
-                    System.out.println(">>> Intent : " + intentName);
-                    
-                    // Add each intent to the list
-                    Intent intent = policyFactory.createIntent();
-                    intent.setName(intentName);
-                    
-                    wsdlInterface.getRequiredIntents().add(intent);
-                }
-            }
-            
-        }
-    }
-    
-    private boolean isConversational(PortType portType) {
-        boolean conversational = false;
-        
-        Object o =  portType.getExtensionAttribute(POLICY_REQUIRES);
-        if(o != null && o instanceof Vector) {
-            Vector<QName> policyAttributes = (Vector<QName>) o;
-            
-            if(policyAttributes.contains(POLICY_CONVERSATIONAL)) {
-                return true;
-            }
-            
-        }
-
-        return conversational;
-    }
-
-    private boolean isEndConversation(javax.wsdl.Operation operation) {
-        boolean endConversation = false;
-        
-        Object o =  operation.getExtensionAttribute(POLICY_END_CONVERSATION);
-        if(o != null && o instanceof String) {
-            endConversation = Boolean.valueOf((String)o);            
-        }
-
-        return endConversation;
-        
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
deleted file mode 100644
index b41d79c3ba..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.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.interfacedef.wsdl.impl;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLElement;
-
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WSDLObjectImpl<T extends WSDLElement> implements WSDLObject<T> {
-    private Definition definition;
-    private T element;
-
-    public WSDLObjectImpl() {
-        super();
-    }
-
-    public WSDLObjectImpl(Definition definition, T element) {
-        super();
-        this.definition = definition;
-        this.element = element;
-    }
-
-    public Definition getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(Definition definition) {
-        this.definition = definition;
-    }
-
-    public T getElement() {
-        return element;
-    }
-
-    public void setElement(T element) {
-        this.element = element;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
deleted file mode 100644
index 1758b41fda..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.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.interfacedef.wsdl.impl;
-
-import javax.wsdl.Operation;
-
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WSDLOperationImpl extends OperationImpl implements WSDLOperation {
-    private Operation operation;
-
-    public WSDLOperationImpl() {
-        super();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation#getWsdlOperation()
-     */
-    public Operation getWsdlOperation() {
-        return operation;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation#setWsdlOperation(javax.wsdl.Operation)
-     */
-    public void setWsdlOperation(Operation operation) {
-        this.operation = operation;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((operation == null) ? 0 : operation.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (!super.equals(obj))
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final WSDLOperationImpl other = (WSDLOperationImpl)obj;
-        if (operation == null) {
-            if (other.operation != null)
-                return false;
-        } else if (!operation.equals(other.operation))
-            return false;
-        return true;
-    }
-
-    public String toString() {
-        return operation == null ? null : operation.toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
deleted file mode 100644
index ab6467bfd7..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.wsdl.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.wsdl.Fault;
-import javax.wsdl.Input;
-import javax.wsdl.Message;
-import javax.wsdl.Output;
-import javax.wsdl.Part;
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
-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.FaultException;
-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.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaType;
-
-/**
- * Metadata for a WSDL operation
- * 
- * @version $Rev$ $Date$
- */
-public class WSDLOperationIntrospectorImpl {
-    private static final Logger logger = Logger.getLogger(WSDLOperationIntrospectorImpl.class.getName());
-    private static final QName ANY = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "any");
-
-    private XSDFactory xsdFactory;
-    private ModelResolver resolver;
-    private WSDLDefinition wsdlDefinition;
-    private javax.wsdl.Operation operation;
-    private WSDLOperation operationModel;
-    private DataType<List<DataType>> inputType;
-    private DataType outputType;
-    private List<DataType> faultTypes;
-    private String dataBinding;
-
-    /**
-     * @param wsdlFactory The WSDLFactory to use
-     * @param operation The WSDL4J operation
-     * @param wsdlDefinition The WSDL Definition
-     * @param dataBinding The default databinding
-     * @param resolver The ModelResolver to use
-     */
-    public WSDLOperationIntrospectorImpl(XSDFactory xsdFactory,
-                                         javax.wsdl.Operation operation,
-                                         WSDLDefinition wsdlDefinition,
-                                         String dataBinding,
-                                         ModelResolver resolver) {
-        super();
-        this.xsdFactory = xsdFactory;
-        this.operation = operation;
-        this.wsdlDefinition = wsdlDefinition;
-        this.resolver = resolver;
-        this.dataBinding = dataBinding;
-        this.wrapper = new Wrapper();
-    }
-
-    private Wrapper wrapper;
-
-    private Boolean wrapperStyle;
-
-    /**
-     * Test if the operation qualifies wrapper style as defined by the JAX-WS
-     * 2.0 Specification
-     * 
-     * @return true if the operation qualifies wrapper style, otherwise false
-     */
-    public boolean isWrapperStyle() throws InvalidWSDLException {
-        if (wrapperStyle == null) {
-            wrapperStyle =
-                (operation.getInput() == null || operation.getInput().getMessage() == null
-                    || operation.getInput().getMessage().getParts().size() == 0 || wrapper.getInputChildElements() != null) && (operation
-                    .getOutput() == null || operation.getOutput().getMessage() == null
-                    || operation.getOutput().getMessage().getParts().size() == 0 || wrapper.getOutputChildElements() != null);
-        }
-        return wrapperStyle;
-    }
-
-    public Wrapper getWrapper() throws InvalidWSDLException {
-        if (!isWrapperStyle()) {
-            throw new IllegalStateException("The operation is not wrapper style.");
-        } else {
-            return wrapper;
-        }
-    }
-
-    /**
-     * @return
-     * @throws InvalidServiceContractException
-     */
-    public DataType<List<DataType>> getInputType() throws InvalidWSDLException {
-        if (inputType == null) {
-            Input input = operation.getInput();
-            Message message = (input == null) ? null : input.getMessage();
-            inputType = getMessageType(message);
-            inputType.setDataBinding("idl:input");
-        }
-        return inputType;
-    }
-
-    /**
-     * @return
-     * @throws NotSupportedWSDLException
-     */
-    @SuppressWarnings("unchecked")
-    public DataType<XMLType> getOutputType() throws InvalidWSDLException {
-        if (outputType == null) {
-            Output output = operation.getOutput();
-            Message outputMsg = (output == null) ? null : output.getMessage();
-
-            List outputParts = (outputMsg == null) ? null : outputMsg.getOrderedParts(null);
-            if (outputParts != null && outputParts.size() > 0) {
-                if (outputParts.size() > 1) {
-                    // We don't support output with multiple parts
-                    if (logger.isLoggable(Level.WARNING)) {
-                        logger.warning("Multi-part output is not supported, please use BARE parameter style.");
-                    }
-                    // throw new InvalidWSDLException("Multi-part output is not supported");
-                }
-                Part part = (Part)outputParts.get(0);
-                outputType = new WSDLPart(part, Object.class).getDataType();
-                // outputType.setMetadata(WSDLOperation.class.getName(), this);
-            }
-        }
-        return outputType;
-    }
-
-    /**
-     * @return
-     * @throws NotSupportedWSDLException
-     */
-    public List<DataType> getFaultTypes() throws InvalidWSDLException {
-        if (faultTypes == null) {
-            Collection faults = operation.getFaults().values();
-            faultTypes = new ArrayList<DataType>();
-            for (Object f : faults) {
-                Fault fault = (Fault)f;
-                Message faultMsg = fault.getMessage();
-                List faultParts = faultMsg.getOrderedParts(null);
-                if (faultParts.size() != 1) {
-                    throw new InvalidWSDLException("The fault message MUST have a single part");
-                }
-                Part part = (Part)faultParts.get(0);
-                WSDLPart wsdlPart = new WSDLPart(part, Object.class);
-                faultTypes.add(new DataTypeImpl<DataType>(FaultException.class, wsdlPart.getDataType()));
-            }
-        }
-        return faultTypes;
-    }
-
-    private DataType<List<DataType>> getMessageType(Message message) throws InvalidWSDLException {
-        List<DataType> partTypes = new ArrayList<DataType>();
-        if (message != null) {
-            Collection parts = message.getOrderedParts(null);
-            for (Object p : parts) {
-                WSDLPart part = new WSDLPart((Part)p, Object.class);
-                DataType<XMLType> partType = part.getDataType();
-                partTypes.add(partType);
-            }
-        }
-        return new DataTypeImpl<List<DataType>>(dataBinding, Object[].class, partTypes);
-    }
-
-    /**
-     * @return
-     * @throws NotSupportedWSDLException
-     */
-    public Operation getOperation() throws InvalidWSDLException {
-        if (operationModel == null) {
-            boolean oneway = (operation.getOutput() == null);
-            operationModel = new WSDLOperationImpl();
-            operationModel.setWsdlOperation(operation);
-            operationModel.setName(operation.getName());
-            operationModel.setFaultTypes(getFaultTypes());
-            operationModel.setNonBlocking(oneway);
-            operationModel.setConversationSequence(ConversationSequence.CONVERSATION_NONE);
-            operationModel.setInputType(getInputType());
-            operationModel.setOutputType(getOutputType());
-
-            operationModel.setWrapperStyle(isWrapperStyle());
-            if (isWrapperStyle()) {
-                WrapperInfo wrapperInfo = getWrapper().getWrapperInfo();
-                operationModel.setWrapper(wrapperInfo);
-            }
-        }
-        return operationModel;
-    }
-
-    private XmlSchemaElement getElement(QName elementName) {
-
-        XmlSchemaElement element = wsdlDefinition.getXmlSchemaElement(elementName);
-        if (element == null) {
-            XSDefinition definition = xsdFactory.createXSDefinition();
-            definition.setUnresolved(true);
-            definition.setNamespace(elementName.getNamespaceURI());
-            definition = resolver.resolveModel(XSDefinition.class, definition);
-            if (definition.getSchema() != null) {
-                element = definition.getSchema().getElementByName(elementName);
-            }
-        }
-        return element;
-    }
-
-    private XmlSchemaType getType(QName typeName) {
-        XmlSchemaType type = wsdlDefinition.getXmlSchemaType(typeName);
-        if (type == null) {
-            XSDefinition definition = xsdFactory.createXSDefinition();
-            definition.setUnresolved(true);
-            definition.setNamespace(typeName.getNamespaceURI());
-            definition = resolver.resolveModel(XSDefinition.class, definition);
-            if (definition.getSchema() != null) {
-                type = definition.getSchema().getTypeByName(typeName);
-            }
-        }
-        return type;
-    }
-
-    /**
-     * Metadata for a WSDL part
-     */
-    public class WSDLPart {
-        private Part part;
-
-        private XmlSchemaElement element;
-
-        private DataType dataType;
-
-        public WSDLPart(Part part, Class javaType) throws InvalidWSDLException {
-            this.part = part;
-            QName elementName = part.getElementName();
-            if (elementName != null) {
-                element = WSDLOperationIntrospectorImpl.this.getElement(elementName);
-                if (element == null) {
-                    throw new InvalidWSDLException("Element cannot be resolved: " + elementName.toString());
-                }
-            } else {
-                // Create an faked XSD element to host the metadata
-                element = new XmlSchemaElement();
-                element.setName(part.getName());
-                element.setQName(new QName(null, part.getName()));
-                QName typeName = part.getTypeName();
-                if (typeName != null) {
-                    XmlSchemaType type = WSDLOperationIntrospectorImpl.this.getType(typeName);
-                    if (type == null) {
-                        throw new InvalidWSDLException("Type cannot be resolved: " + typeName.toString());
-                    }
-                    element.setSchemaType(type);
-                    element.setSchemaTypeName(type.getQName());
-                }
-            }
-            XMLType xmlType = new XMLType(getElementInfo(element));
-            xmlType.setNillable(element.isNillable());
-            xmlType.setMany(element.getMaxOccurs() > 1);
-            dataType = new DataTypeImpl<XMLType>(dataBinding, javaType, xmlType);
-        }
-
-        /**
-         * @return the element
-         */
-        public XmlSchemaElement getElement() {
-            return element;
-        }
-
-        /**
-         * @return the part
-         */
-        public Part getPart() {
-            return part;
-        }
-
-        /**
-         * @return the dataType
-         */
-        public DataType<XMLType> getDataType() {
-            return dataType;
-        }
-    }
-
-    /**
-     * The "Wrapper Style" WSDL operation is defined by The Java API for
-     * XML-Based Web Services (JAX-WS) 2.0 specification, section 2.3.1.2
-     * Wrapper Style. <p/> A WSDL operation qualifies for wrapper style mapping
-     * only if the following criteria are met:
-     * <ul>
-     * <li>(i) The operation�s input and output messages (if present) each
-     * contain only a single part
-     * <li>(ii) The input message part refers to a global element declaration
-     * whose localname is equal to the operation name
-     * <li>(iii) The output message part refers to a global element declaration
-     * <li>(iv) The elements referred to by the input and output message parts
-     * (henceforth referred to as wrapper elements) are both complex types
-     * defined using the xsd:sequence compositor
-     * <li>(v) The wrapper elements only contain child elements, they must not
-     * contain other structures such as wildcards (element or attribute),
-     * xsd:choice, substitution groups (element references are not permitted) or
-     * attributes; furthermore, they must not be nillable.
-     * </ul>
-     */
-    public class Wrapper {
-        private XmlSchemaElement inputWrapperElement;
-
-        private XmlSchemaElement outputWrapperElement;
-
-        private List<XmlSchemaElement> inputElements;
-
-        private List<XmlSchemaElement> outputElements;
-
-        //        private DataType<List<DataType<XMLType>>> unwrappedInputType;
-        //
-        //        private DataType<XMLType> unwrappedOutputType;
-
-        private transient WrapperInfo wrapperInfo;
-
-        private List<XmlSchemaElement> getChildElements(XmlSchemaElement element) throws InvalidWSDLException {
-            if (element == null) {
-                return null;
-            }
-            if (element.isNillable()) {
-                // Wrapper element cannot be nillable
-                return null;
-            }
-            XmlSchemaType type = element.getSchemaType();
-            if (type == null) {
-                String qName = element.getQName().toString();
-                throw new InvalidWSDLException("The XML schema element does not have a type: " + qName);
-            }
-            if (!(type instanceof XmlSchemaComplexType)) {
-                // Has to be a complexType
-                return null;
-            }
-            XmlSchemaComplexType complexType = (XmlSchemaComplexType)type;
-            if (complexType.getAttributes().getCount() != 0 || complexType.getAnyAttribute() != null) {
-                // No attributes
-                return null;
-            }
-            XmlSchemaParticle particle = complexType.getParticle();
-            if (particle == null) {
-                // No particle
-                return Collections.emptyList();
-            }
-            if (!(particle instanceof XmlSchemaSequence)) {
-                return null;
-            }
-            XmlSchemaSequence sequence = (XmlSchemaSequence)complexType.getParticle();
-            XmlSchemaObjectCollection items = sequence.getItems();
-            List<XmlSchemaElement> childElements = new ArrayList<XmlSchemaElement>();
-            for (int i = 0; i < items.getCount(); i++) {
-                XmlSchemaObject schemaObject = items.getItem(i);
-                if (!(schemaObject instanceof XmlSchemaElement)) {
-                    // Should contain elements only
-                    return null;
-                }
-                XmlSchemaElement childElement = (XmlSchemaElement)schemaObject;
-                /*
-                if (childElement.getSubstitutionGroup() != null) {
-                    return null;
-                }
-                */
-                if (childElement.getName() == null || childElement.getRefName() != null) {
-                    XmlSchemaElement ref = getElement(childElement.getRefName());
-                    if (ref == null) {
-                        throw new InvalidWSDLException("XML schema element ref cannot be resolved: " + childElement);
-                    }
-                    childElement = ref;
-                }
-                if (ANY.equals(childElement.getQName())) {
-                    // Wildcard is not allowed
-                    return null;
-                }
-                // TODO: Do we support maxOccurs >1 ?
-                if (childElement.getMaxOccurs() > 1) {
-                    // TODO: [rfeng] To be implemented
-                    /*
-                    if(logger.isLoggable(Level.WARNING)) {
-                    	logger.warning("Support for elements with maxOccurs>1 is not implemented.");
-                    }
-                    */
-                    // return null;
-                }
-                childElements.add(childElement);
-            }
-            return childElements;
-        }
-
-        /**
-         * Return a list of child XSD elements under the wrapped request element
-         * 
-         * @return a list of child XSD elements or null if if the request
-         *         element is not wrapped
-         */
-        public List<XmlSchemaElement> getInputChildElements() throws InvalidWSDLException {
-            if (inputElements != null) {
-                return inputElements;
-            }
-            Input input = operation.getInput();
-            if (input != null) {
-                Message inputMsg = input.getMessage();
-                Collection parts = inputMsg.getParts().values();
-                if (parts.size() != 1) {
-                    return null;
-                }
-                Part part = (Part)parts.iterator().next();
-                QName elementName = part.getElementName();
-                if (elementName == null) {
-                    return null;
-                }
-                if (!operation.getName().equals(elementName.getLocalPart())) {
-                    return null;
-                }
-                inputWrapperElement = getElement(elementName);
-                if (inputWrapperElement == null) {
-                    throw new InvalidWSDLException("The element is not declared in a XML schema: " + elementName
-                        .toString());
-                }
-                if (inputWrapperElement.isNillable()) {
-                    // The wrapper element cannot be nilable
-                    return null;
-                }
-                inputElements = getChildElements(inputWrapperElement);
-                return inputElements;
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * Return a list of child XSD elements under the wrapped response
-         * element
-         * 
-         * @return a list of child XSD elements or null if if the response
-         *         element is not wrapped
-         */
-        public List<XmlSchemaElement> getOutputChildElements() throws InvalidWSDLException {
-            if (outputElements != null) {
-                return outputElements;
-            }
-            Output output = operation.getOutput();
-            if (output != null) {
-                Message outputMsg = output.getMessage();
-                Collection parts = outputMsg.getParts().values();
-                if (parts.size() != 1) {
-                    return null;
-                }
-                Part part = (Part)parts.iterator().next();
-                QName elementName = part.getElementName();
-                if (elementName == null) {
-                    throw new InvalidWSDLException("The element is not declared in the XML schema: " + part.getName());
-                }
-                outputWrapperElement = WSDLOperationIntrospectorImpl.this.getElement(elementName);
-                if (outputWrapperElement == null) {
-                    return null;
-                }
-                if (outputWrapperElement.isNillable()) {
-                    // The wrapper element cannot be nilable
-                    return null;
-                }
-                outputElements = getChildElements(outputWrapperElement);
-                // FIXME: Do we support multiple child elements for the response?
-                return outputElements;
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * @return the inputWrapperElement
-         */
-        public XmlSchemaElement getInputWrapperElement() {
-            return inputWrapperElement;
-        }
-
-        /**
-         * @return the outputWrapperElement
-         */
-        public XmlSchemaElement getOutputWrapperElement() {
-            return outputWrapperElement;
-        }
-
-        /*
-        public DataType<List<DataType<XMLType>>> getUnwrappedInputType() throws InvalidWSDLException {
-            if (unwrappedInputType == null) {
-                List<DataType<XMLType>> childTypes = new ArrayList<DataType<XMLType>>();
-                for (XmlSchemaElement element : getInputChildElements()) {
-                    DataType<XMLType> type =
-                        new DataType<XMLType>(dataBinding, Object.class, new XMLType(getElementInfo(element)));
-                    // type.setMetadata(ElementInfo.class.getName(), getElementInfo(element));
-                    childTypes.add(type);
-                }
-                unwrappedInputType =
-                    new DataType<List<DataType<XMLType>>>("idl:unwrapped.input", Object[].class, childTypes);
-            }
-            return unwrappedInputType;
-        }
-
-        public DataType<XMLType> getUnwrappedOutputType() throws InvalidServiceContractException {
-            if (unwrappedOutputType == null) {
-                List<XmlSchemaElement> elements = getOutputChildElements();
-                if (elements != null && elements.size() > 0) {
-                    if (elements.size() > 1) {
-                        // We don't support output with multiple parts
-                        throw new NotSupportedWSDLException("Multi-part output is not supported");
-                    }
-                    XmlSchemaElement element = elements.get(0);
-                    unwrappedOutputType =
-                        new DataType<XMLType>(dataBinding, Object.class, new XMLType(getElementInfo(element)));
-                    // unwrappedOutputType.setMetadata(ElementInfo.class.getName(), getElementInfo(element));
-                }
-            }
-            return unwrappedOutputType;
-        }
-        */
-
-        public WrapperInfo getWrapperInfo() throws InvalidWSDLException {
-            if (wrapperInfo == null) {
-                ElementInfo in = getElementInfo(getInputWrapperElement());
-                ElementInfo out = getElementInfo(getOutputWrapperElement());
-                List<ElementInfo> inChildren = new ArrayList<ElementInfo>();
-                if (in != null) {
-                    for (XmlSchemaElement e : getInputChildElements()) {
-                        inChildren.add(getElementInfo(e));
-                    }
-                }
-                List<ElementInfo> outChildren = new ArrayList<ElementInfo>();
-                if (out != null) {
-                    for (XmlSchemaElement e : getOutputChildElements()) {
-                        outChildren.add(getElementInfo(e));
-                    }
-                }
-                wrapperInfo = new WrapperInfo(dataBinding, in, out, inChildren, outChildren);
-            }
-            return wrapperInfo;
-        }
-    }
-
-    private static ElementInfo getElementInfo(XmlSchemaElement element) {
-        if (element == null) {
-            return null;
-        }
-        ElementInfo elementInfo = new ElementInfo(element.getQName(), getTypeInfo(element.getSchemaType()));
-        elementInfo.setMany(element.getMaxOccurs() > 1);
-        elementInfo.setNillable(element.isNillable());
-        return elementInfo;
-    }
-
-    private static TypeInfo getTypeInfo(XmlSchemaType type) {
-        if (type == null) {
-            return null;
-        }
-        XmlSchemaType baseType = (XmlSchemaType)type.getBaseSchemaType();
-        QName name = type.getQName();
-        boolean simple = (type instanceof XmlSchemaSimpleType);
-        if (baseType == null) {
-            return new TypeInfo(name, simple, null);
-        } else {
-            return new TypeInfo(name, simple, getTypeInfo(baseType));
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/tags/java/sca/1.3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
deleted file mode 100644
index c11d22d7b2..0000000000
--- a/tags/java/sca/1.3/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ /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.interfacedef.wsdl.DefaultWSDLFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/interface/LICENSE b/tags/java/sca/1.3/modules/interface/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/interface/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/tags/java/sca/1.3/modules/interface/NOTICE b/tags/java/sca/1.3/modules/interface/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/interface/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/tags/java/sca/1.3/modules/interface/pom.xml b/tags/java/sca/1.3/modules/interface/pom.xml
deleted file mode 100644
index 6e4b1408e3..0000000000
--- a/tags/java/sca/1.3/modules/interface/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-interface</artifactId>
-    <name>Apache Tuscany SCA Interface Model</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</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.interface</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
deleted file mode 100644
index 247a432330..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.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.interfacedef;
-
-/**
- * Enum of the Conversation Sequence values.
- *
- * @version $Rev$ $Date$
- */
-public enum ConversationSequence {
-    CONVERSATION_NONE, CONVERSATION_START, CONVERSATION_CONTINUE, CONVERSATION_END 
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
deleted file mode 100644
index 1f5620c0b9..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.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.interfacedef;
-
-import java.lang.reflect.Type;
-
-/**
- * Representation of the type of data associated with an operation. Data is
- * represented in two forms: the physical form used by the runtime and a logical
- * form used by the assembly. The physical form is a Java Type because the
- * runtime is written in Java. This may be the same form used by the application
- * but it may not; for example, an application that is performing stream
- * processing may want a physical form such as an
- * {@link java.io.InputStream InputStream} to semantially operate on application
- * data such as a purchase order. The logical description is that used by the
- * assembly model and is an identifier into some well-known type space; examples
- * may be a Java type represented by its Class or an XML type represented by its
- * QName. Every data type may also contain metadata describing the expected
- * data; for example, it could specify a preferred data binding technology or
- * the size of a typical instance.
- * 
- * @version $Rev$ $Date$
- */
-public interface DataType<L> extends Cloneable {
-    /**
-     * Set the java type for the data
-     * @param cls
-     */
-    void setPhysical(Class<?> cls);
-
-    /**
-     * Returns the physical type used by the runtime.
-     * 
-     * @return the physical type used by the runtime
-     */
-    Class<?> getPhysical();
-
-    /**
-     * Get the java generic type
-     * @return The java generic type
-     */
-    Type getGenericType();
-
-    /**
-     * Set the java generic type
-     * @param genericType
-     */
-    void setGenericType(Type genericType);
-
-    /**
-     * Returns the logical identifier used by the assembly. The type of this
-     * value identifies the logical type system in use. Known values are:
-     * <ul>
-     * <li>a Class identifies a Java type by name and
-     * ClassLoader; this includes Java Classes as they are specializations of
-     * Type</li>
-     * <li>a XMLType identifies an XML type by local name and
-     * namespace</li>
-     * </ul>
-     * 
-     * @return the logical type name
-     */
-    L getLogical();
-
-    /**
-     * Get the databinding for the given data type
-     * @return the databinding
-     */
-    String getDataBinding();
-
-    /**
-     * Set the databinding for the given data type
-     * @param dataBinding the dataBinding to set
-     */
-    void setDataBinding(String dataBinding);
-
-    /**
-     * Clone a data type
-     * @return The cloned data type
-     * @throws CloneNotSupportedException
-     */
-    Object clone() throws CloneNotSupportedException;
-
-    /**
-     * Set the logical type of the data type
-     * @param logical the logical to set
-     */
-    void setLogical(L logical);
-
-    /**
-     * Get the databinding-specific metadata
-     * @param type The java type of the metadata
-     * @return the databinding-specific metadata
-     */
-    <T> T getMetaData(Class<T> type);
-    /**
-     * Set the databinding-specific metadata
-     * @param type The java type of the metadata
-     * @param metaData the databinding-specific metadata, such as SDO's commonj.sdo.Type or 
-     * JAXB's javax.xml.bind.JAXBContext
-     */
-    <T> void setMetaData(Class<T> type, T metaData);
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
deleted file mode 100644
index 70f6d5b403..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.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.interfacedef;
-
-/**
- * This interface represents the mapping between WSDL faults and Java exceptions
- * 
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("unchecked")
-public interface FaultExceptionMapper {
-    /**
-     * Introspect an exception class to find out the fault data type following the WSDL2Java
-     * mapping rules. The result will be populated into the logical type of the exception data
-     * type
-     * 
-     * @param exceptionDataType The data type representing a java exception class
-     * @param operation TODO
-     * @param generatingFaultBean If JAXWS Section 3.7 Fault Bean will be generated
-     * @return true if the introspection can recognize the exception data type 
-     */
-    boolean introspectFaultDataType(DataType<DataType> exceptionDataType, Operation operation, boolean generatingFaultBean);
-    
-    /**
-     * Create a java exception to wrap the fault data
-     * 
-     * @param exceptionType The DataType for the exception
-     * @param message message for the exception
-     * @param faultInfo The fault data
-     * @param cause of the exception
-     * @param operation TODO
-     * @return An instance of java exception to represent the fault
-     */
-    Throwable wrapFaultInfo(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause, Operation operation);
-
-    /**
-     * Retrieve the fault info from a java exception
-     * 
-     * @param exception The java exception that represents the fault data
-     * @param faultBeanClass
-     * @param operation TODO
-     * @return The fault data
-     */
-    Object getFaultInfo(Throwable exception, Class<?> faultBeanClass, Operation operation);
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
deleted file mode 100644
index 179dc1755e..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.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.interfacedef;
-
-/**
- * Denotes incompatible service contracts for a wire
- * 
- * @version $Rev$ $Date$
- */
-public class IncompatibleInterfaceContractException extends Exception {
-    private static final long serialVersionUID = 5127478601823295587L;
-    private final InterfaceContract source;
-    private final InterfaceContract target;
-    private final Operation sourceOperation;
-    private final Operation targetOperation;
-
-    public IncompatibleInterfaceContractException(String message, InterfaceContract source, InterfaceContract target) {
-        super(message);
-        this.source = source;
-        this.target = target;
-        this.sourceOperation = null;
-        this.targetOperation = null;
-    }
-
-    public IncompatibleInterfaceContractException(String message,
-                                                  InterfaceContract source,
-                                                  InterfaceContract target,
-                                                  Operation sourceOperation,
-                                                  Operation targetOperation) {
-        super(message);
-        this.source = source;
-        this.target = target;
-        this.sourceOperation = sourceOperation;
-        this.targetOperation = targetOperation;
-    }
-
-    public InterfaceContract getTarget() {
-        return target;
-    }
-
-    public InterfaceContract getSource() {
-        return source;
-    }
-
-    public Operation getSourceOperation() {
-        return sourceOperation;
-    }
-
-    public Operation getTargetOperation() {
-        return targetOperation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
deleted file mode 100644
index f9de645a6e..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.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.interfacedef;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents a service interface. This interface will typically be extended to
- * support concrete interface type systems, such as Java interfaces, WSDL 1.1
- * portTypes and WSDL 2.0 interfaces.
- *
- * @version $Rev$ $Date$
- */
-public interface Interface extends Cloneable, PolicySetAttachPoint {
-
-    /**
-     * Returns true if the interface is a remotable interface..
-     * 
-     * @return true if the interface is a remotable interface
-     */
-    boolean isRemotable();
-
-    /**
-     * Sets whether the interface is a remotable or local interface.
-     * 
-     * @param remotable indicates whether the interface is remotable or local
-     */
-    void setRemotable(boolean remotable);
-    
-    
-    // FIXME: [rfeng] We need to re-consider the conversational as an intent
-    /**
-     * Test if the interface is conversational
-     * @return
-     */
-    boolean isConversational();
-    
-    /**
-     * Set whether the interface is conversational 
-     * @param conversational
-     */
-    void setConversational(boolean conversational);
-
-    /**
-     * Returns the operations defined on this interface.
-     * 
-     * @return the operations defined on this interface
-     */
-    List<Operation> getOperations();
-
-    /**
-     * Set the databinding for the interface
-     * @param dataBinding
-     * @deprecated Please use resetDataBinding
-     */
-    @Deprecated
-    void setDefaultDataBinding(String dataBinding);
-    
-    /**
-     * Reset the databinding for the interface
-     * @param dataBinding
-     */
-    void resetDataBinding(String dataBinding);
-
-    /**
-     * Returns true if the Interface is dynamic.
-     * 
-     * @return true if the Interface is dynamic.
-     */
-    boolean isDynamic();
-
-    /**
-     * Implementations must support cloning.
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
deleted file mode 100644
index 568a6c595c..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.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.interfacedef;
-
-
-/**
- * Interface contracts define one or more business functions. These business
- * functions are provided by services and are used by references.
- * 
- * @version $Rev$ $Date$
- */
-public interface InterfaceContract extends Cloneable {
-
-    /**
-     * Returns the interface definition representing the interface for
-     * invocations from the requestor to the provider.
-     * 
-     * @return the interface definition representing the interface for
-     *         invocations from the requestor to the provider
-     */
-    Interface getInterface();
-
-    /**
-     * Sets the interface definition representing the interface for invocations
-     * from the requestor to the provider.
-     * 
-     * @param callInterface the interface definition representing the interface
-     *            for invocations from the requestor to the provider
-     */
-    void setInterface(Interface callInterface);
-
-    /**
-     * Returns the interface definition representing the interface for
-     * invocations from the provider to the requestor.
-     * 
-     * @return the interface definition representing the interface for
-     *         invocations from the provider to the requestor.
-     */
-    Interface getCallbackInterface();
-
-    /**
-     * Sets the interface definition representing the interface for invocations
-     * from the provider to the requestor.
-     * 
-     * @param callbackInterface the interface definition representing the
-     *            interface for invocations from the provider to the requestor.
-     */
-    void setCallbackInterface(Interface callbackInterface);
-
-    // FIXME: We need a better way to do this
-    /**
-     * Convert an interface contract to a unidirectional interface contract
-     *  
-     * @param isCallback true for a callback interface contract, false for
-     *        a forward interface contract
-     * @return A unidirectional interface contract, cloned if necessary 
-     */
-    InterfaceContract makeUnidirectional(boolean isCallback);
-
-    /**
-     * Implementations must support cloning.
-     */
-    Object clone() throws CloneNotSupportedException;
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
deleted file mode 100644
index 5601b09660..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.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.interfacedef;
-
-/**
- * The InterfaceContractMapper is responsible to match interfaces
- * 
- * @version $Rev$ $Date$
- */
-public interface InterfaceContractMapper {
-    /**
-     * Check the compatibility of the source and the target interface contracts.
-     * <p>
-     * A wire may only connect a source to a target if the target implements an
-     * interface that is compatible with the interface required by the source.
-     * The source and the target are compatible if: <p/>
-     * <ol>
-     * <li>the source interface and the target interface MUST either both be
-     * remotable or they are both local
-     * <li>the methods on the target interface MUST be the same as or be a
-     * superset of the methods in the interface specified on the source
-     * <li>compatibility for the individual method is defined as compatibility
-     * of the signature, that is method name, input types, and output types MUST
-     * BE the same.
-     * <li>the order of the input and output types also MUST BE the same.
-     * <li>the set of Faults and Exceptions expected by the source MUST BE the
-     * same or be a superset of those specified by the service.
-     * <li>other specified attributes of the two interfaces MUST match,
-     * including Scope and Callback interface
-     * </ol>
-     * <p/>
-     * <p>
-     * Please note this test is not symmetric: the success of isCompatible(A, B)
-     * does NOT imply isCompatible(B, A)
-     * 
-     * @param source The source interface contract
-     * @param target The target interface contract
-     * @return true if the source contract can be supported by the target
-     *         contract
-     */
-    boolean isCompatible(InterfaceContract source, InterfaceContract target);
-
-    /**
-     * @param source
-     * @param target
-     * @param ignoreCallback
-     * @param silent
-     * @return
-     * @throws IncompatibleInterfaceContractException
-     */
-    boolean checkCompatibility(InterfaceContract source,
-                               InterfaceContract target,
-                               boolean ignoreCallback,
-                               boolean silent) throws IncompatibleInterfaceContractException;
-
-    /**
-     * Test if the source data type is compatible with the target data type. The
-     * compatibility is defined as follows.
-     * <ul>
-     * <li>source's logical type is either the same or subtype of the target's
-     * logical type
-     * </ul>
-     * For example, if the source type is a SDO Customer and the target type is
-     * a JAXB Customer and both Customer are generated from the same XSD type.
-     * 
-     * @param source The source data type
-     * @param target The target data type
-     * @return
-     */
-    boolean isCompatible(DataType source, DataType target, boolean remotable);
-
-    /**
-     * Check if source operation is compatible with the target operation
-     * 
-     * @param source The source operation
-     * @param target The target operation
-     * @return true if the source operation is compatible with the target
-     *         operation
-     */
-    boolean isCompatible(Operation source, Operation target, boolean remotable);
-
-    /**
-     * @param source
-     * @param target
-     * @return
-     */
-    boolean isCompatible(Interface source, Interface target);
-
-    /**
-     * Map the source operation to a compatible operation in the target
-     * interface
-     * 
-     * @param target The target interface
-     * @param source The source operation
-     * @return A compatible operation
-     */
-    Operation map(Interface target, Operation source);
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
deleted file mode 100644
index f952a86478..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.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.interfacedef;
-
-
-/**
- * Denotes an illegal callback interface
- *
- * @version $Rev$ $Date$
- */
-
-public class InvalidCallbackException extends InvalidInterfaceException {
-    private static final long serialVersionUID = 2727755895702116397L;
-
-    public InvalidCallbackException(String message) {
-        super(message);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
deleted file mode 100644
index 2a273c9a26..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.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.interfacedef;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class InvalidInterfaceException extends Exception {
-
-    public InvalidInterfaceException() {
-        super();
-    }
-
-    public InvalidInterfaceException(String message) {
-        super(message);
-    }
-
-    public InvalidInterfaceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public InvalidInterfaceException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
deleted file mode 100644
index b19805c5b1..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.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.interfacedef;
-
-import java.lang.reflect.Method;
-
-/**
- * Denotes an invalid conversational interface definition
- * 
- * @version $Rev$ $Date$
- */
-public class InvalidOperationException extends InvalidInterfaceException {
-
-    private static final long serialVersionUID = -1797615361821517091L;
-    private final Method operation;
-
-    public InvalidOperationException(String message, Method operation) {
-        super(message);
-        this.operation = operation;
-    }
-
-    public Method getOperation() {
-        return operation;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
deleted file mode 100644
index 4676e35f80..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.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.interfacedef;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * Represents an operation on a service interface.
- *
- * @version $Rev$ $Date$
- */
-public interface Operation extends Cloneable, PolicySetAttachPoint {
-    /**
-     * Returns the name of the operation.
-     * 
-     * @return the name of the operation
-     */
-    String getName();
-
-    /**
-     * Sets the name of the operation.
-     * 
-     * @param name the name of the operation
-     */
-    void setName(String name);
-
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-    /**
-     * Get the data type that represents the input of this operation. The logic
-     * type is a list of data types and each element represents a parameter
-     * 
-     * @return the inputType
-     */
-    DataType<List<DataType>> getInputType();
-    
-    /**
-     * @param inputType
-     */
-    void setInputType(DataType<List<DataType>> inputType);
-
-    /**
-     * Get the data type for the output
-     * 
-     * @return the outputType
-     */
-    DataType getOutputType();
-    
-    /**
-     * @param outputType
-     */
-    void setOutputType(DataType outputType);
-
-    /**
-     * Get a list of data types to represent the faults/exceptions
-     * 
-     * @return the faultTypes
-     */
-    List<DataType> getFaultTypes();
-    
-    /**
-     * @param faultTypes
-     */
-    void setFaultTypes(List<DataType> faultTypes);
-    
-    /**
-     * Get the owning interface
-     * @return
-     */
-    Interface getInterface();
-    
-    /**
-     * Set the owning interface
-     * @param interfaze
-     */
-    void setInterface(Interface interfaze);
-    
-    /**
-     * Get the sequence of the conversation
-     * @return
-     */
-    ConversationSequence getConversationSequence();
-    
-    /**
-     * Set the sequence of conversation for the operation
-     * @param sequence
-     */
-    void setConversationSequence(ConversationSequence sequence);
-    
-    /**
-     * Indicate if the operation is non-blocking
-     * @return
-     */
-    boolean isNonBlocking();
-    
-    /**
-     * Set the operation to be non-blocking
-     */
-    void setNonBlocking(boolean nonBlocking);
-    
-    /**
-     * @return the wrapperInfo
-     */
-    WrapperInfo getWrapper();
-
-    /**
-     * @param wrapperInfo the wrapperInfo to set
-     */
-    void setWrapper(WrapperInfo wrapperInfo);
-
-    /**
-     * @return the wrapperStyle
-     */
-    boolean isWrapperStyle();
-
-    /**
-     * @param wrapperStyle the wrapperStyle to set
-     */
-    void setWrapperStyle(boolean wrapperStyle);
-    
-    /**
-     * @deprecated This should be the WrapperInfo.getDataBinding()
-     * Get the databinding for the operation
-     * @return
-     */
-    @Deprecated
-    String getDataBinding();
-    
-    /**
-     * @deprecated This should be the WrapperInfo.setDataBinding()
-     * Set the databinding for the operation
-     * @param dataBinding
-     */
-    @Deprecated
-    void setDataBinding(String dataBinding);
-    
-    /**
-     * Returns true if the operation is dynamic.
-     * 
-     * @return true if the operation is dynamic otherwise false
-     */
-    boolean isDynamic();
-
-    /**
-     * Set if the operation is dynamic
-     * @param b
-     */
-    void setDynamic(boolean b);
-
-    /**
-     * Get the synthesized fault beans for this operation
-     * 
-     * @return the fault beans
-     */
-    Map<QName, List<DataType<XMLType>>> getFaultBeans();
-    
-    /**
-     * Set the synthesized fault beans for this operation
-     * @param faultBeans
-     */
-    void setFaultBeans(Map<QName, List<DataType<XMLType>>> faultBeans);
-
-    /**
-     * Implementations must support cloning.
-     */
-    Object clone() throws CloneNotSupportedException;
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
deleted file mode 100644
index 6773b29088..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.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.interfacedef;
-
-import java.lang.reflect.Method;
-
-/**
- * Exception thrown to indicate that a service contract specification contains
- * an overloaded method.
- * 
- * @version $Rev$ $Date$
- */
-public class OverloadedOperationException extends InvalidInterfaceException {
-    private static final long serialVersionUID = -4658711318608885638L;
-    private final Method operation;
-
-    public OverloadedOperationException(Method operation) {
-        super(operation == null ? 
-                null : "Cannot overload operation " + operation.getName() 
-                         + " on " + operation.getDeclaringClass().getName()
-                         + " as it is a @Remotable interface");
-        this.operation = operation;
-    }
-
-    public Method getOperation() {
-        return operation;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
deleted file mode 100644
index c1c8400b71..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.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 org.apache.tuscany.sca.interfacedef.impl;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-
-/**
- * Representation of the type of data associated with an operation. Data is
- * represented in two forms: the physical form used by the runtime and a logical
- * form used by the assembly. The physical form is a Java Type because the
- * runtime is written in Java. This may be the same form used by the application
- * but it may not; for example, an application that is performing stream
- * processing may want a physical form such as an
- * {@link java.io.InputStream InputStream} to semantially operate on application
- * data such as a purchase order. The logical description is that used by the
- * assembly model and is an identifier into some well-known type space; examples
- * may be a Java type represented by its Class or an XML type represented by its
- * QName. Every data type may also contain metadata describing the expected
- * data; for example, it could specify a preferred data binding technology or
- * the size of a typical instance.
- * 
- * @version $Rev$ $Date$
- */
-public class DataTypeImpl<L> implements DataType<L> {
-    private String dataBinding;
-    private Class<?> physical;
-    private Type genericType;
-    private L logical;
-    private Map<Class<?>, Object> metaDataMap;
-
-    /**
-     * Construct a data type specifying the physical and logical types.
-     * 
-     * @param physical the physical class used by the runtime
-     * @param logical the logical type
-     * @see #getLogical()
-     */
-    public DataTypeImpl(Class<?> physical, L logical) {
-        this(null, physical, physical, logical);
-    }
-
-    /**
-     * @param dataBinding
-     * @param physical
-     * @param logical
-     */
-    public DataTypeImpl(String dataBinding, Class<?> physical, L logical) {
-        this(dataBinding, physical, physical, logical);
-    }
-
-    /**
-     * @param dataBinding
-     * @param physical
-     * @param genericType
-     * @param logical
-     */
-    public DataTypeImpl(String dataBinding, Class<?> physical, Type genericType, L logical) {
-        super();
-        this.dataBinding = dataBinding;
-        this.physical = physical;
-        this.genericType = genericType;
-        this.logical = logical;
-    }
-
-    /**
-     * Returns the physical type used by the runtime.
-     * 
-     * @return the physical type used by the runtime
-     */
-    public Class<?> getPhysical() {
-        return physical;
-    }
-
-    /**
-     * @param physical the physical to set
-     */
-    public void setPhysical(Class<?> physical) {
-        this.physical = physical;
-    }
-
-    /**
-     * Get the java generic type
-     * @return The java generic type
-     */
-    public Type getGenericType() {
-        return genericType;
-    }
-
-    /**
-     * Set the java generic type
-     * @param genericType
-     */
-    public void setGenericType(Type genericType) {
-        this.genericType = genericType;
-    }
-
-    /**
-     * Returns the logical identifier used by the assembly. The type of this
-     * value identifies the logical type system in use. Known values are:
-     * <ul>
-     * <li>a java.lang.reflect.Type identifies a Java type by name and
-     * ClassLoader; this includes Java Classes as they are specializations of
-     * Type</li>
-     * <li>a javax.xml.namespace.QName identifies an XML type by local name and
-     * namespace</li>
-     * </ul>
-     * 
-     * @return the logical type name
-     */
-    public L getLogical() {
-        return logical;
-    }
-
-    /**
-     * @param logical the logical to set
-     */
-    public void setLogical(L logical) {
-        this.logical = logical;
-    }
-
-    public String getDataBinding() {
-        return dataBinding;
-    }
-
-    /**
-     * @param dataBinding the dataBinding to set
-     */
-    public void setDataBinding(String dataBinding) {
-        this.dataBinding = dataBinding;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append(physical).append(" ").append(dataBinding).append(" ").append(logical);
-        return sb.toString();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        DataTypeImpl copy = (DataTypeImpl)super.clone();
-        return copy;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((dataBinding == null) ? 0 : dataBinding.hashCode());
-        result = prime * result + ((genericType == null) ? 0 : genericType.hashCode());
-        result = prime * result + ((logical == null) ? 0 : logical.hashCode());
-        result = prime * result + ((physical == null) ? 0 : physical.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 DataTypeImpl other = (DataTypeImpl)obj;
-        if (dataBinding == null) {
-            if (other.dataBinding != null)
-                return false;
-        } else if (!dataBinding.equals(other.dataBinding))
-            return false;
-        if (genericType == null) {
-            if (other.genericType != null)
-                return false;
-        } else if (!genericType.equals(other.genericType))
-            return false;
-        if (logical == null) {
-            if (other.logical != null)
-                return false;
-        } else if (!logical.equals(other.logical))
-            return false;
-        if (physical == null) {
-            if (other.physical != null)
-                return false;
-        } else if (!physical.equals(other.physical))
-            return false;
-        return true;
-    }
-
-    public <T> T getMetaData(Class<T> type) {
-        return metaDataMap == null ? null : type.cast(metaDataMap.get(type));
-    }
-
-    public <T> void setMetaData(Class<T> type, T metaData) {
-        if (metaDataMap == null) {
-            metaDataMap = new ConcurrentHashMap<Class<?>, Object>();
-        }
-        metaDataMap.put(type, metaData);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
deleted file mode 100644
index 15581b5e04..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.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.interfacedef.impl;
-
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-
-/**
- * Represents an interface contract. InterfaceContractImpl
- * 
- * @version $Rev$ $Date$
- */
-public abstract class InterfaceContractImpl implements InterfaceContract {
-    private Interface callInterface;
-    private Interface callbackInterface;
-
-    public Interface getCallbackInterface() {
-        return callbackInterface;
-    }
-
-    public Interface getInterface() {
-        return callInterface;
-    }
-
-    public void setCallbackInterface(Interface callbackInterface) {
-        this.callbackInterface = callbackInterface;
-    }
-
-    public void setInterface(Interface callInterface) {
-        this.callInterface = callInterface;
-    }
-
-    public InterfaceContract makeUnidirectional(boolean isCallback) {
-        if (!isCallback && callbackInterface == null)
-            return this; // already a unidirectional forward interface contract
-
-        if (isCallback && callInterface == null)
-            return this; // already a unidirectional callback interface contract
-
-        // contract is bidirectional, so create a new unidirectional contract        
-        try {
-            InterfaceContract newContract = clone();
-            if (!isCallback) {
-                newContract.setCallbackInterface(null); // create unidirectional forward interface contract
-            } else {
-                newContract.setInterface(null); // create unidirectional callback interface contract
-            }
-            return newContract;
-        } catch (CloneNotSupportedException e) {
-            // will not happen
-            return null;
-        }
-    }
-
-    @Override
-    public InterfaceContractImpl clone() throws CloneNotSupportedException {
-        InterfaceContractImpl copy = (InterfaceContractImpl)super.clone();
-        if (this.callbackInterface != null) {
-            copy.callbackInterface = (Interface)this.callbackInterface.clone();
-        }
-        if (this.callInterface != null) {
-            copy.callInterface = (Interface)this.callInterface.clone();
-        }
-        return copy;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((callInterface == null) ? 0 : callInterface.hashCode());
-        result = prime * result + ((callbackInterface == null) ? 0 : callbackInterface.hashCode());
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final InterfaceContractImpl other = (InterfaceContractImpl)obj;
-        if (callInterface == null) {
-            if (other.callInterface != null) {
-                return false;
-            }
-        } else if (!callInterface.equals(other.callInterface)) {
-            return false;
-        }
-        if (callbackInterface == null) {
-            if (other.callbackInterface != null) {
-                return false;
-            }
-        } else if (!callbackInterface.equals(other.callbackInterface)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
deleted file mode 100644
index 9e7d6882f7..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.interfacedef.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.IncompatibleInterfaceContractException;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InterfaceContractMapperImpl implements InterfaceContractMapper {
-
-    public boolean isCompatible(DataType source, DataType target, boolean remotable) {
-        if (source == target) {
-            return true;
-        }
-        if (!remotable) {
-            if (source == null || target == null) {
-                return false;
-            }
-            // For local case
-            return target.getPhysical().isAssignableFrom(source.getPhysical());
-        } else {
-            // FIXME: How to test if two remotable data type is compatible?
-            // return target.getLogical().equals(source.getLogical());
-            return true;
-        }
-
-    }
-
-    public boolean isCompatible(Operation source, Operation target, boolean remotable) {
-        if (source == target) {
-            return true;
-        }
-
-        if (source.isDynamic() || target.isDynamic()) {
-            return true;
-        }
-
-        // Check name
-        if (!source.getName().equals(target.getName())) {
-            return false;
-        }
-
-        if (source.getInterface().isRemotable() != target.getInterface().isRemotable()) {
-            return false;
-        }
-
-        //        if (source.getInterface().isRemotable()) {
-        //            return true;
-        //        }
-
-        // FIXME: We need to deal with wrapped<-->unwrapped conversion
-
-        // Check output type
-        DataType sourceOutputType = source.getOutputType();
-        DataType targetOutputType = target.getOutputType();
-
-        // Note the target output type is now the source for checking
-        // compatibility
-        if (!isCompatible(targetOutputType, sourceOutputType, remotable)) {
-            return false;
-        }
-
-        boolean checkSourceWrapper = true;
-        List<DataType> sourceInputType = source.getInputType().getLogical();
-        if (source.isWrapperStyle() && source.getWrapper() != null) {
-            sourceInputType = source.getWrapper().getUnwrappedInputType().getLogical();
-            checkSourceWrapper = false;
-        }
-        boolean checkTargetWrapper = true;
-        List<DataType> targetInputType = target.getInputType().getLogical();
-        if (target.isWrapperStyle() && target.getWrapper() != null) {
-            targetInputType = target.getWrapper().getUnwrappedInputType().getLogical();
-            checkTargetWrapper = false;
-        }
-
-        if (checkSourceWrapper != checkTargetWrapper) {
-            return true;
-        }
-        if (sourceInputType.size() != targetInputType.size()) {
-            return false;
-        }
-
-        int size = sourceInputType.size();
-        for (int i = 0; i < size; i++) {
-            if (!isCompatible(sourceInputType.get(i), targetInputType.get(i), remotable)) {
-                return false;
-            }
-        }
-
-        // Check fault types
-        for (DataType targetFaultType : target.getFaultTypes()) {
-            // Source fault types must be the same or superset of target fault
-            // types
-            boolean found = true;
-            for (DataType sourceFaultType : source.getFaultTypes()) {
-                found = false;
-                if (isCompatible(targetFaultType, sourceFaultType, remotable)) {
-                    // Target fault type can be covered by the source fault type
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // FIXME: How to improve the performance for the lookup
-    private Operation getOperation(List<Operation> operations, String name) {
-        for (Operation op : operations) {
-            if (op.getName().equals(name)) {
-                return op;
-            }
-        }
-        return null;
-    }
-
-    public boolean checkCompatibility(InterfaceContract source,
-                                      InterfaceContract target,
-                                      boolean ignoreCallback,
-                                      boolean silent) throws IncompatibleInterfaceContractException {
-        if (source == target) {
-            // Shortcut for performance
-            return true;
-        }
-
-        if (source.getInterface().isDynamic() || target.getInterface().isDynamic()) {
-            return true;
-        }
-
-        if (source.getInterface().isRemotable() != target.getInterface().isRemotable()) {
-            if (!silent) {
-                throw new IncompatibleInterfaceContractException("Remotable settings do not match", source, target);
-            } else {
-                return false;
-            }
-        }
-        if (source.getInterface().isConversational() != target.getInterface().isConversational()) {
-            if (!silent) {
-                throw new IncompatibleInterfaceContractException("Interaction scopes do not match", source, target);
-            } else {
-                return false;
-            }
-        }
-
-        for (Operation operation : source.getInterface().getOperations()) {
-            Operation targetOperation = map(target.getInterface(), operation);
-            if (targetOperation == null) {
-                if (!silent) {
-                    throw new IncompatibleInterfaceContractException("Operation not found on target", source, target);
-                } else {
-                    return false;
-                }
-            }
-            if (!source.getInterface().isRemotable()) {
-                // FIXME: for remotable operation, only compare name for now
-                if (!isCompatible(operation, targetOperation, false)) {
-                    if (!silent) {
-                        throw new IncompatibleInterfaceContractException("Target operations are not compatible",
-                                                                         source, target);
-                    } else {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        if (ignoreCallback) {
-            return true;
-        }
-
-        if (source.getCallbackInterface() == null && target.getCallbackInterface() == null) {
-            return true;
-        }
-        if (source.getCallbackInterface() == null || target.getCallbackInterface() == null) {
-            if (!silent) {
-                throw new IncompatibleInterfaceContractException("Callback interface doesn't match", source, target);
-            } else {
-                return false;
-            }
-        }
-
-        for (Operation operation : source.getCallbackInterface().getOperations()) {
-            Operation targetOperation =
-                getOperation(target.getCallbackInterface().getOperations(), operation.getName());
-            if (targetOperation == null) {
-                if (!silent) {
-                    throw new IncompatibleInterfaceContractException("Callback operation not found on target", source,
-                                                                     target, null, targetOperation);
-                } else {
-                    return false;
-                }
-            }
-            if (!source.getCallbackInterface().isRemotable()) {
-                // FIXME: for remotable operation, only compare name for now
-                if (!operation.equals(targetOperation)) {
-                    if (!silent) {
-                        throw new IncompatibleInterfaceContractException("Target callback operation is not compatible",
-                                                                         source, target, operation, targetOperation);
-                    } else {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    public boolean isCompatible(Interface source, Interface target) {
-        if (source == target) {
-            // Shortcut for performance
-            return true;
-        }
-        if (source == null || target == null) {
-            return false;
-        }
-
-        if (source.isDynamic() || target.isDynamic()) {
-            return true;
-        }
-
-        if (source.isRemotable() != target.isRemotable()) {
-            return false;
-        }
-        if (source.isConversational() != target.isConversational()) {
-            return false;
-        }
-
-        for (Operation operation : source.getOperations()) {
-            Operation targetOperation = getOperation(target.getOperations(), operation.getName());
-            if (targetOperation == null) {
-                return false;
-            }
-            if (!isCompatible(operation, targetOperation, source.isRemotable())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public boolean isCompatible(InterfaceContract source, InterfaceContract target) {
-        try {
-            return checkCompatibility(source, target, false, false);
-        } catch (IncompatibleInterfaceContractException e) {
-            return false;
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.interfacedef.InterfaceContractMapper#map(org.apache.tuscany.sca.interfacedef.Interface,
-     *      org.apache.tuscany.sca.interfacedef.Operation)
-     */
-    public Operation map(Interface target, Operation source) {
-        // TODO: How to handle the case that source operation is dynamic?
-        if (target == null || target.isDynamic()) {
-            return source;
-        } else if (target.isRemotable()) {
-            for (Operation op : target.getOperations()) {
-                if (op.getName().equals(source.getName())) {
-                    return op;
-                }
-            }
-            return null;
-        } else {
-            for (Operation op : target.getOperations()) {
-                if (isCompatible(source, op, target.isRemotable())) {
-                    return op;
-                }
-            }
-            return null;
-        }
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
deleted file mode 100644
index e2a524c5e0..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.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.interfacedef.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-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.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a service interface.
- * 
- * @version $Rev$ $Date$
- */
-public class InterfaceImpl implements Interface {
-
-    private boolean remotable;
-    private boolean conversational;
-    private OperationList operations = new OperationList();
-    private boolean unresolved;
-
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType type;
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-
-
-    public boolean isRemotable() {
-        return remotable;
-    }
-
-    public void setRemotable(boolean local) {
-        this.remotable = local;
-    }
-
-    public List<Operation> getOperations() {
-        return operations;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    /**
-     * @return the conversational
-     */
-    public boolean isConversational() {
-        return conversational;
-    }
-
-    /**
-     * @param conversational the conversational to set
-     */
-    public void setConversational(boolean conversational) {
-        this.conversational = conversational;
-    }
-
-    private class OperationList extends ArrayList<Operation> {
-        private static final long serialVersionUID = -903469106307606099L;
-
-        @Override
-        public Operation set(int index, Operation element) {
-            element.setInterface(InterfaceImpl.this);
-            return super.set(index, element);
-        }
-
-        @Override
-        public void add(int index, Operation element) {
-            element.setInterface(InterfaceImpl.this);
-            super.add(index, element);
-        }
-
-        @Override
-        public boolean add(Operation o) {
-            o.setInterface(InterfaceImpl.this);
-            return super.add(o);
-        }
-
-        @Override
-        public boolean addAll(Collection<? extends Operation> c) {
-            for (Operation op : c) {
-                op.setInterface(InterfaceImpl.this);
-            }
-            return super.addAll(c);
-        }
-
-        @Override
-        public boolean addAll(int index, Collection<? extends Operation> c) {
-            for (Operation op : c) {
-                op.setInterface(InterfaceImpl.this);
-            }
-            return super.addAll(index, c);
-        }
-
-    }
-
-    @Deprecated
-    public void setDefaultDataBinding(String dataBinding) {
-        for (Operation op : getOperations()) {
-            if (op.getDataBinding() == null) {
-                op.setDataBinding(dataBinding);
-                DataType<List<DataType>> inputType = op.getInputType();
-                if (inputType != null) {
-                    for (DataType d : inputType.getLogical()) {
-                        if (d.getDataBinding() == null) {
-                            d.setDataBinding(dataBinding);
-                        }
-                    }
-                }
-                DataType outputType = op.getOutputType();
-                if (outputType != null && outputType.getDataBinding() == null) {
-                    outputType.setDataBinding(dataBinding);
-                }
-                List<DataType> faultTypes = op.getFaultTypes();
-                if (faultTypes != null) {
-                    for (DataType d : faultTypes) {
-                        if (d.getDataBinding() == null) {
-                            d.setDataBinding(dataBinding);
-                        }
-                        DataType ft = (DataType) d.getLogical();
-                        if (ft.getDataBinding() == null) {
-                            ft.setDataBinding(dataBinding);
-                        }
-
-                    }
-                }
-                if (op.isWrapperStyle()) {
-                    WrapperInfo wrapper = op.getWrapper();
-                    if (wrapper != null) {
-                        DataType<List<DataType>> unwrappedInputType = wrapper.getUnwrappedInputType();
-                        if (unwrappedInputType != null) {
-                            for (DataType d : unwrappedInputType.getLogical()) {
-                                if (d.getDataBinding() == null) {
-                                    d.setDataBinding(dataBinding);
-                                }
-                            }
-                        }
-                        DataType unwrappedOutputType = wrapper.getUnwrappedOutputType();
-                        if (unwrappedOutputType != null && unwrappedOutputType.getDataBinding() == null) {
-                            unwrappedOutputType.setDataBinding(dataBinding);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private void setDataBinding(DataType dataType, String dataBinding) {
-        if ("java:array".equals(dataType.getDataBinding())) {
-            setDataBinding((DataType)dataType.getLogical(), dataBinding);
-        } else {
-            dataType.setDataBinding(dataBinding);
-        }
-    }
-
-    public void resetDataBinding(String dataBinding) {
-        for (Operation op : getOperations()) {
-            op.setDataBinding(dataBinding);
-            DataType<List<DataType>> inputType = op.getInputType();
-            if (inputType != null) {
-                for (DataType d : inputType.getLogical()) {
-                    setDataBinding(d, dataBinding);
-                }
-            }
-            DataType outputType = op.getOutputType();
-            if (outputType != null) {
-                setDataBinding(outputType, dataBinding);
-            }
-            List<DataType> faultTypes = op.getFaultTypes();
-            if (faultTypes != null) {
-                for (DataType d : faultTypes) {
-                    setDataBinding(d, dataBinding);
-                    setDataBinding((DataType) d.getLogical(), dataBinding);
-                }
-            }
-            if (op.isWrapperStyle()) {
-                WrapperInfo wrapper = op.getWrapper();
-                if (wrapper != null) {
-                    DataType<List<DataType>> unwrappedInputType = wrapper.getUnwrappedInputType();
-                    if (unwrappedInputType != null) {
-                        for (DataType d : unwrappedInputType.getLogical()) {
-                            setDataBinding(d, dataBinding);
-                        }
-                    }
-                    DataType unwrappedOutputType = wrapper.getUnwrappedOutputType();
-                    if (unwrappedOutputType != null) {
-                        setDataBinding(unwrappedOutputType, dataBinding);
-                    }
-                }
-            }
-        }
-    }
-
-    public boolean isDynamic() {
-        return false;
-    }
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        InterfaceImpl copy = (InterfaceImpl)super.clone();
-        copy.operations = new OperationList();
-        for (Operation operation : this.operations) {
-            Operation clonedOperation = (Operation)operation.clone();
-            copy.operations.add(clonedOperation);
-        }
-        return copy;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (conversational ? 1231 : 1237);
-        result = prime * result + ((operations == null) ? 0 : operations.hashCode());
-        result = prime * result + (remotable ? 1231 : 1237);
-        result = prime * result + (unresolved ? 1231 : 1237);
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final InterfaceImpl other = (InterfaceImpl)obj;
-        if (conversational != other.conversational)
-            return false;
-        if (operations == null) {
-            if (other.operations != null)
-                return false;
-        } else if (!operations.equals(other.operations))
-            return false;
-        if (remotable != other.remotable)
-            return false;
-        if (unresolved != other.unresolved)
-            return false;
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
deleted file mode 100644
index 00a5dc3065..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.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.interfacedef.impl;
-
-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.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;
-
-/**
- * Represents an operation on a service interface.
- * 
- * @version $Rev$ $Date$
- */
-public class OperationImpl implements Operation {
-
-    private String name;
-    private boolean unresolved;
-    private DataType outputType;
-    private DataType<List<DataType>> inputType;
-    private List<DataType> faultTypes;
-    private Interface interfaze;
-    private ConversationSequence conversationSequence = ConversationSequence.CONVERSATION_NONE;
-    private boolean nonBlocking;
-    private boolean wrapperStyle;
-    private WrapperInfo wrapper;
-    private boolean dynamic;
-    private Map<QName, List<DataType<XMLType>>> faultBeans;
-    
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private IntentAttachPointType type;
-
-    /**
-     * @param name
-     */
-    public OperationImpl() {
-        inputType = new DataTypeImpl<List<DataType>>("idl:input", Object[].class, new ArrayList<DataType>());
-        faultTypes = new ArrayList<DataType>();
-        faultBeans = new HashMap<QName, List<DataType<XMLType>>>();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    /**
-     * @return the faultTypes
-     */
-    public List<DataType> getFaultTypes() {
-        return faultTypes;
-    }
-
-    /**
-     * @param faultTypes the faultTypes to set
-     */
-    public void setFaultTypes(List<DataType> faultTypes) {
-        this.faultTypes = faultTypes;
-    }
-
-    /**
-     * @return the inputType
-     */
-    public DataType<List<DataType>> getInputType() {
-        return inputType;
-    }
-
-    /**
-     * @param inputType the inputType to set
-     */
-    public void setInputType(DataType<List<DataType>> inputType) {
-        this.inputType = inputType;
-    }
-
-    /**
-     * @return the outputType
-     */
-    public DataType getOutputType() {
-        return outputType;
-    }
-
-    /**
-     * @param outputType the outputType to set
-     */
-    public void setOutputType(DataType outputType) {
-        this.outputType = outputType;
-    }
-
-    /**
-     * @return the interface
-     */
-    public Interface getInterface() {
-        return interfaze;
-    }
-
-    /**
-     * @param interfaze the interface to set
-     */
-    public void setInterface(Interface interfaze) {
-        this.interfaze = interfaze;
-    }
-
-    /**
-     * @return the conversationSequence
-     */
-    public ConversationSequence getConversationSequence() {
-        return conversationSequence;
-    }
-
-    /**
-     * @param conversationSequence the conversationSequence to set
-     */
-    public void setConversationSequence(ConversationSequence conversationSequence) {
-        this.conversationSequence = conversationSequence;
-    }
-
-    /**
-     * @return the nonBlocking
-     */
-    public boolean isNonBlocking() {
-        return nonBlocking;
-    }
-
-    /**
-     * @param nonBlocking the nonBlocking to set
-     */
-    public void setNonBlocking(boolean nonBlocking) {
-        this.nonBlocking = nonBlocking;
-    }
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((conversationSequence == null) ? 0 : conversationSequence.hashCode());
-        // result = PRIME * result + ((faultTypes == null) ? 0 :
-        // faultTypes.hashCode());
-        result = PRIME * result + ((inputType == null) ? 0 : inputType.hashCode());
-        result = PRIME * result + ((name == null) ? 0 : name.hashCode());
-        result = PRIME * result + (nonBlocking ? 1231 : 1237);
-        result = PRIME * result + ((outputType == null) ? 0 : outputType.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 OperationImpl other = (OperationImpl)obj;
-        if (conversationSequence == null) {
-            if (other.conversationSequence != null) {
-                return false;
-            }
-        } else if (!conversationSequence.equals(other.conversationSequence)) {
-            return false;
-        }
-        /*
-         * if (faultTypes == null) { if (other.faultTypes != null) { return
-         * false; } } else if (!faultTypes.equals(other.faultTypes)) { return
-         * false; }
-         */
-
-        if (inputType == null) {
-            if (other.inputType != null) {
-                return false;
-            }
-        } else if (!inputType.equals(other.inputType)) {
-            return false;
-        }
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        if (nonBlocking != other.nonBlocking) {
-            return false;
-        }
-        if (outputType == null) {
-            if (other.outputType != null) {
-                return false;
-            }
-        } else if (!outputType.equals(other.outputType)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @return the wrapperInfo
-     */
-    public WrapperInfo getWrapper() {
-        return wrapper;
-    }
-
-    /**
-     * @param wrapperInfo the wrapperInfo to set
-     */
-    public void setWrapper(WrapperInfo wrapperInfo) {
-        this.wrapper = wrapperInfo;
-    }
-
-    /**
-     * @return the wrapperStyle
-     */
-    public boolean isWrapperStyle() {
-        return wrapperStyle;
-    }
-
-    /**
-     * @param wrapperStyle the wrapperStyle to set
-     */
-    public void setWrapperStyle(boolean wrapperStyle) {
-        this.wrapperStyle = wrapperStyle;
-    }
-
-    public String getDataBinding() {
-        return wrapper != null ? wrapper.getDataBinding() : null;
-    }
-
-    public void setDataBinding(String dataBinding) {
-        if (wrapper != null) {
-            wrapper.setDataBinding(dataBinding);
-        }
-    }
-
-    public boolean isDynamic() {
-        return dynamic;
-    }
-
-    public void setDynamic(boolean b) {
-        this.dynamic = b;
-    }
-    
-    public Map<QName, List<DataType<XMLType>>> getFaultBeans() {
-        return faultBeans;
-    }
-    
-    public void setFaultBeans(Map<QName, List<DataType<XMLType>>> faultBeans) {
-        this.faultBeans = faultBeans;
-    }
-
-    @Override
-    public OperationImpl clone() throws CloneNotSupportedException {
-        OperationImpl copy = (OperationImpl) super.clone();
-        
-        final List<DataType> clonedFaultTypes = new ArrayList<DataType>(this.faultTypes.size());
-        for (DataType t : this.faultTypes) {
-            clonedFaultTypes.add((DataType) t.clone());
-        }
-        copy.faultTypes = clonedFaultTypes;
-
-        List<DataType> clonedLogicalTypes = new ArrayList<DataType>();
-        for (DataType t : inputType.getLogical()) {
-            DataType type = (DataType) t.clone();
-            clonedLogicalTypes.add(type);
-        }
-        DataType<List<DataType>> clonedInputType =
-            new DataTypeImpl<List<DataType>>(inputType.getPhysical(), clonedLogicalTypes);
-        clonedInputType.setDataBinding(inputType.getDataBinding());
-        copy.inputType = clonedInputType;
-        
-        if (this.outputType != null) {
-            copy.outputType = (DataType) this.outputType.clone();
-        }
-        
-        return copy;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return type;
-    }
-
-    public void setType(IntentAttachPointType type) {
-        this.type = type;
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
deleted file mode 100644
index 777fa567f1..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.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.interfacedef.util;
-
-import javax.xml.namespace.QName;
-
-/**
- * An abstraction of XML schema elements.
- *
- * @version $Rev$ $Date$
- */
-public class ElementInfo {
-    private final QName name;
-    private final TypeInfo type;
-    private boolean many = false;
-    private boolean nillable = false;
-
-    /**
-     * @param name
-     * @param type
-     */
-    public ElementInfo(QName name, TypeInfo type) {
-        super();
-        this.name = name;
-        this.type = type;
-    }
-
-    /**
-     * @return the name
-     */
-    public QName getQName() {
-        return name;
-    }
-
-    /**
-     * @return the type
-     */
-    public TypeInfo getType() {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append("Element: ").append(name).append(" ").append(type);
-        return sb.toString();
-    }
-
-    public boolean isMany() {
-        return many;
-    }
-
-    public void setMany(boolean many) {
-        this.many = many;
-    }
-
-    public boolean isNillable() {
-        return nillable;
-    }
-
-    public void setNillable(boolean nillable) {
-        this.nillable = nillable;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((type == null) ? 0 : type.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 ElementInfo other = (ElementInfo)obj;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        /*
-        if (type == null) {
-            if (other.type != null)
-                return false;
-        } else if (!type.equals(other.type))
-            return false;
-        */    
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
deleted file mode 100644
index 844b0af509..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.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.interfacedef.util;
-
-import javax.xml.namespace.QName;
-
-/**
- * The generic java exception to wrap service faults
- * 
- * @version $Rev$ $Date$
- */
-public class FaultException extends Exception {
-    private static final long serialVersionUID = -8002583655240625792L;
-    private transient Object faultInfo; // FIXME: How to serialize it?
-    private QName faultName;
-
-    /**
-     * @param message
-     * @param faultInfo
-     */
-    public FaultException(String message, Object faultInfo) {
-        super(message);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public FaultException(String message, Object faultInfo, Throwable cause) {
-        super(message, cause);
-        this.faultInfo = faultInfo;
-    }
-
-    /**
-     * @return the faultInfo
-     */
-    public Object getFaultInfo() {
-        return faultInfo;
-    }
-
-    public QName getFaultName() {
-        return faultName;
-    }
-
-    public void setFaultName(QName logical) {
-        this.faultName = logical;
-    }
-
-    public boolean isMatchingType(Object type) {
-        if (faultName == null) {
-            return false;
-        }
-
-        if ((type instanceof QName) && faultName.equals(type)) {
-            return true;
-        }
-        if (type instanceof XMLType && faultName.equals(((XMLType)type).getElementName())) {
-            return true;
-        }
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
deleted file mode 100644
index 54c0a3ec11..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.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.interfacedef.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * Utility class that can be used to map XSD types to Java classes and Java classes to XSD types.
- *
- * @version $Rev$ $Date$
- */
-public final class JavaXMLMapper {
-    public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-    private static final Map<Class, QName> JAVA2XML = new HashMap<Class, QName>();
-    private static final Map<String, Class> XML2JAVA = new HashMap<String, Class>();
-
-    private JavaXMLMapper() {
-    }
-
-    static {
-        JAVA2XML.put(boolean.class, getTypeName("boolean"));
-        JAVA2XML.put(byte.class, getTypeName("byte"));
-        JAVA2XML.put(short.class, getTypeName("short"));
-        JAVA2XML.put(int.class, getTypeName("int"));
-        JAVA2XML.put(long.class, getTypeName("long"));
-        JAVA2XML.put(float.class, getTypeName("float"));
-        JAVA2XML.put(double.class, getTypeName("double"));
-        JAVA2XML.put(Boolean.class, getTypeName("boolean"));
-        JAVA2XML.put(Byte.class, getTypeName("byte"));
-        JAVA2XML.put(Short.class, getTypeName("short"));
-        JAVA2XML.put(Integer.class, getTypeName("int"));
-        JAVA2XML.put(Long.class, getTypeName("long"));
-        JAVA2XML.put(Float.class, getTypeName("float"));
-        JAVA2XML.put(Double.class, getTypeName("double"));
-        JAVA2XML.put(java.lang.String.class, getTypeName("string"));
-        JAVA2XML.put(java.math.BigInteger.class, getTypeName("integer"));
-        JAVA2XML.put(java.math.BigDecimal.class, getTypeName("decimal"));
-        JAVA2XML.put(java.util.Calendar.class, getTypeName("dateTime"));
-        JAVA2XML.put(java.util.Date.class, getTypeName("dateTime"));
-        JAVA2XML.put(javax.xml.namespace.QName.class, getTypeName("QName"));
-        JAVA2XML.put(java.net.URI.class, getTypeName("string"));
-        JAVA2XML.put(javax.xml.datatype.XMLGregorianCalendar.class, getTypeName("anySimpleType"));
-        JAVA2XML.put(javax.xml.datatype.Duration.class, getTypeName("duration"));
-        JAVA2XML.put(java.lang.Object.class, getTypeName("anyType"));
-        JAVA2XML.put(java.awt.Image.class, getTypeName("base64Binary"));
-        JAVA2XML.put(byte[].class, getTypeName("base64Binary"));
-        // java2XSD.put(javax.activation.DataHandler.class, getTypeName("base64Binary"));
-        JAVA2XML.put(javax.xml.transform.Source.class, getTypeName("base64Binary"));
-        JAVA2XML.put(java.util.UUID.class, getTypeName("string"));
-    }
-
-    static {
-        XML2JAVA.put("string", java.lang.String.class);
-        XML2JAVA.put("integer", java.math.BigInteger.class);
-        XML2JAVA.put("int", int.class);
-        XML2JAVA.put("long", long.class);
-        XML2JAVA.put("short", short.class);
-        XML2JAVA.put("decimal", java.math.BigDecimal.class);
-        XML2JAVA.put("float", float.class);
-        XML2JAVA.put("double", double.class);
-        XML2JAVA.put("boolean", boolean.class);
-        XML2JAVA.put("byte", byte.class);
-        XML2JAVA.put("QName", javax.xml.namespace.QName.class);
-        XML2JAVA.put("dateTime", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("base64Binary", byte[].class);
-        XML2JAVA.put("hexBinary", byte[].class);
-        XML2JAVA.put("unsignedInt", long.class);
-        XML2JAVA.put("unsignedShort", int.class);
-        XML2JAVA.put("unsignedByte", short.class);
-        XML2JAVA.put("time", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("date", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gDay", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gMonth", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gYear", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gYearMonth", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("gMonthDay", javax.xml.datatype.XMLGregorianCalendar.class);
-        XML2JAVA.put("anySimpleType", java.lang.Object.class); // For elements
-        // XML2JAVA.put("anySimpleType", java.lang.String.class); // For
-        // attributes
-        XML2JAVA.put("duration", javax.xml.datatype.Duration.class);
-        XML2JAVA.put("NOTATION", javax.xml.namespace.QName.class);
-    }
-
-    public static Class getJavaType(QName xmlType) {
-        if (URI_2001_SCHEMA_XSD.equals(xmlType.getNamespaceURI())) {
-            return XML2JAVA.get(xmlType.getLocalPart());
-        } else {
-            return null;
-        }
-    }
-
-    private static QName getTypeName(String name) {
-        return new QName(URI_2001_SCHEMA_XSD, name);
-    }
-
-    public static QName getXMLType(Class javaType) {
-        return JAVA2XML.get(javaType);
-    }
-    
-    private static String getPackageName(Class<?> cls) {
-        String name = cls.getName();
-        int index = name.lastIndexOf('.');
-        return index == -1 ? "" : name.substring(0, index);
-    }
-
-    public static String getNamespace(Class<?> cls) {
-        String packageName = getPackageName(cls);
-        if ("".equals(packageName)) {
-            return "";
-        }
-        StringBuffer ns = new StringBuffer("http://");
-        String[] names = packageName.split("\\.");
-        for (int i = names.length - 1; i >= 0; i--) {
-            ns.append(names[i]);
-            if (i != 0) {
-                ns.append('.');
-            }
-        }
-        ns.append('/');
-        return ns.toString();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
deleted file mode 100644
index 2598dc8545..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.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.interfacedef.util;
-
-import javax.xml.namespace.QName;
-
-/**
- * An abstraction of XML schema types
- *
- * @version $Rev$ $Date$
- */
-public class TypeInfo {
-    private QName name;
-
-    private boolean isSimpleType;
-
-    private TypeInfo baseType;
-
-    /**
-     * @param name
-     * @param isSimpleType
-     */
-    public TypeInfo(QName name, boolean isSimpleType, TypeInfo baseType) {
-        super();
-        this.name = name;
-        this.isSimpleType = isSimpleType;
-        this.baseType = baseType;
-    }
-
-    /**
-     * @return the isSimpleType
-     */
-    public boolean isSimpleType() {
-        return isSimpleType;
-    }
-
-    /**
-     * @return the name
-     */
-    public QName getQName() {
-        return name;
-    }
-
-    /**
-     * @return the baseType
-     */
-    public TypeInfo getBaseType() {
-        return baseType;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append("Type: ").append(name);
-        return sb.toString();
-    }
-
-    @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 TypeInfo other = (TypeInfo)obj;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
deleted file mode 100644
index 12db460959..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.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.interfacedef.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-
-/**
- * The "Wrapper Style" WSDL operation is defined by The Java API for XML-Based
- * Web Services (JAX-WS) 2.0 specification, section 2.3.1.2 Wrapper Style. <p/>
- * A WSDL operation qualifies for wrapper style mapping only if the following
- * criteria are met:
- * <ul>
- * <li>(i) The operation�s input and output messages (if present) each contain
- * only a single part
- * <li>(ii) The input message part refers to a global element declaration whose
- * localname is equal to the operation name
- * <li>(iii) The output message part refers to a global element declaration
- * <li>(iv) The elements referred to by the input and output message parts
- * (henceforth referred to as wrapper elements) are both complex types defined
- * using the xsd:sequence compositor
- * <li>(v) The wrapper elements only contain child elements, they must not
- * contain other structures such as wildcards (element or attribute),
- * xsd:choice, substitution groups (element references are not permitted) or
- * attributes; furthermore, they must not be nillable.
- * </ul>
- * 
- * @version $Rev$ $Date$
- */
-public class WrapperInfo {
-    private ElementInfo inputWrapperElement;
-
-    private ElementInfo outputWrapperElement;
-
-    private List<ElementInfo> inputChildElements;
-
-    private List<ElementInfo> outputChildElements;
-
-    // The data type of the unwrapped input child elements 
-    private DataType<List<DataType>> unwrappedInputType;
-
-    // The data type of the unwrapped output child element (we only supports one child)
-    private DataType<XMLType> unwrappedOutputType;
-
-    // The data for the input/output wrappers
-    private String dataBinding;
-
-    // The data type for the input (request) wrapper bean
-    private DataType<XMLType> inputWrapperType;
-    // The data type for the output (response) wrapper bean
-    private DataType<XMLType> outputWrapperType;
-
-    public WrapperInfo(String dataBinding,
-                       ElementInfo inputWrapperElement,
-                       ElementInfo outputWrapperElement,
-                       List<ElementInfo> inputElements,
-                       List<ElementInfo> outputElements) {
-        super();
-        this.dataBinding = dataBinding;
-        this.inputWrapperElement = inputWrapperElement;
-        this.outputWrapperElement = outputWrapperElement;
-        this.inputChildElements = inputElements;
-        this.outputChildElements = outputElements;
-    }
-
-    /**
-     * @return the inputElements
-     */
-    public List<ElementInfo> getInputChildElements() {
-        return inputChildElements;
-    }
-
-    /**
-     * @return the inputWrapperElement
-     */
-    public ElementInfo getInputWrapperElement() {
-        return inputWrapperElement;
-    }
-
-    /**
-     * @return the outputElements
-     */
-    public List<ElementInfo> getOutputChildElements() {
-        return outputChildElements;
-    }
-
-    /**
-     * @return the outputWrapperElement
-     */
-    public ElementInfo getOutputWrapperElement() {
-        return outputWrapperElement;
-    }
-
-    /**
-     * @return the unwrappedInputType
-     */
-    public DataType<List<DataType>> getUnwrappedInputType() {
-        if (unwrappedInputType == null) {
-            List<DataType> childTypes = new ArrayList<DataType>();
-            for (ElementInfo element : getInputChildElements()) {
-                DataType type = getDataType(element);
-                childTypes.add(type);
-            }
-            unwrappedInputType = new DataTypeImpl<List<DataType>>("idl:unwrapped.input", Object[].class, childTypes);
-        }
-        return unwrappedInputType;
-    }
-
-    private DataType getDataType(ElementInfo element) {
-        DataType type = null;
-        if (element.isMany()) {
-            DataType logical = new DataTypeImpl<XMLType>(dataBinding, Object.class, new XMLType(element));
-            type = new DataTypeImpl<DataType>("java:array", Object[].class, logical);
-        } else {
-            type = new DataTypeImpl<XMLType>(dataBinding, Object.class, new XMLType(element));
-        }
-        return type;
-    }
-
-    /**
-     * @return the unwrappedOutputType
-     */
-    public DataType getUnwrappedOutputType() {
-        if (unwrappedOutputType == null) {
-            List<ElementInfo> elements = getOutputChildElements();
-            if (elements != null && elements.size() > 0) {
-                if (elements.size() > 1) {
-                    // We don't support output with multiple parts
-                    // throw new IllegalArgumentException("Multi-part output is not supported");
-                }
-                ElementInfo element = elements.get(0);
-
-                unwrappedOutputType = getDataType(element);
-            }
-        }
-        return unwrappedOutputType;
-    }
-
-    public Class<?> getInputWrapperClass() {
-        return inputWrapperType == null ? null : inputWrapperType.getPhysical();
-    }
-
-    public Class<?> getOutputWrapperClass() {
-        return outputWrapperType == null ? null : outputWrapperType.getPhysical();
-    }
-
-    public String getDataBinding() {
-        return dataBinding;
-    }
-
-    public void setDataBinding(String dataBinding) {
-        this.dataBinding = dataBinding;
-    }
-
-    public DataType<XMLType> getInputWrapperType() {
-        return inputWrapperType;
-    }
-
-    public void setInputWrapperType(DataType<XMLType> inputWrapperType) {
-        this.inputWrapperType = inputWrapperType;
-    }
-
-    public DataType<XMLType> getOutputWrapperType() {
-        return outputWrapperType;
-    }
-
-    public void setOutputWrapperType(DataType<XMLType> outputWrapperType) {
-        this.outputWrapperType = outputWrapperType;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
deleted file mode 100644
index 26ecf6e352..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.interfacedef.util;
-
-import javax.xml.namespace.QName;
-
-/**
- * The metadata for an XML element or type.
- *
- * @version $Rev$ $Date$
- */
-public class XMLType {
-    public static final XMLType UNKNOWN = new XMLType(null, null);
-    protected QName element;
-    protected QName type;
-    protected boolean nillable = true;
-    protected boolean many = false;
-
-    /**
-     * @param element
-     */
-    public XMLType(ElementInfo element) {
-        super();
-        this.element = element.getQName();
-        if (element.getType() != null) {
-            this.type = element.getType().getQName();
-        }
-    }
-
-    /**
-     * @param element
-     */
-    public XMLType(TypeInfo type) {
-        this.element = null;
-        this.type = type.getQName();
-    }
-
-    public XMLType(QName element, QName type) {
-        this.element = element;
-        this.type = type;
-    }
-
-    /**
-     * @return the type
-     */
-    public QName getTypeName() {
-        return type;
-    }
-
-    public boolean isElement() {
-        return element != null;
-    }
-
-    public QName getElementName() {
-        return element;
-    }
-
-    public void setElementName(QName element) {
-        this.element = element;
-    }
-
-    public void setTypeName(QName type) {
-        this.type = type;
-    }
-
-    public static XMLType getType(QName type) {
-        return new XMLType(null, type);
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((element == null) ? 0 : element.hashCode());
-        result = PRIME * result + ((type == null) ? 0 : type.hashCode());
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final XMLType other = (XMLType)obj;
-        if (element == null) {
-            if (other.element != null) {
-                return false;
-            }
-        } else if (!element.equals(other.element)) {
-            return false;
-        }
-        if (type == null) {
-            if (other.type != null) {
-                return false;
-            }
-        } else if (!type.equals(other.type)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "Element: " + element + " Type: " + type;
-    }
-
-    public boolean isNillable() {
-        return nillable;
-    }
-
-    public void setNillable(boolean niable) {
-        this.nillable = niable;
-    }
-
-    public boolean isMany() {
-        return many;
-    }
-
-    public void setMany(boolean many) {
-        this.many = many;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/tags/java/sca/1.3/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
deleted file mode 100644
index 821c58bde1..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ /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.interfacedef.impl.InterfaceContractMapperImpl

diff --git a/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
deleted file mode 100644
index 269a3dc038..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.interfacedef.impl;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-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.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.IncompatibleInterfaceContractException;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-
-/**
- * TODO some tests commented out due to DataType.equals() needing to be strict
- * 
- * @version $Rev$ $Date$
- */
-public class ContractCompatibilityTestCase extends TestCase {
-
-    private InterfaceContractMapper mapper;
-    
-    @Override
-    protected void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        mapper = utilities.getUtility(InterfaceContractMapper.class);
-    }
-
-    public void testNoOperation() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        InterfaceContract target = new MockContract("FooContract");
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    public void testBasic() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        Operation opSource1 = newOperation("op1");
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-        InterfaceContract target = new MockContract("FooContract");
-        Operation opSource2 = newOperation("op1");
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opSource2);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    public void testBasicIncompatibleOperationNames() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        Operation opSource1 = newOperation("op1");
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-        InterfaceContract target = new MockContract("FooContract");
-        Operation opSource2 = newOperation("op2");
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op2", opSource2);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        try {
-            mapper.checkCompatibility(source, target, false, false);
-            fail();
-        } catch (IncompatibleInterfaceContractException e) {
-            // expected
-        }
-    }
-
-    public void testInputTypes() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        List<DataType> sourceInputTypes = new ArrayList<DataType>();
-        sourceInputTypes.add(new DataTypeImpl<Type>(Object.class, Object.class));
-        DataType<List<DataType>> inputType = new DataTypeImpl<List<DataType>>(String.class, sourceInputTypes);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setInputType(inputType);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        List<DataType> targetInputTypes = new ArrayList<DataType>();
-        targetInputTypes.add(new DataTypeImpl<Type>(Object.class, Object.class));
-        DataType<List<DataType>> targetInputType = new DataTypeImpl<List<DataType>>(String.class, targetInputTypes);
-
-        Operation opTarget = newOperation("op1");
-        opTarget.setInputType(targetInputType);
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    public void testIncompatibleInputTypes() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        List<DataType> sourceInputTypes = new ArrayList<DataType>();
-        sourceInputTypes.add(new DataTypeImpl<Type>(Integer.class, Integer.class));
-        DataType<List<DataType>> inputType = new DataTypeImpl<List<DataType>>(String.class, sourceInputTypes);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setInputType(inputType);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        List<DataType> targetInputTypes = new ArrayList<DataType>();
-        targetInputTypes.add(new DataTypeImpl<Type>(String.class, String.class));
-        DataType<List<DataType>> targetInputType = new DataTypeImpl<List<DataType>>(String.class, targetInputTypes);
-
-        Operation opTarget = newOperation("op1");
-        opTarget.setInputType(targetInputType);
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        try {
-            mapper.checkCompatibility(source, target, false, false);
-            fail();
-        } catch (IncompatibleInterfaceContractException e) {
-            // expected
-        }
-    }
-
-    /**
-     * Verfies source input types can be super types of the target
-     */
-    public void testSourceSuperTypeInputCompatibility() throws Exception {
-        // InterfaceContract source = new MockContract("FooContract");
-        // List<DataType> sourceInputTypes = new ArrayList<DataType>();
-        // sourceInputTypes.add(new DataTypeImpl<Type>(Object.class,
-        // Object.class));
-        // DataType<List<DataType>> inputType = new
-        // DataTypeImpl<List<DataType>>(String.class, sourceInputTypes);
-        // Operation opSource1 = newOperationImpl("op1", inputType, null, null,
-        // false, null);
-        // Map<String, Operation> sourceOperations = new HashMap<String,
-        // Operation>();
-        // sourceOperations.put("op1", opSource1);
-        // source.getInterface().getOperations().addAll(sourceOperations.values());
-        //
-        // InterfaceContract target = new MockContract("FooContract");
-        // List<DataType> targetInputTypes = new ArrayList<DataType>();
-        // targetInputTypes.add(new DataTypeImpl<Type>(String.class,
-        // String.class));
-        // DataType<List<DataType>> targetInputType =
-        // new DataTypeImpl<List<DataType>>(String.class, targetInputTypes);
-        //
-        // Operation opTarget = newOperationImpl("op1", targetInputType, null,
-        // null, false, null);
-        // Map<String, Operation> targetOperations = new HashMap<String,
-        // Operation>();
-        // targetOperations.put("op1", opTarget);
-        // target.getInterface().getOperations().addAll(targetOperations.values());
-        // wireService.checkCompatibility(source, target, false);
-    }
-
-    public void testOutputTypes() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        DataType sourceOutputType = new DataTypeImpl<Type>(String.class, String.class);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setOutputType(sourceOutputType);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        DataType targetOutputType = new DataTypeImpl<Type>(String.class, String.class);
-        Operation opTarget = newOperation("op1");
-        opTarget.setOutputType(targetOutputType);
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    /**
-     * Verifies a return type that is a supertype of of the target is compatible
-     */
-    public void testSupertypeOutputTypes() throws Exception {
-        // InterfaceContract source = new MockContract("FooContract");
-        // DataType sourceOutputType = new DataTypeImpl<Type>(Object.class,
-        // Object.class);
-        // Operation opSource1 = newOperationImpl("op1", null,
-        // sourceOutputType, null, false, null);
-        // Map<String, Operation> sourceOperations = new HashMap<String,
-        // Operation>();
-        // sourceOperations.put("op1", opSource1);
-        // source.getInterface().getOperations().addAll(sourceOperations.values());
-        //
-        // InterfaceContract target = new MockContract("FooContract");
-        // DataType targetOutputType = new DataTypeImpl<Type>(String.class,
-        // String.class);
-        // Operation opTarget = newOperationImpl("op1", null, targetOutputType,
-        // null, false, null);
-        // Map<String, Operation> targetOperations = new HashMap<String,
-        // Operation>();
-        // targetOperations.put("op1", opTarget);
-        // target.getInterface().getOperations().addAll(targetOperations.values());
-        // wireService.checkCompatibility(source, target, false);
-    }
-
-    public void testIncompatibleOutputTypes() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        DataType sourceOutputType = new DataTypeImpl<Type>(String.class, String.class);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setOutputType(sourceOutputType);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        DataType targetOutputType = new DataTypeImpl<Type>(Integer.class, Integer.class);
-        Operation opTarget = newOperation("op1");
-        opTarget.setOutputType(targetOutputType);
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        try {
-            mapper.checkCompatibility(source, target, false, false);
-            fail();
-        } catch (IncompatibleInterfaceContractException e) {
-            // expected
-        }
-    }
-
-    public void testFaultTypes() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        DataType sourceFaultType = new DataTypeImpl<Type>(String.class, String.class);
-        List<DataType> sourceFaultTypes = new ArrayList<DataType>();
-        sourceFaultTypes.add(0, sourceFaultType);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setFaultTypes(sourceFaultTypes);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        DataType targetFaultType = new DataTypeImpl<Type>(String.class, String.class);
-        List<DataType> targetFaultTypes = new ArrayList<DataType>();
-        targetFaultTypes.add(0, targetFaultType);
-
-        Operation opTarget = newOperation("op1");
-        opTarget.setFaultTypes(targetFaultTypes);
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    public void testSourceFaultTargetNoFaultCompatibility() throws Exception {
-        InterfaceContract source = new MockContract("FooContract");
-        DataType sourceFaultType = new DataTypeImpl<Type>(String.class, String.class);
-        List<DataType> sourceFaultTypes = new ArrayList<DataType>();
-        sourceFaultTypes.add(0, sourceFaultType);
-        Operation opSource1 = newOperation("op1");
-        opSource1.setFaultTypes(sourceFaultTypes);
-        Map<String, Operation> sourceOperations = new HashMap<String, Operation>();
-        sourceOperations.put("op1", opSource1);
-        source.getInterface().getOperations().addAll(sourceOperations.values());
-
-        InterfaceContract target = new MockContract("FooContract");
-        Operation opTarget = newOperation("op1");
-        Map<String, Operation> targetOperations = new HashMap<String, Operation>();
-        targetOperations.put("op1", opTarget);
-        target.getInterface().getOperations().addAll(targetOperations.values());
-        mapper.checkCompatibility(source, target, false, false);
-    }
-
-    /**
-     * Verifies a source's fault which is a supertype of the target's fault are
-     * compatible
-     * 
-     * @throws Exception
-     */
-    public void testFaultSuperTypes() throws Exception {
-        // InterfaceContract source = new MockContract("FooContract");
-        // DataType sourceFaultType = new DataTypeImpl<Type>(Exception.class,
-        // Exception.class);
-        // List<DataType> sourceFaultTypes = new ArrayList<DataType>();
-        // sourceFaultTypes.add(0, sourceFaultType);
-        // Operation opSource1 = newOperationImpl("op1", null, null,
-        // sourceFaultTypes, false, null);
-        // Map<String, Operation> sourceOperations = new HashMap<String,
-        // Operation>();
-        // sourceOperations.put("op1", opSource1);
-        // source.getInterface().getOperations().addAll(sourceOperations.values());
-        //
-        // InterfaceContract target = new MockContract("FooContract");
-        // DataType targetFaultType = new
-        // DataTypeImpl<Type>(TuscanyException.class, TuscanyException.class);
-        // List<DataType> targetFaultTypes = new ArrayList<DataType>();
-        // targetFaultTypes.add(0, targetFaultType);
-        //
-        // Operation opTarget = newOperationImpl("op1", null, null,
-        // targetFaultTypes, false, null);
-        // Map<String, Operation> targetOperations = new HashMap<String,
-        // Operation>();
-        // targetOperations.put("op1", opTarget);
-        // target.getInterface().getOperations().addAll(targetOperations.values());
-        // wireService.checkCompatibility(source, target, false);
-    }
-
-    /**
-     * Verifies a source's faults which are supertypes and a superset of the
-     * target's faults are compatible
-     */
-    public void testFaultSuperTypesAndSuperset() throws Exception {
-        // InterfaceContract source = new MockContract("FooContract");
-        // DataType sourceFaultType = new DataTypeImpl<Type>(Exception.class,
-        // Exception.class);
-        // DataType sourceFaultType2 = new
-        // DataTypeImpl<Type>(RuntimeException.class, RuntimeException.class);
-        // List<DataType> sourceFaultTypes = new ArrayList<DataType>();
-        // sourceFaultTypes.add(0, sourceFaultType);
-        // sourceFaultTypes.add(1, sourceFaultType2);
-        // Operation opSource1 = newOperationImpl("op1", null, null,
-        // sourceFaultTypes, false, null);
-        // Map<String, Operation> sourceOperations = new HashMap<String,
-        // Operation>();
-        // sourceOperations.put("op1", opSource1);
-        // source.getInterface().getOperations().addAll(sourceOperations.values());
-        //
-        // InterfaceContract target = new MockContract("FooContract");
-        // DataType targetFaultType = new
-        // DataTypeImpl<Type>(TuscanyException.class, TuscanyException.class);
-        // List<DataType> targetFaultTypes = new ArrayList<DataType>();
-        // targetFaultTypes.add(0, targetFaultType);
-        //
-        // Operation opTarget = newOperationImpl("op1", null, null,
-        // targetFaultTypes, false, null);
-        // Map<String, Operation> targetOperations = new HashMap<String,
-        // Operation>();
-        // targetOperations.put("op1", opTarget);
-        // target.getInterface().getOperations().addAll(targetOperations.values());
-        // wireService.checkCompatibility(source, target, false);
-    }
-
-    private static class MockInterface extends InterfaceImpl {
-
-    }
-
-    private class MockContract<T> extends InterfaceContractImpl {
-        public MockContract() {
-        }
-
-        public MockContract(String interfaceClass) {
-            Interface jInterface = new MockInterface();
-            setInterface(jInterface);
-        }
-    }
-
-    private static Operation newOperation(String name) {
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-        return operation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
deleted file mode 100644
index 338170da52..0000000000
--- a/tags/java/sca/1.3/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.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.interfacedef.impl;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class InterfaceContractTestCase {
-    private InterfaceContract contract;
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        contract = new MockInterfaceContract();
-        Interface i1 = new MockInterface();
-        contract.setInterface(i1);
-        Operation op1 = newOperation("op1");
-        i1.getOperations().add(op1);
-        Interface i2 = new MockInterface();
-        contract.setCallbackInterface(i2);
-        Operation callbackOp1 = newOperation("callbackOp1");
-        i2.getOperations().add(callbackOp1);
-    }
-    
-    @Test
-    public void testClone() throws Exception {
-        InterfaceContract copy = (InterfaceContract) contract.clone();
-        Assert.assertEquals(contract, copy);
-    }
-
-    private static class MockInterfaceContract extends InterfaceContractImpl implements InterfaceContract {
-    }
-
-    private static class MockInterface extends InterfaceImpl implements Interface {
-    }
-
-    private static Operation newOperation(String name) {
-        Operation operation = new OperationImpl();
-        operation.setName(name);
-        return operation;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/monitor-logging/LICENSE b/tags/java/sca/1.3/modules/monitor-logging/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/monitor-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/tags/java/sca/1.3/modules/monitor-logging/NOTICE b/tags/java/sca/1.3/modules/monitor-logging/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/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/tags/java/sca/1.3/modules/monitor-logging/pom.xml b/tags/java/sca/1.3/modules/monitor-logging/pom.xml
deleted file mode 100644
index 0f3f8c4812..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-monitor-logging</artifactId>
-    <name>Apache Tuscany SCA Monitor Default Logging Implementation</name>
-
-    <dependencies>   
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</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.monitor.logging</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.monitor*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java b/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.java
deleted file mode 100644
index d4dc3d2be4..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/DefaultLoggingMonitorImpl.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.monitor.logging.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-
-/**
- * A monitor for the watching for validation problems
- *
- * @version $Rev$ $Date$
- */
-public class DefaultLoggingMonitorImpl implements Monitor {
-    private static final Logger logger = Logger.getLogger(DefaultLoggingMonitorImpl.class.getName());
-
-    // Cache all the problem reported to monitor for further analysis
-    private List<Problem> problemCache = new ArrayList<Problem>();
-
-    public void problem(Problem problem) {
-        
-        Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName());
-        
-        if (problemLogger == null){
-            logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName());
-        }
-        
-        if (problem.getSeverity() == Severity.INFO) {
-            problemCache.add(problem);
-            problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, 
-                                  problem.getMessageId(), problem.getMessageParams());
-        } 
-        else if (problem.getSeverity() == Severity.WARNING) {
-            problemCache.add(problem);
-            problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, 
-                                  problem.getMessageId(), problem.getMessageParams());
-        } 
-        else if (problem.getSeverity() == Severity.ERROR) {
-            if (problem.getCause() != null) {
-                problemCache.add(problem);
-                problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), 
-                                    null, problem.getMessageId(), problem.getCause().toString());
-            } else {
-                problemCache.add(problem);
-                problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, 
-                                   problem.getMessageId(), problem.getMessageParams());
-            }
-        }
-    }
-    
-    public List<Problem> getProblems(){
-        return problemCache;
-    }
-    
-    public Problem getLastLoggedProblem(){
-        return problemCache.get(problemCache.size() - 1);
-    }
-    
-    public boolean isMessageLogged(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    public Problem getProblem(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return problem;
-            }
-        }
-        
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java b/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.java
deleted file mode 100644
index a3162a3267..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/main/java/org/apache/tuscany/sca/monitor/logging/impl/MonitorFactoryImpl.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.monitor.logging.impl;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-
-
-/**
- * A factory for creating validation monitors
- *
- * @version $Rev$ $Date$
- */
-public class MonitorFactoryImpl implements MonitorFactory {
-    
-    private Monitor monitor = null;
-
-    public Monitor createMonitor() {
-        if (monitor == null){
-            monitor = new DefaultLoggingMonitorImpl();
-        }
-        return monitor ;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/tags/java/sca/1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
deleted file mode 100644
index b46d552fb5..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ /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.monitor.logging.impl.MonitorFactoryImpl

diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/tags/java/sca/1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
deleted file mode 100644
index c5fa6c4da6..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.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.monitor;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.logging.impl.MonitorFactoryImpl;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Loads a monitor and adds some problems to it.
- *
- * @version $Rev$ $Date$
- */
-public class MonitorTestCase {
-    
-    private static MonitorFactory monitorFactory;
-    
-    @BeforeClass
-    public static void init() throws Exception {
-        monitorFactory = new MonitorFactoryImpl();        
-    }
-    
-    @AfterClass
-    public static void destroy() throws Exception {
-        monitorFactory = null;
-    }
-    
-    @Test
-    public void testCreateProblem() throws Exception {  
-        String dummyModelObject = "DUMMY MODEL OBJECT";
-        
-        Monitor monitor = monitorFactory.createMonitor();
-        
-        Problem problem = null;
-        
-        problem = new ProblemImpl(this.getClass().getName(), 
-                                  "tuscany-monitor-test-messages", 
-                                  Severity.WARNING, 
-                                  dummyModelObject, 
-                                  "MESSAGE1" );
-        monitor.problem(problem);
-        
-        String param = "Some Parameter";
-        
-        problem = new ProblemImpl(this.getClass().getName(), 
-                                  "tuscany-monitor-test-messages", 
-                                  Severity.WARNING, 
-                                  dummyModelObject, 
-                                  "MESSAGE2",
-                                  param);
-        monitor.problem(problem);
-        
-        problem = new ProblemImpl(this.getClass().getName(), 
-                                  "tuscany-monitor-test-messages", 
-                                  Severity.WARNING, 
-                                  dummyModelObject, 
-                                  "MESSAGE3",
-                                  8, 
-                                  9, 
-                                  4);
-        monitor.problem(problem);
-        
-        Exception ex = new IllegalStateException("TEST_MESSAGE");
-        
-        problem = new ProblemImpl(this.getClass().getName(), 
-                                  "tuscany-monitor-test-messages", 
-                                  Severity.ERROR, 
-                                  dummyModelObject, 
-                                  "MESSAGE4",
-                                  ex);
-        monitor.problem(problem);          
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties b/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties
deleted file mode 100644
index 523263da40..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages.properties
+++ /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.
-#
-#
-MESSAGE1 = This is a test message with no params
-MESSAGE2 = This is a test message with a string param {0}
-MESSAGE3 = This is a test message with numbers {0}, {1}, {2}
-MESSAGE4 = This is a test message with exception 
diff --git a/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties b/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties
deleted file mode 100644
index 523263da40..0000000000
--- a/tags/java/sca/1.3/modules/monitor-logging/src/test/resources/tuscany-monitor-test-messages_it.properties
+++ /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.
-#
-#
-MESSAGE1 = This is a test message with no params
-MESSAGE2 = This is a test message with a string param {0}
-MESSAGE3 = This is a test message with numbers {0}, {1}, {2}
-MESSAGE4 = This is a test message with exception 
diff --git a/tags/java/sca/1.3/modules/monitor/LICENSE b/tags/java/sca/1.3/modules/monitor/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/monitor/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/tags/java/sca/1.3/modules/monitor/NOTICE b/tags/java/sca/1.3/modules/monitor/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/monitor/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/tags/java/sca/1.3/modules/monitor/pom.xml b/tags/java/sca/1.3/modules/monitor/pom.xml
deleted file mode 100644
index 0e933599c7..0000000000
--- a/tags/java/sca/1.3/modules/monitor/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-monitor</artifactId>
-    <name>Apache Tuscany SCA Monitor</name>
-
-    <dependencies>   
-
- 
-    </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.monitor</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.monitor*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
deleted file mode 100644
index c16140213d..0000000000
--- a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.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.monitor;
-
-import java.util.List;
-
-/**
- * A monitor for the watching for validation problems
- *
- * @version $Rev$ $Date$
- */
-public interface Monitor {
-    /**
-     * Reports a build problem.
-     * 
-     * @param problem
-     */
-    void problem(Problem problem);
-    
-    /** 
-     * Returns a list of reported problems. 
-     * 
-     * @return the list of problems. The list may be empty
-     */
-    List<Problem> getProblems();
-    
-}
diff --git a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
deleted file mode 100644
index 38c3bbd991..0000000000
--- a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.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.monitor;
-
-/**
- * A factory for validation monitors
- * 
- * @version $Rev$ $Date$
- */
-public interface MonitorFactory {
-
-    /**
-     * Create a new monitor
-     * 
-     * @return a new monitor
-     */
-    Monitor createMonitor();
-    
-}
diff --git a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
deleted file mode 100644
index 83a2d63eae..0000000000
--- a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.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.monitor;
-
-
-/**
- * Records an validation problem. 
- *
- * @version $Rev$ $Date$
- */
-public interface Problem {
-    
-    public enum Severity {
-        INFO,
-        WARNING,
-        ERROR
-    }
-    
-    String getSourceClassName();
-    
-    String getBundleName();
-    
-    Severity getSeverity();    
-    
-    Object getProblemObject();
-    
-    String getMessageId();
-    
-    Exception getCause();
-    
-    Object[] getMessageParams();
-}
diff --git a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
deleted file mode 100644
index 274b4faefd..0000000000
--- a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.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.monitor.impl;
-
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-
-
-/**
- * A factory for creating validation monitors
- *
- * @version $Rev$ $Date$
- */
-public class DefaultMonitorFactoryImpl implements MonitorFactory {
-    
-    private Monitor monitor = null;
-
-    public Monitor createMonitor() {
-        if (monitor == null){
-            monitor = new DefaultMonitorImpl();
-        }
-        return monitor ;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
deleted file mode 100644
index b98f29d4dd..0000000000
--- a/tags/java/sca/1.3/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.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.monitor.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- * A monitor for the watching for validation problems
- *
- * @version $Rev$ $Date$
- */
-public class DefaultMonitorImpl implements Monitor {
-    private static final Logger logger = Logger.getLogger(DefaultMonitorImpl.class.getName());
-    
-    // Cache all the problem reported to monitor for further analysis
-    private List<Problem> problemCache = new ArrayList<Problem>();
-
-    public void problem(Problem problem) {
-        
-        Logger problemLogger = Logger.getLogger(problem.getSourceClassName(), problem.getBundleName());
-        
-        if (problemLogger == null){
-            logger.severe("Can't get logger " + problem.getSourceClassName()+ " with bundle " + problem.getBundleName());
-        }
-        
-        if (problem.getSeverity() == Severity.INFO) {
-        	problemCache.add(problem);
-            problemLogger.logp(Level.INFO, problem.getSourceClassName(), null, 
-            		              problem.getMessageId(), problem.getMessageParams());
-        } 
-        else if (problem.getSeverity() == Severity.WARNING) {
-            problemCache.add(problem);
-            problemLogger.logp(Level.WARNING, problem.getSourceClassName(), null, 
-            		              problem.getMessageId(), problem.getMessageParams());
-        } 
-        else if (problem.getSeverity() == Severity.ERROR) {
-            if (problem.getCause() != null) {
-                problemCache.add(problem);
-                problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), 
-                    		        null, problem.getMessageId(), problem.getCause().toString());
-
-            } else {
-                problemCache.add(problem);
-                problemLogger.logp(Level.SEVERE, problem.getSourceClassName(), null, 
-                		           problem.getMessageId(), problem.getMessageParams());
-            }
-        }
-    }
-    
-    public List<Problem> getProblems(){
-        return problemCache;
-    }
-    
-    public Problem getLastLoggedProblem(){
-        return problemCache.get(problemCache.size() - 1);
-    }
-    
-    public boolean isMessageLogged(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    public Problem getProblem(String messageId) {
-        for (Problem problem : problemCache){
-            if (problem.getMessageId().equals(messageId)){
-                return problem;
-            }
-        }
-        
-        return null;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-api/LICENSE b/tags/java/sca/1.3/modules/node2-api/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-api/NOTICE b/tags/java/sca/1.3/modules/node2-api/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/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/tags/java/sca/1.3/modules/node2-api/pom.xml b/tags/java/sca/1.3/modules/node2-api/pom.xml
deleted file mode 100644
index 349d142e6c..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/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-modules</artifactId>

-        <version>1.3</version>

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

-    </parent>

-

-    <artifactId>tuscany-node2-api</artifactId>

-    <name>Apache Tuscany SCA Node API</name>

-

-    <dependencies>   

-        <dependency>

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

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>1.3</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.node2.api</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.node*</Export-Package>

-                        <DynamicImport-Package>org.apache.tuscany.sca.node.impl</DynamicImport-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
deleted file mode 100644
index f390e8881e..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.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.node;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-
-
-/**
- * Provides client access to the services in a domain.
- *
- * @version $Rev$ $Date$
- */
-public interface SCAClient {
-
-    /**
-     * Cast a type-safe reference to a CallahbleReference. 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 service provided by a component in the SCA domain.
-     *
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return an object that implements the business interface
-     */
-    <B> B getService(Class<B> businessInterface, String serviceName);
-
-    /**
-     * Returns a ServiceReference for a service provided by a component in the
-     * SCA domain.
-     *
-     * @param businessInterface the interface that will be used to invoke the
-     *            service
-     * @param serviceName the name of the service
-     * @param <B> the Java type of the business interface for the service
-     * @return a ServiceReference for the designated service
-     */
-    <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName);
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java b/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
deleted file mode 100644
index de7f352122..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.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.node;
-
-/**
- * Represents an SCA contribution uri + location.
- */
-public final class SCAContribution {
-    private String uri;
-    private String location;
-    
-    /**
-     * Constructs a new SCA contribution.
-     * 
-     * @param uri The URI that uniquely identifies the contribution in the SCA domain
-     * @param location The URL of the contribution archive
-     */
-    public SCAContribution(String uri, String location) {
-        this.uri = uri;
-        this.location = location;
-    }
-    
-    /**
-     * Get the URI of the contribution
-     * @return The URI that uniquely identifies the contribution in the SCA domain
-     */
-    public String getURI() {
-        return uri;
-    }
-    
-    /**
-     * The location of the contribution
-     * @return The URL of the contribution archive
-     */
-    public String getLocation() {
-        return location;
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
deleted file mode 100644
index c193467b09..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.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.node;
-
-
-
-/**
- * Represents an SCA processing node.
- * A node is loaded with an SCA composites. It can start and stop that composite.
- *
- * @version $Rev$ $Date$
- */
-public interface SCANode2 {
-
-    /**
-     * Start the composite loaded in the node.
-     */
-    void start();
-
-    /**
-     * Stop the composite loaded in the node.
-     */
-    void stop();
-
-}
diff --git a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
deleted file mode 100644
index 35ffbc4024..0000000000
--- a/tags/java/sca/1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.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.node;
-
-import java.lang.reflect.Constructor;
-
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A factory for SCA processing nodes. An SCA processing node can be loaded
- * with an SCA composite and the SCA contributions required by the composite.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class SCANode2Factory {
-    
-        
-    /**
-     * Returns a new SCA node factory instance.
-     *  
-     * @return a new SCA node factory
-     */
-    public static SCANode2Factory newInstance() {
-        SCANode2Factory scaNodeFactory = null;
-        
-        try {
-            final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            String className =  "org.apache.tuscany.sca.node.impl.NodeFactoryImpl";  
-                            
-            Class<?> cls = Class.forName(className, true, classLoader);
-            
-            Constructor<?> constructor = null;
-            
-            try {
-                constructor = cls.getConstructor();
-            } catch (NoSuchMethodException e) {
-                // ignore
-            }
-            
-            if (constructor != null) {
-                scaNodeFactory = (SCANode2Factory)constructor.newInstance();
-            } 
-            
-            return scaNodeFactory;
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }  
-    }
-
-    /**
-     * Create a SCA node based on the discovery of the contribution on the classpath for the 
-     * given classloader. This method should be treated a convinient shortcut with the following
-     * assumptions:
-     * <ul>
-     * <li>This is a standalone application and there is a deployable composite file on the classpath.
-     * <li>There is only one contribution which contains the deployable composite file physically in its packaging hierarchy.
-     * </ul> 
-     * @param compositeURI The URI of the composite file relative to the root of the enclosing contribution
-     * @param classLoader The ClassLoader used to load the composite file as a resource. If the value is null,
-     * then thread context classloader will be used
-     * @return A newly created SCA node
-     */
-    public abstract SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader);
-    
-    /**
-     * Creates a new SCA node from the configuration URL
-     * 
-     * @param configurationURL the URL of the node configuration which is the ATOM feed
-     * that contains the URI of the composite and a collection of URLs for the contributions
-     *  
-     * @return a new SCA node.
-     */
-    public abstract SCANode2 createSCANodeFromURL(String configurationURL);
-
-    /**
-     * Creates a new SCA node.
-     * 
-     * @param compositeURI the URI of the composite to use 
-     * @param contributions the URI of the contributions that provides the composites and related 
-     * artifacts. If the list is empty, then we will use the thread context classloader to discover
-     * the contribution on the classpath
-     *   
-     * @return a new SCA node.
-     */
-    public abstract SCANode2 createSCANode(String compositeURI, SCAContribution... contributions);
-
-    /**
-     * Creates a new SCA node.
-     * 
-     * @param compositeURI the URI of the composite to use 
-     * @param compositeContent the XML content of the composite to use 
-     * @param contributions the URI of the contributions that provides the composites and related artifacts 
-     * @return a new SCA node.
-     */
-    public abstract SCANode2 createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions);
-    
-}
diff --git a/tags/java/sca/1.3/modules/node2-impl/LICENSE b/tags/java/sca/1.3/modules/node2-impl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-impl/NOTICE b/tags/java/sca/1.3/modules/node2-impl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/node2-impl/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/tags/java/sca/1.3/modules/node2-impl/pom.xml b/tags/java/sca/1.3/modules/node2-impl/pom.xml
deleted file mode 100644
index 78e0d6ef5a..0000000000
--- a/tags/java/sca/1.3/modules/node2-impl/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node2-impl</artifactId>
-    <name>Apache Tuscany SCA Node Implementation</name>
-
-    <dependencies>
- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>          
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-            <scope>runtime</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.node2.impl</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/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
deleted file mode 100644
index b032a4fb9a..0000000000
--- a/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.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.node.impl;
-
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-
-/**
- * Default implementation of an SCA node factory.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeFactoryImpl extends SCANode2Factory {
-    public NodeFactoryImpl() {
-    }
-    
-    @Override
-    public SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader) {
-        return new NodeImpl(classLoader, compositeURI);
-    }
-
-    @Override
-    public SCANode2 createSCANodeFromURL(String configurationURI) {
-        return new NodeImpl(configurationURI);
-    }
-    
-    @Override
-    public SCANode2 createSCANode(String compositeURI, SCAContribution... contributions) {
-        return new NodeImpl(compositeURI, contributions);
-    }
-
-    @Override
-    public SCANode2 createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions) {
-        return new NodeImpl(compositeURI, compositeContent, contributions);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
deleted file mode 100644
index 5d20d4e893..0000000000
--- a/tags/java/sca/1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-* 
-*   http://www.apache.org/licenses/LICENSE-2.0
-* 
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* 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.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-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.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
-import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
-import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
-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.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * A local representation of the SCADomain running on a single node
- * 
- * @version $Rev$ $Date$
- */
-public class NodeImpl implements SCANode2, SCAClient {
-
-    private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
-
-    // The node configuration name, used for logging
-    private String configurationName;
-
-    // The Tuscany runtime that does the hard work
-    private ReallySmallRuntime runtime;
-    private CompositeActivator compositeActivator;
-    private XMLInputFactory inputFactory;
-    private ModelFactoryExtensionPoint modelFactories;
-    private StAXArtifactProcessorExtensionPoint artifactProcessors;
-    private Monitor monitor;
-
-    private ContributionMetadata metadata;
-
-    // The composite loaded into this node
-    private Composite composite;
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param configuration the the node configuration information.
-     */
-    NodeImpl(ConfiguredNodeImplementation configuration) {
-        configurationName = configuration.getURI();
-        logger.log(Level.INFO, "Creating node: " + configuration.getURI());
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            URL configurationURL = new URL(configuration.getURI());
-
-            // Resolve contribution URLs
-            for (Contribution contribution : configuration.getContributions()) {
-                URL contributionURL = new URL(configurationURL, contribution.getLocation());
-                contribution.setLocation(contributionURL.toString());
-            }
-
-            // Resolve composite URL
-            URL compositeURL = new URL(configurationURL, configuration.getComposite().getURI());
-            configuration.getComposite().setURI(compositeURL.toString());
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param configurationURI the URI of the node configuration information.
-     */
-    NodeImpl(String configurationURI) {
-        configurationName = configurationURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            // Read the node configuration feed
-            StAXArtifactProcessor<ConfiguredNodeImplementation> configurationProcessor =
-                artifactProcessors.getProcessor(ConfiguredNodeImplementation.class);
-            URL configurationURL = new URL(configurationURI);
-            InputStream is = configurationURL.openStream();
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            reader.nextTag();
-            ConfiguredNodeImplementation configuration = configurationProcessor.read(reader);
-            is.close();
-
-            // Resolve contribution URLs
-            for (Contribution contribution : configuration.getContributions()) {
-                URL contributionURL = new URL(configurationURL, contribution.getLocation());
-                contribution.setLocation(contributionURL.toString());
-            }
-
-            // Resolve composite URL
-            URL compositeURL = new URL(configurationURL, configuration.getComposite().getURI());
-            configuration.getComposite().setURI(compositeURL.toString());
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    NodeImpl(ClassLoader classLoader, String compositeURI) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            ConfiguredNodeImplementation config = findNodeConfiguration(compositeURI, classLoader);
-            configureNode(config);
-        } catch (Throwable e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private ConfiguredNodeImplementation findNodeConfiguration(final String compositeURI, ClassLoader classLoader)
-        throws Exception {
-        NodeImplementationFactory nodeImplementationFactory =
-            modelFactories.getFactory(NodeImplementationFactory.class);
-        ConfiguredNodeImplementation config = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-        if (classLoader == null) {
-            classLoader = Thread.currentThread().getContextClassLoader();
-        }
-        String contributionArtifactPath = compositeURI;
-        URL contributionArtifactURL = null;
-        if (compositeURI != null) {
-            contributionArtifactURL = getResource(classLoader, compositeURI);
-            if (contributionArtifactURL == null) {
-                throw new IllegalArgumentException("Composite not found: " + contributionArtifactPath);
-            }
-            composite = createComposite(contributionArtifactURL.toString());
-            config.setComposite(composite);
-        } else {
-
-            // Here the SCADomain was started without any reference to a composite file
-            // We are going to look for an sca-contribution.xml or sca-contribution-generated.xml
-
-            // Look for META-INF/sca-contribution.xml
-            contributionArtifactPath = Contribution.SCA_CONTRIBUTION_META;
-            contributionArtifactURL = getResource(classLoader, contributionArtifactPath);
-
-            // Look for META-INF/sca-contribution-generated.xml
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_GENERATED_META;
-                contributionArtifactURL = getResource(classLoader, contributionArtifactPath);
-            }
-
-            // Look for META-INF/sca-deployables directory
-            if (contributionArtifactURL == null) {
-                contributionArtifactPath = Contribution.SCA_CONTRIBUTION_DEPLOYABLES;
-                contributionArtifactURL = getResource(classLoader, contributionArtifactPath);
-            } else {
-                StAXArtifactProcessor<ContributionMetadata> processor =
-                    artifactProcessors.getProcessor(ContributionMetadata.class);
-                XMLStreamReader reader = inputFactory.createXMLStreamReader(contributionArtifactURL.openStream());
-                metadata = processor.read(reader);
-                reader.close();
-                if (metadata.getDeployables().isEmpty()) {
-                    throw new IllegalArgumentException(
-                                                       "No deployable composite is declared in " + contributionArtifactPath);
-                }
-            }
-        }
-
-        if (contributionArtifactURL == null) {
-            throw new IllegalArgumentException(
-                                               "Can't determine contribution deployables. Either specify a composite file, or use an sca-contribution.xml file to specify the deployables.");
-        }
-
-        Contribution c = getContribution(contributionArtifactURL, contributionArtifactPath);
-        config.getContributions().add(c);
-
-        return config;
-    }
-
-    private Contribution getContribution(URL contributionArtifactURL, String contributionArtifactPath) {
-        URL contributionURL = getContributionURL(contributionArtifactURL, contributionArtifactPath);
-
-        ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-
-        SCAContribution contribution = new SCAContribution(contributionURL.toString(), contributionURL.toString());
-        Contribution c = createContribution(contributionFactory, contribution);
-        return c;
-    }
-
-    private URL getContributionURL(URL contributionArtifactURL, String contributionArtifactPath) {
-        URL contributionURL = null;
-        // "jar:file://....../something.jar!/a/b/c/app.composite"
-        try {
-            String url = contributionArtifactURL.toExternalForm();
-            String protocol = contributionArtifactURL.getProtocol();
-            if ("file".equals(protocol)) {
-                // directory contribution
-                if (url.endsWith(contributionArtifactPath)) {
-                    final String location = url.substring(0, url.lastIndexOf(contributionArtifactPath));
-                    // workaround from evil URL/URI form Maven
-                    // contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-                    // Allow privileged access to open URL stream. Add FilePermission to added to
-                    // security policy file.
-                    try {
-                        contributionURL = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() {
-                            public URL run() throws IOException {
-                                return FileHelper.toFile(new URL(location)).toURI().toURL();
-                            }
-                        });
-                    } catch (PrivilegedActionException e) {
-                        throw (MalformedURLException)e.getException();
-                    }
-                }
-
-            } else if ("jar".equals(protocol)) {
-                // jar contribution
-                String location = url.substring(4, url.lastIndexOf("!/"));
-                // workaround for evil URL/URI from Maven
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if ("wsjar".equals(protocol)) {
-                // See https://issues.apache.org/jira/browse/TUSCANY-2219
-                // wsjar contribution 
-                String location = url.substring(6, url.lastIndexOf("!/"));
-                // workaround for evil url/uri from maven 
-                contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL();
-
-            } else if (protocol != null && (protocol.equals("bundle") || protocol.equals("bundleresource"))) {
-                contributionURL =
-                    new URL(contributionArtifactURL.getProtocol(), contributionArtifactURL.getHost(),
-                            contributionArtifactURL.getPort(), "/");
-            }
-        } catch (MalformedURLException mfe) {
-            throw new IllegalArgumentException(mfe);
-        }
-        return contributionURL;
-    }
-
-    private static URL getResource(final ClassLoader classLoader, final String compositeURI) {
-        return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return classLoader.getResource(compositeURI);
-            }
-        });
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, SCAContribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            ConfiguredNodeImplementation configuration = null;
-            if (contributions == null || contributions.length == 0) {
-                configuration = findNodeConfiguration(compositeURI, null);
-            } else {
-
-                // Create a node configuration
-                NodeImplementationFactory nodeImplementationFactory =
-                    modelFactories.getFactory(NodeImplementationFactory.class);
-                configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-                Composite composite = createComposite(compositeURI);
-                configuration.setComposite(composite);
-
-                // Create contribution models
-                ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-                for (SCAContribution c : contributions) {
-                    Contribution contribution = createContribution(contributionFactory, c);
-                    configuration.getContributions().add(contribution);
-                }
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private Composite createComposite(String compositeURI) {
-        // Create composite model
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        Composite composite = assemblyFactory.createComposite();
-        composite.setURI(compositeURI);
-        composite.setUnresolved(true);
-        return composite;
-    }
-
-    /** 
-     * Constructs a new SCA node.
-     *  
-     * @param compositeURI
-     * @param compositeContent
-     * @param contributions
-     */
-    NodeImpl(String compositeURI, String compositeContent, SCAContribution[] contributions) {
-        configurationName = compositeURI;
-        logger.log(Level.INFO, "Creating node: " + configurationName);
-
-        try {
-            // Initialize the runtime
-            initRuntime();
-
-            ConfiguredNodeImplementation configuration = null;
-            if (contributions == null || contributions.length == 0) {
-                configuration = findNodeConfiguration(compositeURI, null);
-            } else {
-                // Create a node configuration
-                NodeImplementationFactory nodeImplementationFactory =
-                    modelFactories.getFactory(NodeImplementationFactory.class);
-                configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
-
-                // Read the composite model
-                StAXArtifactProcessor<Composite> compositeProcessor = artifactProcessors.getProcessor(Composite.class);
-                URL compositeURL = new URL(compositeURI);
-                logger.log(Level.INFO, "Loading composite: " + compositeURL);
-                XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(compositeContent));
-                Composite composite = compositeProcessor.read(reader);
-                reader.close();
-                configuration.setComposite(composite);
-
-                // Create contribution models
-                ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-                for (SCAContribution c : contributions) {
-                    Contribution contribution = createContribution(contributionFactory, c);
-                    configuration.getContributions().add(contribution);
-                }
-            }
-
-            // Configure the node
-            configureNode(configuration);
-
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    private static Contribution createContribution(ContributionFactory contributionFactory, SCAContribution c) {
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(c.getURI());
-        contribution.setLocation(c.getLocation());
-        contribution.setUnresolved(true);
-        return contribution;
-    }
-
-    /**
-     * Initialize the Tuscany runtime.
-     * 
-     * @throws Exception
-     */
-    private void initRuntime() throws Exception {
-
-        // Create a node runtime
-        runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader());
-        runtime.start();
-
-        // Get the various factories we need
-        ExtensionPointRegistry registry = runtime.getExtensionPointRegistry();
-        modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        inputFactory = modelFactories.getFactory(XMLInputFactory.class);
-
-        // Create the required artifact processors
-        artifactProcessors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-
-        // Save the composite activator
-        compositeActivator = runtime.getCompositeActivator();
-
-        // save the monitor
-        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
-        monitor = monitorFactory.createMonitor();
-    }
-
-    private void configureNode(ConfiguredNodeImplementation configuration) throws Exception {
-
-        // Find if any contribution JARs already available locally on the classpath
-        Map<String, URL> localContributions = localContributions();
-
-        // Load the specified contributions
-        ContributionService contributionService = runtime.getContributionService();
-        List<Contribution> contributions = new ArrayList<Contribution>();
-        for (Contribution contribution : configuration.getContributions()) {
-            URI uri = URI.create(contribution.getLocation());
-            if (uri.getScheme() == null) {
-                uri = new File(contribution.getLocation()).toURI();
-            }
-            URL contributionURL = uri.toURL();
-
-            // Extract contribution file name
-            String file = contributionURL.getPath();
-            int i = file.lastIndexOf('/');
-            if (i != -1 && i < file.length() - 1) {
-                file = file.substring(i + 1);
-
-                // If we find the local contribution file on the classpath, use it in
-                // place of the original contribution URL
-                URL localContributionURL = localContributions.get(file);
-                if (localContributionURL != null) {
-                    contributionURL = localContributionURL;
-                }
-            }
-
-            // Load the contribution
-            logger.log(Level.INFO, "Loading contribution: " + contributionURL);
-            contributions.add(contributionService.contribute(contribution.getURI(), contributionURL, false));
-            analyseProblems();
-        }
-        
-        // Resolve the metadata within the context of the first contribution
-        Contribution mainContribution = contributions.get(contributions.size() - 1);
-        if (metadata != null) {
-            StAXArtifactProcessor<ContributionMetadata> processor =
-                artifactProcessors.getProcessor(ContributionMetadata.class);
-            processor.resolve(metadata, mainContribution.getModelResolver());
-            List<Composite> composites = metadata.getDeployables();
-            configuration.setComposite(composites.get(0));
-        }
-
-
-        // Load the specified composite
-        StAXArtifactProcessor<Composite> compositeProcessor = artifactProcessors.getProcessor(Composite.class);
-        if (configuration.getComposite().getName() == null) {
-            URI uri = URI.create(configuration.getComposite().getURI());
-            if (uri.getScheme() == null) {
-                uri = new File(configuration.getComposite().getURI()).toURI();
-            }
-            URL compositeURL = uri.toURL();
-            logger.log(Level.INFO, "Loading composite: " + compositeURL);
-            InputStream is = compositeURL.openStream();
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            composite = compositeProcessor.read(reader);
-        } else {
-            composite = configuration.getComposite();
-        }
-
-        analyseProblems();
-
-        // Resolve it within the context of the first contribution
-        compositeProcessor.resolve(composite, mainContribution.getModelResolver());
-
-        analyseProblems();
-
-        // Create a top level composite to host our composite
-        // This is temporary to make the activator happy
-        AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
-        Composite tempComposite = assemblyFactory.createComposite();
-        tempComposite.setName(new QName("http://tempuri.org", "temp"));
-        tempComposite.setURI("http://tempuri.org");
-
-        // Include the node composite in the top-level composite 
-        tempComposite.getIncludes().add(composite);
-
-        // set the top level composite on the composite activator as 
-        // logic in callable reference resolution relies on this being 
-        // available
-        compositeActivator.setDomainComposite(tempComposite);
-
-        // Build the composite
-        runtime.buildComposite(composite);
-
-        analyseProblems();
-    }
-
-    private void analyseProblems() throws Exception {
-
-        for (Problem problem : monitor.getProblems()) {
-            if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) {
-                if (problem.getCause() != null) {
-                    throw problem.getCause();
-                } else {
-                    throw new ServiceRuntimeException(problem.toString());
-                }
-            }
-        }
-    }
-
-    public void start() {
-        logger.log(Level.INFO, "Starting node: " + configurationName);
-
-        try {
-
-            // Activate the composite
-            compositeActivator.activate(composite);
-
-            // Start the composite
-            compositeActivator.start(composite);
-
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public void stop() {
-        logger.log(Level.INFO, "Stopping node: " + configurationName);
-
-        try {
-
-            // Stop the composite
-            compositeActivator.stop(composite);
-
-            // Deactivate the composite
-            compositeActivator.deactivate(composite);
-
-        } catch (ActivationException e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
-        return (R)runtime.getProxyFactory().cast(target);
-    }
-
-    public <B> B getService(Class<B> businessInterface, String serviceName) {
-
-        ServiceReference<B> serviceReference = getServiceReference(businessInterface, serviceName);
-        if (serviceReference == null) {
-            throw new ServiceRuntimeException("Service not found: " + serviceName);
-        }
-        return serviceReference.getService();
-    }
-
-    public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String name) {
-
-        // Extract the component name
-        String componentName;
-        String serviceName;
-        int i = name.indexOf('/');
-        if (i != -1) {
-            componentName = name.substring(0, i);
-            serviceName = name.substring(i + 1);
-
-        } else {
-            componentName = name;
-            serviceName = null;
-        }
-
-        // Lookup the component 
-        Component component = null;
-
-        for (Component compositeComponent : composite.getComponents()) {
-            if (compositeComponent.getName().equals(componentName)) {
-                component = compositeComponent;
-            }
-        }
-
-        if (component == null) {
-            throw new ServiceRuntimeException("The service " + name + " has not been contributed to the domain");
-        }
-        RuntimeComponentContext componentContext = null;
-
-        // If the component is a composite, then we need to find the
-        // non-composite component that provides the requested service
-        if (component.getImplementation() instanceof Composite) {
-            for (ComponentService componentService : component.getServices()) {
-                if (serviceName == null || serviceName.equals(componentService.getName())) {
-                    CompositeService compositeService = (CompositeService)componentService.getService();
-                    if (compositeService != null) {
-                        if (serviceName != null) {
-                            serviceName = "$promoted$." + component.getName() + "." + serviceName;
-                        }
-                        componentContext =
-                            ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext();
-                        return componentContext.createSelfReference(businessInterface, compositeService
-                            .getPromotedService());
-                    }
-                    break;
-                }
-            }
-            // No matching service found
-            throw new ServiceRuntimeException("Composite service not found: " + name);
-        } else {
-            componentContext = ((RuntimeComponent)component).getComponentContext();
-            if (serviceName != null) {
-                return componentContext.createSelfReference(businessInterface, serviceName);
-            } else {
-                return componentContext.createSelfReference(businessInterface);
-            }
-        }
-    }
-
-    /**
-     * Returns the extension point registry used by this node.
-     * 
-     * @return
-     */
-    public ExtensionPointRegistry getExtensionPointRegistry() {
-        return runtime.getExtensionPointRegistry();
-    }
-
-    /**
-     * Returns the composite being run by this node.
-     * 
-     * @return
-     */
-    public Composite getComposite() {
-        return composite;
-    }
-
-    /**
-     * Returns contribution JARs available on the classpath.
-     * 
-     * @return
-     */
-    private static Map<String, URL> localContributions() {
-        Map<String, URL> localContributions = new HashMap<String, URL>();
-        collectJARs(localContributions, Thread.currentThread().getContextClassLoader());
-        return localContributions;
-    }
-
-    /**
-     * Collect JARs on the classpath of a URLClassLoader
-     * @param urls
-     * @param cl
-     */
-    private static void collectJARs(Map<String, URL> urls, ClassLoader cl) {
-        if (cl == null) {
-            return;
-        }
-
-        // Collect JARs from the URLClassLoader's classpath
-        if (cl instanceof URLClassLoader) {
-            URL[] jarURLs = ((URLClassLoader)cl).getURLs();
-            if (jarURLs != null) {
-                for (URL jarURL : jarURLs) {
-                    String file = jarURL.getPath();
-                    int i = file.lastIndexOf('/');
-                    if (i != -1 && i < file.length() - 1) {
-                        file = file.substring(i + 1);
-                        urls.put(file, jarURL);
-                    }
-                }
-            }
-        }
-
-        // Collect JARs from the parent ClassLoader
-        collectJARs(urls, cl.getParent());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher-webapp/LICENSE b/tags/java/sca/1.3/modules/node2-launcher-webapp/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-launcher-webapp/NOTICE b/tags/java/sca/1.3/modules/node2-launcher-webapp/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher-webapp/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/tags/java/sca/1.3/modules/node2-launcher-webapp/pom.xml b/tags/java/sca/1.3/modules/node2-launcher-webapp/pom.xml
deleted file mode 100644
index 31f464cc88..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher-webapp/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node2-launcher-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Node WebApp</name>
-
-    <dependencies>   
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-            <scope>runtime</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.node2.launcher.webapp</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/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 78bbebbb83..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6c2c943c99..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/index.jsp b/tags/java/sca/1.3/modules/node2-launcher-webapp/src/main/webapp/index.jsp
deleted file mode 100644
index 3cc6c7b504..0000000000
--- a/tags/java/sca/1.3/modules/node2-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/tags/java/sca/1.3/modules/node2-launcher/LICENSE b/tags/java/sca/1.3/modules/node2-launcher/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/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/tags/java/sca/1.3/modules/node2-launcher/NOTICE b/tags/java/sca/1.3/modules/node2-launcher/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/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/tags/java/sca/1.3/modules/node2-launcher/pom.xml b/tags/java/sca/1.3/modules/node2-launcher/pom.xml
deleted file mode 100644
index 4a7ed867b7..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node2-launcher</artifactId>
-    <name>Apache Tuscany SCA Node Launcher</name>
-
-    <dependencies>   
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</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.launcher.NodeMain</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.node2.launcher</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/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
deleted file mode 100644
index fa199bfa45..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.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.node.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.domainManager;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Simple launcher for the SCA domain manager. 
- *
- * @version $Rev$ $Date$
- */
-public class DomainManagerLauncher {
-    
-    private static final Logger logger = Logger.getLogger(DomainManagerLauncher.class.getName());    
-
-    /**
-     * Constructs a new DomainManagerLauncher.
-     */
-    private DomainManagerLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static DomainManagerLauncher newInstance() {
-        return new DomainManagerLauncher();
-    }
-
-    /**
-     * Creates a new DomainManager.
-     * 
-     * @return a new DomainManager
-     * @throws LauncherException
-     */
-    public <T> T createDomainManager() throws LauncherException {
-        return (T)domainManager(".");
-    }
-    
-    /**
-     * Creates a new DomainManager.
-     * 
-     * @param rootDirectory the domain's root configuration directory 
-     * 
-     * @return a new DomainManager
-     * @throws LauncherException
-     */
-    public <T> T createDomainManager(String rootDirectory) throws LauncherException {
-        return (T)domainManager(rootDirectory);
-    }
-    
-    public static void main(String[] args) throws Exception {
-        logger.info("Apache Tuscany SCA Domain Manager starting...");
-
-        // Create a domain manager
-        DomainManagerLauncher launcher = newInstance();
-        Object domainManager = launcher.createDomainManager();
-        
-        // Start the domain manager
-        try {
-            domainManager.getClass().getMethod("start").invoke(domainManager);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Domain Manager could not be started", e);
-            throw e;
-        }
-        logger.info("SCA Domain Manager started.");
-        
-        logger.info("Press enter to shutdown.");
-        try {
-            System.in.read();
-        } catch (IOException e) {}
-
-        // Stop the domain manager
-        try {
-            domainManager.getClass().getMethod("stop").invoke(domainManager);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Domain Manager could not be stopped", e);
-            throw e;
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
deleted file mode 100644
index 39e8d81139..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.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.node.launcher;
-
-
-/**
- * Denotes an error launching an SCA domain manager or node.
- *
- * @version $Rev$ $Date$
- */
-public class LauncherException extends Exception {
-    private static final long serialVersionUID = 4581189418849190567L;
-
-    public LauncherException() {
-        super();
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public LauncherException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * @param message
-     */
-    public LauncherException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public LauncherException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
deleted file mode 100644
index 64af0b8849..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.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.node.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.nodeDaemon;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * A launcher for the SCA Node daemon.
- *  
- * @version $Rev$ $Date$
- */
-public class NodeDaemonLauncher {
-
-    private static final Logger logger = Logger.getLogger(NodeDaemonLauncher.class.getName());
-    
-    /**
-     * Constructs a new node daemon launcher.
-     */
-    private NodeDaemonLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static NodeDaemonLauncher newInstance() {
-        return new NodeDaemonLauncher();
-    }
-
-    /**
-     * Creates a new node daemon.
-     * 
-     * @param
-     * @return a new node daemon
-     * @throws LauncherException
-     */
-    public <T> T createNodeDaemon() throws LauncherException {
-        return (T)nodeDaemon();
-    }
-    
-    public static void main(String[] args) throws Exception {
-        logger.info("Apache Tuscany SCA Node Daemon starting...");
-
-        // Create a node daemon
-        NodeDaemonLauncher launcher = newInstance();
-        Object daemon = launcher.createNodeDaemon();
-        
-        // Start the node daemon
-        try {
-            daemon.getClass().getMethod("start").invoke(daemon);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node Daemon could not be started", e);
-            throw e;
-        }
-        logger.info("SCA Node Daemon started.");
-        
-        logger.info("Press enter to shutdown.");
-        try {
-            System.in.read();
-        } catch (IOException e) {}
-
-        // Stop the node daemon
-        try {
-            daemon.getClass().getMethod("stop").invoke(daemon);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node Daemon could not be stopped", e);
-            throw e;
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
deleted file mode 100644
index 1ba784420f..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.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.node.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.node;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * A launcher for SCA nodes.
- *  
- * @version $Rev$ $Date$
- */
-public class NodeLauncher {
-
-    static final Logger logger = Logger.getLogger(NodeLauncher.class.getName());
-
-    /**
-     * Constructs a new node launcher.
-     */
-    private NodeLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static NodeLauncher newInstance() {
-        return new NodeLauncher();
-    }
-
-    /**
-     * Creates a new node.
-     * 
-     * @param configurationURI
-     * @return a new node
-     * @throws LauncherException
-     */
-    public <T> T createNode(String configurationURI) throws LauncherException {
-        return (T)node(configurationURI, null, null, null);
-    }
-    
-    /**
-     * Represents an SCA contribution uri + location.
-     */
-    public static final class Contribution {
-        private String uri;
-        private String location;
-        
-        /**
-         * Constructs a new SCA contribution.
-         * 
-         * @param uri
-         * @param location
-         */
-        public Contribution(String uri, String location) {
-            this.uri = uri;
-            this.location = location;
-        }
-        
-        public String getURI() {
-            return uri;
-        }
-        
-        public String getLocation() {
-            return location;
-        }
-    }
-    
-    /**
-     * Creates a new Node.
-     * 
-     * @param compositeURI
-     * @param contributions
-     * @return a new node
-     * @throws LauncherException
-     */
-    public <T> T createNode(String compositeURI, Contribution...contributions) throws LauncherException {
-        return (T)node(null, compositeURI, null, contributions);
-    }
-    
-    /**
-     * Creates a new Node.
-     * 
-     * @param compositeURI
-     * @param compositeContent
-     * @param contributions
-     * @return a new node
-     * @throws LauncherException
-     */
-    public <T> T createNode(String compositeURI, String compositeContent, Contribution...contributions) throws LauncherException {
-        return (T)node(null, compositeURI, compositeContent, contributions);
-    }
-    
-    public static void main(String[] args) throws Exception {
-        logger.info("Apache Tuscany SCA Node starting...");
-
-        // Create a node
-        NodeLauncher launcher = newInstance();
-        String configurationURI = args[0];
-        logger.info("SCA Node configuration: " + configurationURI);
-        Object node = launcher.createNode(configurationURI);
-        
-        // Start the node
-        try {
-            node.getClass().getMethod("start").invoke(node);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node could not be started", e);
-            throw e;
-        }
-        logger.info("SCA Node started.");
-        
-        logger.info("Press enter to shutdown.");
-        try {
-            System.in.read();
-        } catch (IOException e) {}
-
-        // Stop the node
-        try {
-            node.getClass().getMethod("stop").invoke(node);
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node could not be stopped", e);
-            throw e;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
deleted file mode 100644
index 2a208d4c07..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.launcher;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Common functions and constants used by the admin components.
- *
- * @version $Rev$ $Date$
- */
-final class NodeLauncherUtil {
-
-    private static final Logger logger = Logger.getLogger(NodeLauncherUtil.class.getName());
-    
-    private static final String TUSCANY_HOME = "TUSCANY_HOME";
-    private static final String TUSCANY_PATH = "TUSCANY_PATH";
-
-
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs for use in a standalone
-     * J2SE environment.
-     * 
-     * @param parentClassLoader
-     * 
-     * @return
-     */
-    static ClassLoader standAloneRuntimeClassLoader(ClassLoader parentClassLoader) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        return runtimeClassLoader(parentClassLoader, new StandAloneJARFileNameFilter());
-    }
-    
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs for use in a Webapp
-     * environment.
-     * 
-     * @param parentClassLoader
-     * 
-     * @return
-     */
-    static ClassLoader webAppRuntimeClassLoader(ClassLoader parentClassLoader) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        return runtimeClassLoader(parentClassLoader, new WebAppJARFileNameFilter());
-    }
-    
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs.
-     * 
-     * @param parentClassLoader
-     * @param filter
-     * 
-     * @return
-     */
-    private static ClassLoader runtimeClassLoader(ClassLoader parentClassLoader, FilenameFilter filter) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        
-        // Build list of runtime JARs
-        Set<URL> jarDirectoryURLs = new HashSet<URL>();
-        List<URL> jarURLs = new ArrayList<URL>();
-        
-        // First determine the path to the launcher class
-        String resource = NodeLauncherUtil.class.getName().replace('.', '/') + ".class"; 
-        URL url = NodeLauncherUtil.class.getClassLoader().getResource(resource);
-        if (url == null) {
-            throw new FileNotFoundException(resource);
-        }
-        URI uri = url.toURI();
-            
-        // If the launcher class is in a JAR, add all runtime JARs from directory containing
-        // that JAR (e.g. the Tuscany modules directory) as well as the ../modules and
-        // ../lib directories
-        String scheme = uri.getScheme();
-        if (scheme.equals("jar")) {
-            String path = uri.toString().substring(4);
-            int i = path.indexOf("!/");
-            if (i != -1) {
-                path = path.substring(0, i);
-                uri = URI.create(path);
-            }
-    
-            File file = new File(uri);
-            if (file.exists()) {
-                File jarDirectory = file.getParentFile();
-                if (jarDirectory != null && jarDirectory.exists()) {
-
-                    // Collect JAR files from the directory containing the input JAR
-                    // (e.g. the Tuscany modules directory)
-                    URL jarDirectoryURL = jarDirectory.toURI().toURL(); 
-                    jarDirectoryURLs.add(jarDirectoryURL);
-                    collectJARFiles(jarDirectory, jarURLs, filter);
-                    
-                    File homeDirectory = jarDirectory.getParentFile();
-                    if (homeDirectory != null && homeDirectory.exists()) {
-                        
-                        // Collect JARs from the ../modules directory
-                        File modulesDirectory = new File(homeDirectory, "modules");
-                        URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); 
-                        if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
-                            jarDirectoryURLs.add(modulesDirectoryURL);
-                            collectJARFiles(modulesDirectory, jarURLs, filter);
-                        }
-
-                        // Collect JARs from the ../lib directory
-                        File libDirectory = new File(homeDirectory, "lib");
-                        URL libDirectoryURL = libDirectory.toURI().toURL(); 
-                        if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
-                            jarDirectoryURLs.add(libDirectoryURL);
-                            collectJARFiles(libDirectory, jarURLs, filter);
-                        }
-                    }
-                }
-            }
-        }
-        
-        // Look for a TUSCANY_HOME system property or environment variable
-        // Add all the JARs found under $TUSCANY_HOME, $TUSCANY_HOME/modules
-        // and $TUSCANY_HOME/lib
-        String home = System.getProperty(TUSCANY_HOME);
-        if (home == null || home.length() == 0) {
-            home = System.getenv(TUSCANY_HOME);
-        }
-        if (home != null && home.length() != 0) {
-            logger.fine(TUSCANY_HOME + ": " + home);
-            collectJARFiles(home, jarDirectoryURLs, jarURLs, filter);
-        }
-    
-        // Look for a TUSCANY_PATH system property or environment variable
-        // Add all the JARs found under $TUSCANY_PATH, $TUSCANY_PATH/modules
-        // and $TUSCANY_PATH/lib
-        String ext = System.getProperty(TUSCANY_PATH);
-        if (ext == null || ext.length() == 0) {
-            ext = System.getenv(TUSCANY_PATH);
-        }
-        if (ext != null && ext.length() != 0) {
-            logger.fine(TUSCANY_PATH + ": " + ext);
-            String separator = System.getProperty("path.separator");
-            for (StringTokenizer tokens = new StringTokenizer(ext, separator); tokens.hasMoreTokens(); ) {
-                collectJARFiles(tokens.nextToken(), jarDirectoryURLs, jarURLs, filter);
-            }
-        }
-    
-        // Return the runtime class loader
-        if (!jarURLs.isEmpty()) {
-            
-            // Return a ClassLoader configured with the runtime JARs
-            ClassLoader classLoader = new RuntimeClassLoader(jarURLs.toArray(new URL[jarURLs.size()]), parentClassLoader);
-            return classLoader;
-            
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Collect JAR files under the given directory.
-     * 
-     * @param directory
-     * @param jarDirectoryURLs
-     * @param jarURLs
-     * @param filter
-     * @throws MalformedURLException
-     */
-    private static void collectJARFiles(String directory, Set<URL> jarDirectoryURLs, List<URL> jarURLs, FilenameFilter filter)
-        throws MalformedURLException {
-        File directoryFile = new File(directory);
-        URL directoryURL = directoryFile.toURI().toURL(); 
-        if (!jarDirectoryURLs.contains(directoryURL) && directoryFile.exists()) {
-            
-            // Collect files under $TUSCANY_HOME
-            jarDirectoryURLs.add(directoryURL);
-            collectJARFiles(directoryFile, jarURLs, filter);
-            
-            // Collect files under $TUSCANY_HOME/modules
-            File modulesDirectory = new File(directoryFile, "modules");
-            URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); 
-            if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
-                jarDirectoryURLs.add(modulesDirectoryURL);
-                collectJARFiles(modulesDirectory, jarURLs, filter);
-            }
-
-            // Collect files under $TUSCANY_HOME/lib
-            File libDirectory = new File(directoryFile, "lib");
-            URL libDirectoryURL = libDirectory.toURI().toURL(); 
-            if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
-                jarDirectoryURLs.add(libDirectoryURL);
-                collectJARFiles(libDirectory, jarURLs, filter);
-            }
-        }
-    }
-
-    /**
-     * Collect JAR files in the given directory
-     * @param directory
-     * @param urls
-     * @param filter
-     * @throws MalformedURLException
-     */
-    private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter) throws MalformedURLException {
-        String[] files = directory.list(filter);
-        if (files != null) {
-            URL directoryURL = new URL(directory.toURI().toString() + "/");
-            int count = 0;
-            for (String file: files) {
-                URL url = new URL(directoryURL, file);
-                urls.add(url);
-                count++;
-            }
-            if (count != 0) {
-                logger.fine("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
-            }
-        }
-    }
-
-    /**
-     * A file name filter used to filter JAR files.
-     */
-    private static class StandAloneJARFileNameFilter implements FilenameFilter {
-        
-        public boolean accept(File dir, String name) {
-            name = name.toLowerCase(); 
-            
-            // Exclude tuscany-sca-all and tuscany-sca-manifest as they duplicate
-            // code in the individual runtime module JARs
-            if (name.startsWith("tuscany-sca-all")) {
-                return false;
-            }
-            if (name.startsWith("tuscany-sca-manifest")) {
-                return false;
-            }
-            
-            // Filter out the Tomcat and Webapp hosts
-            if (name.startsWith("tuscany-host-tomcat") ||
-                name.startsWith("tuscany-host-webapp")) {
-                //FIXME This is temporary
-                return false;
-            }
-            
-            // Include JAR and MAR files
-            if (name.endsWith(".jar")) {
-                return true;
-            }
-            if (name.endsWith(".mar")) {
-                return true;
-            }
-            return false;
-        }
-    }
-    
-    /**
-     * A file name filter used to filter JAR files.
-     */
-    private static class WebAppJARFileNameFilter extends StandAloneJARFileNameFilter {
-        
-        public boolean accept(File dir, String name) {
-            if (!super.accept(dir, name)) {
-                return false;
-            }
-            name = name.toLowerCase(); 
-            
-            // Exclude servlet-api JARs
-            if (name.startsWith("servlet-api")) {
-                return false;
-            }
-            
-            // Exclude the Tomcat and Jetty hosts 
-            if (name.startsWith("tuscany-host-tomcat") || name.startsWith("tuscany-host-jetty")) {
-                //FIXME This is temporary
-                return false;
-            }
-            
-            return true;
-        }
-    }
-    
-    
-    /**
-     * Creates a new node.
-     * 
-     * @param compositeURI
-     * @param contributions
-     * @throws LauncherException
-     */
-    static Object node(String configurationURI, String compositeURI, String compositeContent, NodeLauncher.Contribution[] contributions) throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = "org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherBootstrap";
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            
-            Object bootstrap;
-            if (configurationURI != null) {
-                
-                // Construct the node with a configuration URI
-                bootstrap = bootstrapClass.getConstructor(String.class).newInstance(configurationURI);
-                
-            } else if (compositeContent != null) {
-                
-                // Construct the node with a composite URI and the URIs and
-                // locations of a list of contributions
-                Constructor<?> constructor = bootstrapClass.getConstructor(String.class, String.class, String[].class, String[].class);
-                String[] uris = new String[contributions.length];
-                String[] locations = new String[contributions.length];
-                for (int i = 0; i < contributions.length; i++) {
-                    uris[i] = contributions[i].getURI();
-                    locations[i] = contributions[i].getLocation();
-                }
-                bootstrap = constructor.newInstance(compositeURI, compositeContent, uris, locations);
-            } else {
-                
-                // Construct the node with a composite URI and the URIs and
-                // locations of a list of contributions
-                Constructor<?> constructor = bootstrapClass.getConstructor(String.class, String[].class, String[].class);
-                String[] uris = new String[contributions.length];
-                String[] locations = new String[contributions.length];
-                for (int i = 0; i < contributions.length; i++) {
-                    uris[i] = contributions[i].getURI();
-                    locations[i] = contributions[i].getLocation();
-                }
-                bootstrap = constructor.newInstance(compositeURI, uris, locations);
-            }
-            
-            Object node = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return node;
-            
-        } catch (Exception e) {
-            NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Creates a new node daemon.
-     * 
-     * @throws LauncherException
-     */
-    static Object nodeDaemon() throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node daemon as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = "org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationDaemonBootstrap";
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            Object bootstrap = bootstrapClass.getConstructor().newInstance();
-            
-            Object nodeDaemon = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return nodeDaemon;
-            
-        } catch (Exception e) {
-            NodeLauncher.logger.log(Level.SEVERE, "SCA Node Daemon could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Creates a new domain manager.
-     * 
-     * @throws LauncherException
-     */
-    static Object domainManager(String rootDirectory) throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node daemon as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = "org.apache.tuscany.sca.domain.manager.launcher.DomainManagerLauncherBootstrap";
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            Constructor<?> constructor = bootstrapClass.getConstructor(String.class);
-            Object bootstrap = constructor.newInstance(rootDirectory);
-            
-            Object domainManager = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return domainManager;
-            
-        } catch (Exception e) {
-            NodeLauncher.logger.log(Level.SEVERE, "SCA Domain Manager could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Simple URL class loader for the runtime JARs
-     */
-    private static class RuntimeClassLoader extends URLClassLoader {
-        private static final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
-        private ClassLoader parent;
-        
-        /**
-         * Constructs a new class loader.
-         * @param urls
-         * @param parent
-         */
-        private RuntimeClassLoader(URL[] urls, ClassLoader parent) {
-            super(urls);
-            this.parent = parent;
-        }
-
-        @Override
-        public URL findResource(String name) {
-            URL url = super.findResource(name);
-            if (url == null) {
-                url = parent.getResource(name);
-            }
-            return url;
-        }
-
-        @Override
-        public Enumeration<URL> findResources(String name) throws IOException {
-            Enumeration<URL> resources = super.findResources(name);
-            Enumeration<URL> parentResources = parent.getResources(name);
-            List<URL> allResources = new ArrayList<URL>(); 
-            for (; resources.hasMoreElements(); ) {
-                allResources.add(resources.nextElement());
-            }
-            for (; parentResources.hasMoreElements(); ) {
-                allResources.add(parentResources.nextElement());
-            }
-            return Collections.enumeration(allResources);
-        }
-
-        @Override
-        protected Class<?> findClass(String name) throws ClassNotFoundException {
-            Class<?> cl;
-
-            // First try to load the class using the parent classloader
-            try {
-                cl = parent.loadClass(name);
-                ClassLoader loadedBy = cl.getClassLoader();
-
-                // If the class was not loaded directly by the parent classloader
-                // or the system classloader try to load a local version of the class
-                // using our RuntimeClassloader instead
-                if (loadedBy != parent &&
-                    loadedBy != systemClassLoader &&
-                    loadedBy != null) {
-
-                    try {
-                        cl = super.findClass(name);
-                    } catch (ClassNotFoundException e) {
-                        // No class alternative was found in our RuntimeClassloader,
-                        // use the class found in the parent classloader hierarchy
-                    }
-                }
-            } catch (ClassNotFoundException e) {
-                
-                // The class was not found by the parent class loader, try
-                // to load it using our RuntimeClassloader
-                cl = super.findClass(name);
-            }
-
-            return cl;
-        }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
deleted file mode 100644
index eafe4ddaa0..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.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.node.launcher;
-
-
-/**
- * Main class for this JAR.
- * With no arguments this class launches the SCA Node Daemon.
- * With a "domain" argument it launches the SCA domain admin node.
- * With any other argument it launches an SCA Node. 
- *  
- * @version $Rev$ $Date$
- */
-public class NodeMain {
-
-    public static void main(String[] args) throws Exception {
-        if (args.length != 0) {
-            if (args[0].equals("domain")) {
-                DomainManagerLauncher.main(args);
-            } else {
-                NodeLauncher.main(args);
-            }
-        } else {
-            NodeDaemonLauncher.main(args);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
deleted file mode 100644
index ad4009a1e1..0000000000
--- a/tags/java/sca/1.3/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.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.node.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.webAppRuntimeClassLoader;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-/**
- * A Servlet filter that forwards service requests to the Servlets registered with
- * the Tuscany ServletHost.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeServletFilter implements Filter {
-    private static final long serialVersionUID = 1L;
-
-    private static final Logger logger = Logger.getLogger(NodeServletFilter.class.getName());
-
-    private ClassLoader runtimeClassLoader;
-    private Class<?> servletHostClass;
-    private Object servletHost;
-    private Filter filter;
-
-    public void init(FilterConfig filterConfig) throws ServletException {
-        logger.info("Apache Tuscany SCA WebApp Node starting...");
-
-        try {
-            // Get the Tuscany runtime ClassLoader
-            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            runtimeClassLoader = webAppRuntimeClassLoader(getClass().getClassLoader());
-            
-            try {
-                if (runtimeClassLoader != null) {
-                    Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                }
-        
-                // Load the Tuscany WebApp Servlet host and get the host instance
-                // for the current webapp
-                String className = "org.apache.tuscany.sca.implementation.node.webapp.NodeWebAppServletHost"; 
-                if (runtimeClassLoader != null) {
-                    servletHostClass = Class.forName(className, true, runtimeClassLoader);
-                } else {
-                    servletHostClass = Class.forName(className);
-                }
-                servletHost = servletHostClass.getMethod("servletHost").invoke(null);
-        
-                // Initialize the Servlet host
-                servletHostClass.getMethod("init", FilterConfig.class).invoke(servletHost, filterConfig);
-    
-                // The Servlet host also implements the filter interface 
-                filter = (Filter)servletHost;
-                
-            } finally {
-                Thread.currentThread().setContextClassLoader(tccl);
-            }
-            
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Error Starting SCA WebApp Node", e);
-            throw new ServletException(e);
-        }
-
-        logger.info("SCA WebApp Node started.");
-    }
-
-    public void destroy() {
-        logger.info("Apache Tuscany WebApp Node stopping...");
-        if (servletHost != null) {
-            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            try {
-                if (runtimeClassLoader != null) {
-                    Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                }
-                
-                servletHostClass.getMethod("destroy").invoke(servletHost);
-                
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, "Error Stopping SCA WebApp Node", e);
-            } finally {
-                Thread.currentThread().setContextClassLoader(tccl);
-            }
-        }
-        logger.info("SCA WebApp Node stopped.");
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain)
-        throws IOException, ServletException {
-
-        // Delegate to the Servlet host filter
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-            
-            filter.doFilter(request, response, chain);
-            
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/LICENSE b/tags/java/sca/1.3/modules/osgi-runtime/LICENSE
deleted file mode 100644
index 43e91eb0b0..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/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/tags/java/sca/1.3/modules/osgi-runtime/NOTICE b/tags/java/sca/1.3/modules/osgi-runtime/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/osgi-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/tags/java/sca/1.3/modules/osgi-runtime/pom.xml b/tags/java/sca/1.3/modules/osgi-runtime/pom.xml
deleted file mode 100644
index 14d2b2cca9..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-osgi-runtime</artifactId>
-    <name>Apache Tuscany OSGi Runtime Helper Library</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>1.3</version>
-        </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.osgi.runtime</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.osgi.runtime*</Export-Package>
-                        <Bundle-Activator>org.apache.tuscany.sca.osgi.runtime.OSGiBundleActivator</Bundle-Activator>
-                        <DynamicImport-Package>org.apache.felix.main,org.eclipse.core.runtime.adaptor</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
deleted file mode 100644
index e4175cc7d8..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.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.osgi.runtime;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * Implementation of an OSGi Runtime using Equinox.
- *
- * @version $Rev$ $Date$
- */
-public class EquinoxRuntime extends OSGiRuntime  {
-    
-    
-    private static BundleContext bundleContext;
-    
-    private static EquinoxRuntime instance;
-    
-    private static Class<?> eclipseStarterClass;
-    
-    public static OSGiRuntime getInstance() throws Exception {
-        if (instance == null) {
-            eclipseStarterClass = EquinoxRuntime.class.getClassLoader().loadClass("org.eclipse.core.runtime.adaptor.EclipseStarter");
-            EquinoxRuntime runtime = new EquinoxRuntime();
-            instance = runtime;
-        }
-        return instance;
-    }
-    
-    
-    protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception {
-        
-        if (bundleContext != null)
-            return bundleContext;
-                    
-        Method startupMethod = eclipseStarterClass.getMethod("startup", String [].class, Runnable.class);
-        
-        // Equinox version 3.2 upwards have a startup method which returns BundleContext
-        if (startupMethod.getReturnType() == BundleContext.class) {
-            bundleContext = (BundleContext) startupMethod.invoke(null, new String[] {"-clean", "-console"}, null );
-        }
-        else {
-            
-            // Older versions of Equinox don't have a public method to obtain system bundlecontext
-            // Extract bundleContext from the private field 'context'. We are assuming that 
-            // there is no access restriction
-            Method mainMethod = eclipseStarterClass.getMethod("main", String [].class);
-            mainMethod.invoke(null, (Object)new String[] {"-clean", "-console"});
-            
-            Field contextField = eclipseStarterClass.getDeclaredField("context");
-            contextField.setAccessible(true);
-            bundleContext = (BundleContext) contextField.get(null);
-            
-        }
-            
-        
-        return bundleContext;
-        
-    }
-
-    @Override
-    public BundleContext getBundleContext() {
-        return bundleContext;
-    }
-
-    @Override
-    protected void setBundleContext(BundleContext bundleContext) {
-        super.setBundleContext(bundleContext);
-        EquinoxRuntime.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();
-    }
-
-
-    @Override
-    public boolean supportsBundleFragments() {
-        return false;
-    }
-    
-    
-
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
deleted file mode 100644
index 54ba4c3e87..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.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.    
- */
-package org.apache.tuscany.sca.osgi.runtime;
-
-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;
-
-/**
- * Implementation of an OSGi Runtime using Felix.
- *
- * @version $Rev$ $Date$
- */
-public class FelixRuntime extends OSGiRuntime implements BundleActivator {
-    
-    private static BundleContext bundleContext;
-    
-    private static FelixRuntime instance;
-    
-    private static Class<?> felixMainClass;
-    private static Class<?> felixClass;
-    private static Object felix;
-    
-    public static OSGiRuntime getInstance() throws Exception {
-        if (instance == null) {
-            felixMainClass = FelixRuntime.class.getClassLoader().loadClass("org.apache.felix.main.Main");
-            FelixRuntime runtime = new FelixRuntime();
-            instance = runtime;
-        }
-        return instance;
-    }
-    
-    
-    private static 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();
-        
-    }
-    
-    protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception {
-        
-        if (bundleContext != null)
-            return bundleContext;
-        
-               
-        ClassLoader cl = FelixRuntime.class.getClassLoader();
-        
-        felixClass = cl.loadClass("org.apache.felix.framework.Felix");
-        Method propsMethod = felixMainClass.getMethod("loadConfigProperties");
-        Properties props = (Properties)propsMethod.invoke(null);
-        
-        String profileDirName = ".felix";
-        File targetDir = new File("target");
-        if (targetDir.exists() && targetDir.isDirectory())
-            profileDirName = "target/" + profileDirName;
-        File profileDir = new File(profileDirName);
-        if (profileDir.isDirectory()) 
-            deleteDirectory(profileDir);
-        else
-            profileDir.delete();
-        profileDir.mkdir();
-        profileDir.deleteOnExit();
-        
-        props.put("felix.cache.profiledir", profileDir.getAbsolutePath());
-        props.put("felix.embedded.execution", "true");
-
-        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, " +
-                "org.apache.xerces.jaxp.datatype, " +
-                "org.w3c.dom, " +
-                "org.xml.sax, " +
-                "org.xml.sax.ext, " +
-                "org.xml.sax.helpers, " +
-                "javax.security.auth, " +
-                "javax.naming, " +
-                "javax.naming.spi, " +
-                "javax.naming.directory, " +
-                "javax.management, " + 
-                "sun.misc";
-        
-        
-        if (!tuscanyRunningInOSGiContainer) {
-            systemPackages = systemPackages + ", org.osoa.sca.annotations, org.osoa.sca";
-            systemPackages = systemPackages + ", 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";
-            systemPackages = systemPackages + ", org.eclipse.emf.ecore, org.eclipse.emf.ecore.util, org.eclipse.emf.ecore.impl";
-        }
-        props.put("org.osgi.framework.system.packages", systemPackages);
-        
-        try {
-            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 = felixConstructor.newInstance(props, activators);
-            ((Bundle)felix).start();
-            bundleContext = ((Bundle)felix).getBundleContext();
-            
-            
-        } catch (Exception e) {
-            
-            // This is the older Felix API which has been retained temporarily to avoid build break
-            // TODO: Remove these once Felix 1.0.0 is released.
-            
-            Class<?> propertyResolverClass = cl.loadClass("org.apache.felix.framework.util.MutablePropertyResolver");
-            Class<?> propertyResolverImplClass = cl.loadClass("org.apache.felix.framework.util.MutablePropertyResolverImpl");
-
-            Constructor implConstructor = propertyResolverImplClass.getConstructor(Map.class);
-            Object mutableProps = implConstructor.newInstance(props);
-            
-            
-            try {
-                Constructor felixConstructor = felixClass.getConstructor(propertyResolverClass, List.class);
-                List<BundleActivator> activators = new ArrayList<BundleActivator>();
-                felix = felixConstructor.newInstance(mutableProps, activators);
-                ((Bundle)felix).start();
-                bundleContext = ((Bundle)felix).getBundleContext();
-            } catch (Exception e1) {
-                
-        
-                felix = felixClass.newInstance();
-                Method startMethod = felixClass.getMethod("start", propertyResolverClass, List.class);
-                List<BundleActivator> activators = new ArrayList<BundleActivator>();
-                BundleActivator activator = new FelixRuntime();
-                activators.add(activator);
-                startMethod.invoke(felix, mutableProps, activators);
-        
-                synchronized (activator) {
-                    int retries = 0;
-                    while (bundleContext == null && retries++ < 10) {
-                        activator.wait(1000);
-                    }
-                }
-            }
-        }
-        
-        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);
-        FelixRuntime.bundleContext = bundleContext;
-    }
-
-
-    @Override
-    public void shutdown() throws Exception {
-
-        if (bundleContext == null)
-            return;
-        bundleContext = null;
-        instance = null;
-        
-        // We could potentially use Felix.stopAndWait, but use timed wait for now because
-        // stopAndWait hangs with Felix 1.0.0
-        if (felix instanceof Bundle) {
-            Bundle felixBundle = (Bundle)felix;
-            felixBundle.stop();
-            int retries = 50;
-            synchronized (felix) {
-                while (retries-- > 0 && felixBundle.getState() != Bundle.UNINSTALLED) {
-                    felix.wait(100);
-                }
-            }
-        }
-        else if (felix != null) {
-            Method shutdownMethod = felixClass.getMethod("shutdown");
-            try {
-                shutdownMethod.invoke(felix);
-            } catch (Exception e) {
-                // Ignore errors
-            }            
-            felix = null;
-        }
-        super.shutdown();
-    }
-    
-    @Override
-    public boolean supportsBundleFragments() {
-        return false;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
deleted file mode 100644
index 144c542a49..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.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.osgi.runtime;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-/**
- * Implementation of an OSGi Runtime using Knopflerfish.
- *
- * @version $Rev$ $Date$
- */
-public class KnopflerfishRuntime extends OSGiRuntime  {
-    
-    private static BundleContext bundleContext;
-    
-    private static KnopflerfishRuntime instance;
-    
-
-    private static Class<?> frameworkClass;
-    
-    private static Object framework;
-    
-    public static OSGiRuntime getInstance() throws Exception {
-        if (instance == null) {
-            frameworkClass = KnopflerfishRuntime.class.getClassLoader().loadClass("org.knopflerfish.framework.Framework");
-            KnopflerfishRuntime runtime = new KnopflerfishRuntime();
-            instance = runtime;
-        }
-        return instance;
-    }
-    
-   
-
-    // FIXME: Knopflerfish does not expose the methods used for configuration as public methods
-    //        It may be worth using the private methods in org.knopflerfish.framework.Main for
-    //        configuring using reflection if security policies allow it.
-    //        For now, a simple configuration routine reads sca.xargs from the directory in 
-    //        the classpath which contains framework.jar. The entries in init.xargs starting with
-    //        -install are assumed to be single-line entries with full bundle location.
-    //
-    protected BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception {
-        
-        if (bundleContext != null)
-            return bundleContext;
-        
-        
-        
-        System.setProperty("org.knopflerfish.framework.bundlestorage", "memory");
-                    
-        Constructor frameworkConstructor = frameworkClass.getConstructor(Object.class);
-        framework = frameworkConstructor.newInstance(new KnopflerfishRuntime());
-        Method launchMethod = frameworkClass.getMethod("launch", long.class);
-        launchMethod.invoke(framework, 0);
-        Method getContextMethod = frameworkClass.getMethod("getSystemBundleContext");
-        bundleContext = (BundleContext)getContextMethod.invoke(framework);
-       
-        System.setProperty("com.gatespace.bundle.cm.store", "knopflerfish.store");
-        File xargsFile = null;
-        String classpath = System.getProperty("java.class.path");
-        String[] classpathEntries = classpath.split(System.getProperty("path.separator"));
-        for (int i = 0; i < classpathEntries.length; i++) {
-            if (classpathEntries[i].endsWith("framework.jar")) {
-                String path = classpathEntries[i].substring(0, classpathEntries[i].length() - "framework.jar".length());
-                path = path + "sca.xargs";
-                xargsFile = new File(path);
-                if (!xargsFile.exists())
-                    xargsFile = null;
-                break;
-            }
-        }
-        if (xargsFile != null) {
-            BufferedReader reader = new BufferedReader(new FileReader(xargsFile));
-            String line;
-            Hashtable<String, Bundle> bundles = new Hashtable<String, Bundle>();
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.startsWith("-install")) {
-                    try {
-
-                        String bundleLocation = line.substring("-install".length()).trim();
-                        Bundle bundle = bundleContext.installBundle(bundleLocation);
-                        bundles.put(bundleLocation, bundle);
-                        
-                    } catch (BundleException e) {
-                        e.printStackTrace();
-                    }
-                    
-                }
-                if (line.startsWith("-start")) {
-
-                    try {
-                        String bundleLocation = line.substring("-start".length()).trim();
-                        Bundle bundle = bundles.get(bundleLocation);
-                        bundle.start();
-                    } catch (BundleException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-        
-        
-        return bundleContext;
-        
-    }
-    
-    @Override
-    public BundleContext getBundleContext() {
-        return bundleContext;
-    }
-    
-    @Override
-    protected void setBundleContext(BundleContext bundleContext) {
-        super.setBundleContext(bundleContext);
-        KnopflerfishRuntime.bundleContext = bundleContext;
-    }
-
-    @Override
-    public void shutdown() throws Exception {
-
-        if (bundleContext == null)
-            return;
-        bundleContext = null;
-        instance = null;
-        if (framework != null) {
-            Method shutdownMethod = frameworkClass.getMethod("shutdown");
-            try {
-                shutdownMethod.invoke(framework);
-            } catch (Exception e) {
-                // Ignore errors
-            }
-            framework = null;
-        }
-        super.shutdown();
-        
-    }
-    
-    @Override
-    public boolean supportsBundleFragments() {
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
deleted file mode 100644
index 509f3787ac..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.osgi.runtime;

-

-import java.io.IOException;

-import java.net.URL;

-import java.util.Collections;

-import java.util.Enumeration;

-import java.util.HashSet;

-import java.util.concurrent.ConcurrentHashMap;

-

-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.BundleActivator;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.BundleEvent;

-import org.osgi.framework.BundleListener;

-

-/**

- * OSGi bundle activator, which is run when Tuscany is run inside an OSGi runtime.

- *

- * @version $Rev$ $Date$

- */

-public class OSGiBundleActivator implements BundleActivator, BundleListener {

-	

-	private static final String TUSCANY_SCA_BUNDLE_PREFIX = "org.apache.tuscany.sca";

-	private static final String TUSCANY_3RD_PARTY_BUNDLE_PREFIX = "org.apache.tuscany.sca.3rdparty";

-	private OSGiRuntime runtime;

-    private ConcurrentHashMap<Bundle, ClassLoader> serviceDiscoveryClassLoaders = new ConcurrentHashMap<Bundle, ClassLoader>();

-	private BundleClassLoader threadContextClassLoader;

-	private ClassLoader origTCCL;

-	private Bundle thisBundle;

-

-	public void start(BundleContext bundleContext) throws Exception {

-		

-		initializeTuscanyClassLoaders(bundleContext);

-		

-		runtime = OSGiRuntime.findRuntime();

-		runtime.setBundleContext(bundleContext);

-        runtime.setContextClassLoader(threadContextClassLoader);

-		runtime.initialize();

-		

-	}

-

-	public void stop(BundleContext bundleContext) throws Exception {

-		

-        // runtime.shutdown();

-

-        if (Thread.currentThread().getContextClassLoader() == threadContextClassLoader)

-            Thread.currentThread().setContextClassLoader(origTCCL);       

-	}

-	

-	/**

-	 * Create a bundle ClassLoader which has visibility of all Tuscany related

-	 * bundles. Use this ClassLoader as TCCL, and the Tuscany service discovery

-	 * ClassLoader.

-	 * 

-	 * @param bundleContext

-	 */

-	private void initializeTuscanyClassLoaders(BundleContext bundleContext) {

-		

-		thisBundle = bundleContext.getBundle();

-

-		origTCCL = Thread.currentThread().getContextClassLoader();

-        

-		threadContextClassLoader = new BundleClassLoader(thisBundle, origTCCL);

-		

-		Thread.currentThread().setContextClassLoader(threadContextClassLoader);

-		

-        ClassLoader cl = new BundleClassLoader(thisBundle, null);

-        ServiceDiscovery.getInstance().registerClassLoader(cl);

-        serviceDiscoveryClassLoaders.put(thisBundle, cl);

-

-		Bundle[] bundles = bundleContext.getBundles();

-		for (Bundle bundle : bundles) {

-			updateBundleClassLoader(bundle);

-		}

-		bundleContext.addBundleListener(this);

-		

-	}

-	

-	/**

-	 * Add an installed bundle to the list of bundles in the service discovery classpath

-	 * if the installed bundle is a Tuscany bundle using the same Core-SPI bundle.

-	 * Since the bundle containing this activator is in Tuscany Runtime, this bundle

-	 * will provide access to Runtime and its dependencies (SPI, SCA-API). Third party

-	 * bundles don't need to be in the service discovery classpath, since they will be automatically

-	 * imported by bundles which require them. That leaves Tuscany extension bundles,

-	 * which are added to the service discovery classpath here.

-	 * 

-	 * 3rd party bundle should be explicitly added to TCCL since classes from these

-	 * bundles use TCCL to load other classes from the bundle.

-	 * 

-	 * Load one class from the bundle to check if the new bundle matches this runtime bundle.

-	 * 

-	 * @param bundle

-	 */

-	private void updateBundleClassLoader(Bundle bundle) {

-		

-		if (bundle.getSymbolicName().startsWith(TUSCANY_SCA_BUNDLE_PREFIX)) {

-			

-

-			// This may be the third party bundle.

-		    if (bundle.getSymbolicName().startsWith(TUSCANY_3RD_PARTY_BUNDLE_PREFIX)) {

-											

-                threadContextClassLoader.addBundle(bundle);	

-			} 

-		    else {

-			

-                String thisBundleVersion = (String)thisBundle.getHeaders().get("Bundle-Version");

-                String bundleVersion = (String)bundle.getHeaders().get("Bundle-Version");

-			    

-                if (thisBundleVersion == null || bundleVersion == null || thisBundleVersion.equals(bundleVersion)) {

-					

-                    if (!threadContextClassLoader.bundles.contains(bundle)) {

-                        ClassLoader cl = new BundleClassLoader(bundle, null);

-                        ServiceDiscovery.getInstance().registerClassLoader(cl);

-                        serviceDiscoveryClassLoaders.put(bundle, cl);

-				        threadContextClassLoader.addBundle(bundle);

-                    }

-                }

-		    }

-		} else {

-            threadContextClassLoader.addBundle(bundle); 

-        }

-	}

-

-

-	/**

-	 * Handle bundle install/uninstall events 

-	 */

-	public void bundleChanged(BundleEvent event) {

-		

-		Bundle bundle = event.getBundle();

-		if (event.getType() == BundleEvent.UNINSTALLED) {

-            ClassLoader cl = serviceDiscoveryClassLoaders.get(bundle);

-            if (cl != null) {

-                ServiceDiscovery.getInstance().unregisterClassLoader(cl);

-            }

-			threadContextClassLoader.removeBundle(bundle);

-		}

-		else if (event.getType() == BundleEvent.INSTALLED) {

-			updateBundleClassLoader(bundle);

-		}

-	}

-

-

-

-

-	/**

-	 * Bundle ClassLoader that searches a bundle classpath consisting of

-	 * a list of bundles. The parent ClassLoader is searched only if a class

-	 * cannot be loaded from the bundle classpath. Tuscany bundles are

-	 * dynamically added and removed from the bundle classpath when the bundles

-	 * are installed and uninstalled.

-	 * 

-	 * No ordering of bundles is maintained at the moment.

-	 *

-	 */

-	private static class BundleClassLoader extends ClassLoader {

-		

-		private HashSet<Bundle> bundles;

-		

-		BundleClassLoader(Bundle bundle, ClassLoader parent) {

-			super(parent);

-			this.bundles = new HashSet<Bundle>();

-			bundles.add(bundle);

-		}

-		

-		private synchronized void addBundle(Bundle bundle) {

-			bundles.add(bundle);

-		}

-		

-		private synchronized void removeBundle(Bundle bundle) {

-			if (bundles.contains(bundle))

-			    bundles.remove(bundle);

-		}

-		

-        

-		@Override

-        protected Class<?> findClass(String className) throws ClassNotFoundException {

-            Class<?> clazz = null;

-            synchronized (this) {

-                for (Bundle bundle : bundles) {

-                    try {

-                        clazz = bundle.loadClass(className);

-                        break;

-                    } catch (ClassNotFoundException e) {

-                    } catch (NoClassDefFoundError e) {

-                    }

-

-                }

-            }           

-            if (clazz != null) {

-                return clazz;

-            }

-            return super.findClass(className);

-        }

-

-

-		@Override

-		@SuppressWarnings("unchecked")

-		public Enumeration<URL> getResources(String resName) throws IOException {

-			HashSet<URL> urlSet = new HashSet<URL>();

-			Enumeration<URL> urls = null;

-			synchronized (this) {

-				for (Bundle bundle : bundles) {

-					urls = bundle.getResources(resName);

-					if (urls != null) {

-						while (urls.hasMoreElements()) {

-							urlSet.add(urls.nextElement());

-						}

-					}

-				}

-			}			

-			if (urlSet.size() > 0)

-				return Collections.enumeration(urlSet);

-			return super.getResources(resName);

-		}

-

-		@Override

-		public URL getResource(String resName) {

-			URL url = null;

-			synchronized (this) {

-				for (Bundle bundle : bundles) {

-					url = bundle.getResource(resName);

-					if (url != null)

-						return url;

-				}

-			}			

-			return super.getResource(resName);

-		}

-

-		@Override

-		public String toString() {

-			return "Tuscany BundleClassLoader " + bundles.iterator().next();

-	    }

-		

-		

-		

-	}

-}

diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
deleted file mode 100644
index 79b1c0a5f4..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.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.osgi.runtime;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * Base OSGiRuntime implementation.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class OSGiRuntime {
-    private static final Logger logger = Logger.getLogger(OSGiRuntime.class.getName());
-
-    public abstract BundleContext getBundleContext();
-
-    public abstract boolean supportsBundleFragments();
-    
-    protected abstract BundleContext startRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception;
-       
-    private static OSGiRuntime instance;
-    
-    private BundleContext bundleContext;
-    
-    private PackageAdmin packageAdmin;
-    
-    private boolean tuscanyRunningInOSGiContainer;
-    
-    private ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-    
-    /**
-     * 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 Equinox/Felix/Knopflerfish (in that order) from the
-     * classpath.
-     * 
-     * @throws BundleException
-     */
-    public static synchronized OSGiRuntime findRuntime() throws Exception {
-
-        if (instance != null) {
-        	
-            return instance;
-        }
-        String runtimeClassName = System.getProperty(OSGiRuntime.class.getName());
-        
-
-        if (runtimeClassName != null) {
-            try {
-                Class<?> runtimeClass = OSGiRuntime.class.getClassLoader().loadClass(runtimeClassName);
-                Method method = runtimeClass.getMethod("getInstance");
-                instance = (OSGiRuntime) method.invoke(null);
-                return instance;
-                
-            } catch (Exception e) {
-                throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e);
-            }
-        }
-
-        try {
-            
-            instance = EquinoxRuntime.getInstance();
-            return instance;
-            
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, e.getMessage(), e);
-        }
-
-        try {
-
-            instance = FelixRuntime.getInstance();
-            return instance;
- 
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, e.getMessage(), e);
-        }
-
-        try {
-       
-            instance = KnopflerfishRuntime.getInstance();
-            return instance;
-            
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        } catch (Throwable e) {
-            logger.log(Level.SEVERE, e.getMessage(), e);
-        }
-
-        throw new BundleException("Could not start OSGi runtime from the classpath");
-    }
-
-
-    public static synchronized OSGiRuntime getRuntime() throws Exception {
-    	return getRuntime(false);
-    }
-
-    public static synchronized OSGiRuntime getRuntime(boolean tuscanyRunningInOSGiContainer) throws Exception {
-    	
-    	instance = findRuntime();
-    	
-        if (instance != null) {
-        	
-        	if (instance.bundleContext == null) {
-                instance.tuscanyRunningInOSGiContainer = tuscanyRunningInOSGiContainer;
-        		instance.startRuntime(tuscanyRunningInOSGiContainer);
-        		instance.initialize();
-        	}
-            return instance;
-        }
-        return instance;
-    }
-
-
-    public void shutdown() throws Exception {
-    	
-    	bundleContext = null;
-    	packageAdmin = null;
-    }
-
-    protected void setBundleContext(BundleContext bundleContext) {
-        instance.tuscanyRunningInOSGiContainer = true;
-        this.bundleContext = bundleContext;
-    }
-    
-    
-    
-    public ClassLoader getContextClassLoader() {
-        return contextClassLoader;
-    }
-
-    protected void setContextClassLoader(ClassLoader contextClassLoader) {
-        this.contextClassLoader = contextClassLoader;
-    }
-
-    protected void initialize() {
-    	
-        bundleContext = getBundleContext();
-
-        if (bundleContext != null) {
-
-            org.osgi.framework.ServiceReference packageAdminReference =
-                bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin");
-            if (packageAdminReference != null) {
-
-                packageAdmin = (PackageAdmin)bundleContext.getService(packageAdminReference);
-            }
-        }
-
-    }
-
-    public Bundle findBundle(String bundleSymbolicName, String bundleVersion) {
-
-        if (bundleContext != null) {
-            Bundle[] installedBundles = bundleContext.getBundles();
-            for (Bundle bundle : installedBundles) {
-                if (bundleSymbolicName.equals(bundle.getSymbolicName()) && (bundleVersion == null || bundleVersion
-                    .equals(bundle.getHeaders().get("Bundle-Version"))))
-                    return bundle;
-            }
-
-        }
-        return null;
-    }
-    
-    public static synchronized Bundle findInstalledBundle(String bundleLocation) {
-    	if (instance != null) {
-            if (bundleLocation.startsWith("bundle:")||bundleLocation.startsWith("bundleresource:")) {
-                try {
-                    return findInstalledBundle(new URL(bundleLocation));
-                } catch (MalformedURLException e) {
-                    // ignore
-                }
-            } else {
-                return instance.findBundle(bundleLocation);
-            }
-    	}
-    	return null;
-    }
-    
-    public static synchronized Bundle findInstalledBundle(URL bundleURL) {
-        if (instance != null) {
-            if (instance.bundleContext != null) {
-                Bundle[] installedBundles = instance.bundleContext.getBundles();
-                for (Bundle bundle : installedBundles) {
-                    try {
-                        if (bundle.getEntry("/").getHost().equals(bundleURL.getHost()))
-                        return bundle;
-                    } catch (Exception e) {
-                        // Ignore exception
-                    }
-                }
-            }
-            return null;
-        }
-        return null;
-    }
-
-    public Bundle findBundle(String bundleLocation) {
-
-        if (bundleContext != null) {        	
-            Bundle[] installedBundles = bundleContext.getBundles();
-            for (Bundle bundle : installedBundles) {
-                if (bundle.getLocation().equals(bundleLocation))
-                    return bundle;
-            }
-
-        }
-        return null;
-    }
-
-    public Bundle installBundle(String bundleLocation, InputStream inputStream) {
-
-        try {
-            if (bundleContext != null) {
-                Bundle bundle = findBundle(bundleLocation);
-                if (bundle != null)
-                    return bundle;
-                if (inputStream == null)
-                    bundle = bundleContext.installBundle(bundleLocation);
-                else
-                    bundle = bundleContext.installBundle(bundleLocation, inputStream);
-
-                if (bundle != null && packageAdmin != null)
-                    packageAdmin.refreshPackages(null);
-
-                return bundle;
-            }
-        } catch (BundleException e) {
-        }
-        return null;
-    }
-
-    /**
-     * Stops the OSGi instance.
-     *
-     * @throws Exception Failed to shutdown the OSGi instance.
-     */
-    public static synchronized void stop() throws Exception {
-        if (instance != null && !instance.tuscanyRunningInOSGiContainer) {
-            instance.shutdown();
-            instance = null;
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
deleted file mode 100644
index 1dbe75f431..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.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.osgi.runtime;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-
-/**
- * @version $Rev$ $Date$
- */
-public class OSGiRuntimeModuleActivator implements ModuleActivator {
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#start(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void start(ExtensionPointRegistry registry) {
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.core.ModuleActivator#stop(org.apache.tuscany.sca.core.ExtensionPointRegistry)
-     */
-    public void stop(ExtensionPointRegistry registry) {
-        try {
-            OSGiRuntime.stop();
-        } catch (Throwable e) {
-            // Ignore the exception
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 88b8f1e021..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /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.

-# Implementation class for the ModuleActivator

-org.apache.tuscany.sca.osgi.runtime.OSGiRuntimeModuleActivator

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-# 

-#   http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT 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.osgi.runtime.OSGiRuntimeModuleActivator

diff --git a/tags/java/sca/1.3/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java b/tags/java/sca/1.3/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
deleted file mode 100644
index 7ce3f6c18f..0000000000
--- a/tags/java/sca/1.3/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.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.osgi.runtime;
-
-import junit.framework.TestCase;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * Test OSGi runtime.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiRuntimeTestCase extends TestCase {
-    private OSGiRuntime runtime;
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        try {
-        this.runtime = OSGiRuntime.getRuntime();
-        } catch ( Throwable e ) {
-            System.out.println( "DOB: OSGiRuntimeTestCase.setUp error=" + e );
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        OSGiRuntime.stop();
-    }
-
-    public void testRuntime() throws Exception {
-
-        BundleContext bc1 = runtime.getBundleContext();
-
-        assertNotNull(bc1);
-
-        BundleContext bc2 = runtime.getBundleContext();
-
-        assertNotNull(bc2);
-
-        assertTrue(bc1 == bc2);
-
-        OSGiRuntime.stop();
-        runtime = OSGiRuntime.getRuntime();
-
-        BundleContext bc3 = runtime.getBundleContext();
-
-        assertNotNull(bc3);
-
-        assertTrue(bc1 != bc3);
-
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-logging/LICENSE b/tags/java/sca/1.3/modules/policy-logging/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/NOTICE b/tags/java/sca/1.3/modules/policy-logging/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/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/tags/java/sca/1.3/modules/policy-logging/pom.xml b/tags/java/sca/1.3/modules/policy-logging/pom.xml
deleted file mode 100644
index f82b49da43..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/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-modules</artifactId>

-        <version>1.3</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>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-policy</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</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.logging</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.policy.logging*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
deleted file mode 100644
index 4220caab80..0000000000
--- a/tags/java/sca/1.3/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.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 LoggingPolicyDefinitionsProvider implements SCADefinitionsProvider {
-    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(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        // 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 (SCADefinitions)urlArtifactProcessor.read(null, 
-                                                             uri, 
-                                                             definitionsFileUrl);
-        } catch ( Exception e ) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
deleted file mode 100644
index c53c37ccf6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
deleted file mode 100644
index 731b2d8d62..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.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.logging.jdk;

-

-import java.util.logging.Level;

-

-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 JDKLoggingPolicy implements Policy {

-    private static final QName JDK_LOGGING_POLICY_QNAME = new QName(Constants.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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
deleted file mode 100644
index 58a6d21ee7..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.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.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.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;
-
-/**
- * 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(Constants.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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
deleted file mode 100644
index 83526e0f03..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.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.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.assembly.xml.Constants;
-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;
-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(Constants.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(ModelFactoryExtensionPoint 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, Constants.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", Constants.SCA10_TUSCANY_NS);
-        
-        if (policy.getLoggerName() != null) {
-            writer.writeAttribute(Constants.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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
deleted file mode 100644
index 9bbae8956f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
deleted file mode 100644
index feddc8c056..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/tags/java/sca/1.3/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
deleted file mode 100644
index 472f76c680..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index f56f96e4b9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index e14c657d80..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/tags/java/sca/1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index ec40cb7dc5..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/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.logging.LoggingPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/tags/java/sca/1.3/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
deleted file mode 100644
index 39627ae876..0000000000
--- a/tags/java/sca/1.3/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/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://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">

-		<description>

-			All messages to and from this implementation must be logged

-		</description>

-	</intent>

-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/tags/java/sca/1.3/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
deleted file mode 100644
index d5b1b9eedc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/tags/java/sca/1.3/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
deleted file mode 100644
index fabb554236..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-security-jsr250/LICENSE b/tags/java/sca/1.3/modules/policy-security-jsr250/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-security-jsr250/NOTICE b/tags/java/sca/1.3/modules/policy-security-jsr250/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-jsr250/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/tags/java/sca/1.3/modules/policy-security-jsr250/pom.xml b/tags/java/sca/1.3/modules/policy-security-jsr250/pom.xml
deleted file mode 100644
index 98a2fa3495..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-jsr250/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</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.implementation.java</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.java*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java b/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
deleted file mode 100644
index befe398129..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/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.implementation.java.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.JSR250PolicyProcessor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * A module activator for the Java implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class JSR250Activator implements ModuleActivator {
-
-    public void start(ExtensionPointRegistry registry) {
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java b/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
deleted file mode 100644
index f639bc679f..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.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 org.apache.tuscany.sca.implementation.java.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.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/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 550e6d3708..0000000000
--- a/tags/java/sca/1.3/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.implementation.java.impl.JSR250Activator

diff --git a/tags/java/sca/1.3/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java b/tags/java/sca/1.3/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
deleted file mode 100644
index 894117354e..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.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.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
-import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCaseFIXME extends TestCase {
-    private ServiceProcessor serviceProcessor;
-    private JSR250PolicyProcessor policyProcessor;
-    private PolicyJavaInterfaceVisitor visitor;
-    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 {
-        serviceProcessor.visitClass(Service1.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service1.class, type);
-        verifyIntents(Service1.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        serviceProcessor.visitClass(Service2.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service2.class, type);
-        verifyIntents(Service2.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service3.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service3.class, type);
-        verifyIntents(Service3.class, type);
-    }
-
-    public void stestMultipleInterfacesWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service4.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service4.class, type);
-        verifyIntents(Service4.class, type);
-    }
-
-    public void stestSingleInterfaceWithIntentsOnInterfaceAtMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service5.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        policyProcessor.visitClass(Service5.class, type);
-        verifyIntents(Service5.class, type);
-    }
-
-    public void testSingleInterfaceWithIntentsOnServiceAndInterfaceAtImplAndInertfaceAndMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service6.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
-        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();
-        serviceProcessor = new ServiceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
-        policyProcessor = new JSR250PolicyProcessor(new DefaultAssemblyFactory(), new DefaultPolicyFactory());
-        visitor = new PolicyJavaInterfaceVisitor(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/tags/java/sca/1.3/modules/policy-security-ws/LICENSE b/tags/java/sca/1.3/modules/policy-security-ws/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/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/tags/java/sca/1.3/modules/policy-security-ws/NOTICE b/tags/java/sca/1.3/modules/policy-security-ws/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/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/tags/java/sca/1.3/modules/policy-security-ws/pom.xml b/tags/java/sca/1.3/modules/policy-security-ws/pom.xml
deleted file mode 100644
index 5421176403..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-policy-security-ws</artifactId>

-    <name>Apache Tuscany Security Policy WS Model</name>

-    

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-policy-security</artifactId>

-            <version>1.3</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>                 

-            </exclusions>

-            <version>1.2.5</version>

-        </dependency>

-

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.5</version>

-        </dependency>

-     

-        

-        <dependency>

-            <groupId>org.apache.axis2</groupId>

-            <artifactId>axis2-kernel</artifactId>

-            <version>1.3</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>backport-util-concurrent</groupId>

-                    <artifactId>backport-util-concurrent</artifactId>

-                </exclusion>                

-            </exclusions>

-        </dependency>

-        

-        <dependency>

-            <groupId>backport-util-concurrent</groupId>

-            <artifactId>backport-util-concurrent</artifactId>

-            <version>3.0</version>

-            <scope>test</scope>

-        </dependency>         

-        

-        <dependency>

-            <groupId>org.apache.neethi</groupId>

-            <artifactId>neethi</artifactId>

-            <version>2.0.2</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.tuscany.sca</groupId>

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</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.security.ws</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.policy.security.ws*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
deleted file mode 100644
index 13129efe5b..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.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.security.ws;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axiom.om.OMElement;
-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 Axis2ConfigParamPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "wsConfigParam");
-    private Map<String, OMElement> paramElements = new Hashtable<String, OMElement>();
-    
-    public Map<String, OMElement> getParamElements() {
-        return paramElements;
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java b/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
deleted file mode 100644
index 51e0e00ffa..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.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.policy.security.ws;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.Parameter;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-
-/**
- * Policy handler to handle PolicySet that contain Axis2ConfigParamPolicy instances
- *
- * @version $Rev$ $Date$
- */
-public class Axis2ConfigParamPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-    
-    public void setUp(Object... context) {
-        Axis2ConfigParamPolicy axis2ConfigParamPolicy = null;
-        Parameter configParam = null;
-        for ( Object contextObject : context ) {
-            if ( contextObject instanceof ConfigurationContext ) {
-                ConfigurationContext configContext = (ConfigurationContext)contextObject;
-                for ( Object policy : applicablePolicySet.getPolicies() ) {
-                    if ( policy instanceof Axis2ConfigParamPolicy ) {
-                        axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
-                        for ( String paramName : axis2ConfigParamPolicy.getParamElements().keySet() ) {
-                            configParam = new Parameter(paramName, 
-                                                        axis2ConfigParamPolicy.getParamElements().get(paramName).getFirstElement());
-                            configParam.setParameterElement(axis2ConfigParamPolicy.getParamElements().get(paramName));
-                            try {
-                                configContext.getAxisConfiguration().addParameter(configParam);
-                            } catch ( AxisFault e ) {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    } 
-                }
-            }
-        }
-    }
-    
-    public void cleanUp(Object... context) {
-    }
-    
-    public void beforeInvoke(Object... context) { 
-    }
-    
-    public void afterInvoke(Object... context) {
-        
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet applicablePolicySet) {
-        this.applicablePolicySet = applicablePolicySet;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
deleted file mode 100644
index ca2e439e3b..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.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.policy.security.ws;
-
-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.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-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;
-import org.apache.tuscany.sca.monitor.Monitor;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class Axis2ConfigParamPolicyProcessor implements StAXArtifactProcessor<Axis2ConfigParamPolicy> {
-    public static final QName AXIS2_CONFIG_PARAM_POLICY_QNAME = Axis2ConfigParamPolicy.NAME;
-    public static final String PARAMETER = "parameter";
-    public QName getArtifactType() {
-        return AXIS2_CONFIG_PARAM_POLICY_QNAME;
-    }
-    
-    public Axis2ConfigParamPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    }
-
-    public Axis2ConfigParamPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Axis2ConfigParamPolicy policy = new Axis2ConfigParamPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        OMElement parameterElement = null;
-        String paramName = null;
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( PARAMETER.equals(name.getLocalPart()) ) {
-                        paramName = reader.getAttributeValue(null, Constants.NAME);
-                        parameterElement = loadElement(reader);
-                        policy.getParamElements().put(paramName, parameterElement);
-                    }
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( AXIS2_CONFIG_PARAM_POLICY_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(Axis2ConfigParamPolicy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
-                                                        XMLStreamException {
-    }
-
-    public Class<Axis2ConfigParamPolicy> getModelType() {
-        return Axis2ConfigParamPolicy.class;
-    }
-
-    public void resolve(Axis2ConfigParamPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
-    }
-    
-    private OMElement loadElement(XMLStreamReader reader) throws XMLStreamException {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement head = fac.createOMElement(reader.getName());
-        OMElement current = head;
-        while (true) {
-            switch (reader.next()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    //since the axis2 code checks against a no namespace we need to generate accordingly
-                    QName name = new QName(reader.getName().getLocalPart());
-                    OMElement child = fac.createOMElement(name, current);
-
-                    int count = reader.getNamespaceCount();
-                    for (int i = 0; i < count; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        child.declareNamespace(ns, prefix);
-                    }
-
-                    if(!"".equals(name.getNamespaceURI())) {
-                        child.declareNamespace(name.getNamespaceURI(), name.getPrefix());
-                    }
-
-                    // 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 (ns != null) {
-                            child.addAttribute(qname, value, fac.createOMNamespace(ns, prefix));
-                            child.declareNamespace(ns, prefix);
-                        } else {
-                            child.addAttribute(qname, value, null);
-                        }
-                    }
-                    current = child;
-                    break;
-                case XMLStreamConstants.CDATA:
-                    fac.createOMText(current, reader.getText());
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    fac.createOMText(current, reader.getText());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if ( current == head ) {
-                        return head;
-                    } else {
-                        current = (OMElement)current.getParent();
-                    }
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java b/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
deleted file mode 100644
index 2faf7bef14..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.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.policy.security.ws;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.Parameter;
-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.policy.PolicySet;
-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;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Axis2ConfigParamPolicyProviderFactory implements PolicyProviderFactory<Axis2ConfigParamPolicy> {
-
-    public Axis2ConfigParamPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-    }
-
-    /**
-     * @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 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<Axis2ConfigParamPolicy> getModelType() {
-        return Axis2ConfigParamPolicy.class;
-    }
-
-    // FIXME: [rfeng] I think this should be refactored into the binding.ws axis2 code
-    public void setUp(ConfigurationContext configContext, PolicySet ps) {
-        Axis2ConfigParamPolicy axis2ConfigParamPolicy = null;
-        Parameter configParam = null;
-        for (Object policy : ps.getPolicies()) {
-            if (policy instanceof Axis2ConfigParamPolicy) {
-                axis2ConfigParamPolicy = (Axis2ConfigParamPolicy)policy;
-                for (String paramName : axis2ConfigParamPolicy.getParamElements().keySet()) {
-                    configParam =
-                        new Parameter(paramName, axis2ConfigParamPolicy.getParamElements().get(paramName)
-                            .getFirstElement());
-                    configParam.setParameterElement(axis2ConfigParamPolicy.getParamElements().get(paramName));
-                    try {
-                        configContext.getAxisConfiguration().addParameter(configParam);
-                    } catch (AxisFault e) {
-                        throw new ServiceRuntimeException(e);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java b/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
deleted file mode 100644
index 2a4d36fa0a..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.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.security.ws;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.neethi.Policy;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.util.PolicyHandler;
-
-/**
- * Policy handler to handle PolicySet containing Policy (WS-Security-Policy) instances
- *
- * @version $Rev$ $Date$
- */
-public class WSSecurityPolicyHandler implements PolicyHandler {
-    private PolicySet applicablePolicySet = null;
-    
-    public void setUp(Object... context) {
-        for ( Object contextObject : context ) {
-            if ( contextObject instanceof ConfigurationContext ) {
-                ConfigurationContext configContext = (ConfigurationContext)contextObject;
-                for ( Object policy : applicablePolicySet.getPolicies() ) {
-                    if ( policy instanceof Policy ) {
-                        Policy wsPolicy = (Policy)policy;
-                        try {
-                            configContext.getAxisConfiguration().applyPolicy(wsPolicy);
-                        } catch ( AxisFault e ) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    public void cleanUp(Object... context) {
-    }
-    
-    public void beforeInvoke(Object... context) { 
-        
-    }
-    
-    public void afterInvoke(Object... context) {
-        
-    }
-
-    public PolicySet getApplicablePolicySet() {
-        return applicablePolicySet;
-    }
-
-    public void setApplicablePolicySet(PolicySet applicablePolicySet) {
-        this.applicablePolicySet = applicablePolicySet;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 71783b1306..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/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.security.ws.Axis2ConfigParamPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wsConfigParam,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider b/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
deleted file mode 100644
index 790424df6b..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.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.security.SecurityPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
deleted file mode 100644
index 5bae401538..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ /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.

-# 

-# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

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

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

-org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.neethi.Policy

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

-org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.neethi.Policy

-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#confidentiality,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

-org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#confidentiality,model=org.apache.neethi.Policy
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index 352d6c693e..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ /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 policy extension

diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java b/tags/java/sca/1.3/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
deleted file mode 100644
index 4bdd1c465b..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.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.security.ws;
-
-
-import java.io.InputStream;
-import java.net.URL;
-
-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.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * Test the reading of ws config params policy.
- *
- * @version $Rev$ $Date$
- */
-public class PolicyReadTestCase extends TestCase {
-
-    public void testPolicyReading() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessor<Object> staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        URL url = getClass().getResource("mock_policies.xml");
-        
-        InputStream urlStream = url.openStream();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-        
-        Axis2ConfigParamPolicy policy = (Axis2ConfigParamPolicy)staxProcessor.read(reader);
-        assertEquals(policy.getParamElements().size(), 2);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/tags/java/sca/1.3/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
deleted file mode 100644
index 8fc1a7b669..0000000000
--- a/tags/java/sca/1.3/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ /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.    

--->

-<tuscany:wsConfigParam xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

- 		<parameter name="InflowSecurity">

-		    <action>

-		        <items>Timestamp Signature</items>

-		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>

-		    </action>

-		</parameter>

- 		<parameter name="OutflowSecurity">

-      		<action>

-        		<items>Timestamp Signature</items>

-        		<user>TuscanyWsUser</user>

-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>

-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass>" +

-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>

-      		</action>

-    	</parameter>

-</tuscany:wsConfigParam>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/LICENSE b/tags/java/sca/1.3/modules/policy-security/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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/tags/java/sca/1.3/modules/policy-security/NOTICE b/tags/java/sca/1.3/modules/policy-security/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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/tags/java/sca/1.3/modules/policy-security/pom.xml b/tags/java/sca/1.3/modules/policy-security/pom.xml
deleted file mode 100644
index 3a85c1aeeb..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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.3</version>

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

-    </parent>

-    <artifactId>tuscany-policy-security</artifactId>

-    <name>Apache Tuscany Security Policy Model</name>

-    

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-                

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</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.security</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.policy.security*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
deleted file mode 100644
index c3df9e30fb..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.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.policy.authorization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * Models the SCA Implementation Security Policy Assertion for Authorization.
- * 
- * @version $Rev$ $Date$
- */
-public class AuthorizationPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_NS, "authorization");
-
-    public static enum AcessControl {
-        permitAll, denyAll, allow
-    };
-
-    private List<String> roleNames = new ArrayList<String>();
-
-    public AuthorizationPolicy() {
-    }
-
-    private AcessControl accessControl;
-
-    public AcessControl getAccessControl() {
-        return accessControl;
-    }
-
-    public void setAccessControl(AcessControl accessControl) {
-        this.accessControl = accessControl;
-    }
-
-    public List<String> getRoleNames() {
-        if (accessControl == AcessControl.allow) {
-            return roleNames;
-        } else {
-            throw new IllegalArgumentException("Role names are only available for 'allow'");
-        }
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public String toString() {
-        if (accessControl == AcessControl.allow) {
-            return accessControl.name() + " " + roleNames;
-        }
-        return accessControl.name();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
deleted file mode 100644
index dcc85f809c..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ /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.    
- */
-package org.apache.tuscany.sca.policy.authorization;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-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.builder.impl.ProblemImpl;
-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;
-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 AuthorizationPolicyProcessor implements StAXArtifactProcessor<AuthorizationPolicy> {
-    private static final String ROLES = "roles";
-    private Monitor monitor;
-
-    public QName getArtifactType() {
-        return AuthorizationPolicy.NAME;
-    }
-
-    public AuthorizationPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }    
-
-    public AuthorizationPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        AuthorizationPolicy policy = new AuthorizationPolicy();
-        int event = reader.getEventType();
-        QName start = reader.getName();
-        while (true) {
-            switch (event) {
-                case START_ELEMENT:
-                    String ac = reader.getName().getLocalPart();
-                    if ("allow".equals(ac)) {
-                        policy.setAccessControl(AuthorizationPolicy.AcessControl.allow);
-                        String roleNames = reader.getAttributeValue(null, ROLES);
-                        if (roleNames == null) {
-                            error("RequiredAttributeRolesMissing", reader);
-                            //throw new IllegalArgumentException("Required attribute 'roles' is missing.");
-                        } else {
-                            StringTokenizer st = new StringTokenizer(roleNames);
-                            while (st.hasMoreTokens()) {
-                                policy.getRoleNames().add(st.nextToken());
-                            }
-                        }
-                    } else if ("permitAll".equals(ac)) {
-                        policy.setAccessControl(AuthorizationPolicy.AcessControl.permitAll);
-                    } else if ("denyAll".endsWith(ac)) {
-                        policy.setAccessControl(AuthorizationPolicy.AcessControl.denyAll);
-                    }
-                    break;
-                case END_ELEMENT:
-                    if (start.equals(reader.getName())) {
-                        if (reader.hasNext()) {
-                            reader.next();
-                        }
-                        return policy;
-                    }
-
-            }
-            if (reader.hasNext()) {
-                event = reader.next();
-            } else {
-                return policy;
-            }
-        }
-    }
-
-    public void write(AuthorizationPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-        XMLStreamException {
-        writer.writeStartElement(AuthorizationPolicy.NAME.getLocalPart());
-
-        writer.writeStartElement(policy.getAccessControl().name());
-
-        if (policy.getAccessControl() == AuthorizationPolicy.AcessControl.allow) {
-            StringBuffer sb = new StringBuffer();
-            for (String role : policy.getRoleNames()) {
-                sb.append(role);
-            }
-
-            if (sb.length() > 0) {
-                writer.writeAttribute(ROLES, sb.toString());
-            }
-        }
-
-        writer.writeEndElement();
-        writer.writeEndElement();
-    }
-
-    public Class<AuthorizationPolicy> getModelType() {
-        return AuthorizationPolicy.class;
-    }
-
-    public void resolve(AuthorizationPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-        
-        if ((policy.getAccessControl() == AuthorizationPolicy.AcessControl.allow) &&
-            (policy.getRoleNames().isEmpty())){
-            // role names are required so leave policy unresolved
-            return;
-        }
-
-        //right now nothing to resolve
-        policy.setUnresolved(false);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
deleted file mode 100644
index ad2a1bfb39..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.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.identity;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * Models the SCA Implementation Security Policy Assertion for Security Identity.
- * 
- * @version $Rev$ $Date$
- */
-public class SecurityIdentityPolicy implements Policy {
-    public static final QName NAME = new QName(Constants.SCA10_NS, "securityIdentity");
-
-    private boolean useCallerIdentity;
-
-    private String runAsRole;
-
-    public SecurityIdentityPolicy() {
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    public QName getSchemaName() {
-        return NAME;
-    }
-
-    public boolean isUseCallerIdentity() {
-        return useCallerIdentity;
-    }
-
-    public void setUseCallerIdentity(boolean useCallerIdentity) {
-        this.useCallerIdentity = useCallerIdentity;
-    }
-
-    public String getRunAsRole() {
-        return runAsRole;
-    }
-
-    public void setRunAsRole(String runAsRole) {
-        this.runAsRole = runAsRole;
-    }
-
-    public String toString() {
-        if (useCallerIdentity) {
-            return "useCallerIdentity";
-        }
-        return "runAs " + runAsRole;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
deleted file mode 100644
index bdf40f999f..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.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.policy.identity;
-
-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.builder.impl.ProblemImpl;
-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;
-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 SecurityIdentityPolicyProcessor implements StAXArtifactProcessor<SecurityIdentityPolicy> {
-    private static final String ROLE = "role";
-    private Monitor monitor;
-
-    public QName getArtifactType() {
-        return SecurityIdentityPolicy.NAME;
-    }
-
-    public SecurityIdentityPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.monitor = monitor;
-    }
-
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }    
-
-    public SecurityIdentityPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        SecurityIdentityPolicy policy = new SecurityIdentityPolicy();
-        int event = reader.getEventType();
-        QName start = reader.getName();
-        while (true) {
-            switch (event) {
-                case START_ELEMENT:
-                    String ac = reader.getName().getLocalPart();
-                    if ("runAs".equals(ac)) {
-                        String roleName = reader.getAttributeValue(null, ROLE);
-                        if (roleName == null) {
-                            error("RequiredAttributeRolesMissing", reader);
-                            //throw new IllegalArgumentException("Required attribute 'roles' is missing.");
-                        } else {
-                            policy.setRunAsRole(roleName);
-                        }
-                    } else if ("useCallerIdentity".equals(ac)) {
-                        policy.setUseCallerIdentity(true);
-                    }
-                    break;
-                case END_ELEMENT:
-                    if (start.equals(reader.getName())) {
-                        if (reader.hasNext()) {
-                            reader.next();
-                        }
-                        return policy;
-                    }
-
-            }
-            if (reader.hasNext()) {
-                event = reader.next();
-            } else {
-                return policy;
-            }
-        }
-    }
-
-    public void write(SecurityIdentityPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-    XMLStreamException {
-        writer.writeStartElement(SecurityIdentityPolicy.NAME.getLocalPart());
-
-        String child = policy.isUseCallerIdentity() ? "useCallerIdentity" : "runAs";
-        writer.writeStartElement(child);
-
-        if (!policy.isUseCallerIdentity()) {
-            writer.writeAttribute(ROLE, policy.getRunAsRole());
-        }
-
-        writer.writeEndElement();
-        writer.writeEndElement();
-    }
-
-    public Class<SecurityIdentityPolicy> getModelType() {
-        return SecurityIdentityPolicy.class;
-    }
-
-    public void resolve(SecurityIdentityPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-        
-    	if (policy.getRunAsRole() != null)
-    	    //right now nothing to resolve
-            policy.setUnresolved(false);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
deleted file mode 100644
index cfe856e0f2..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.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.policy.security;
-
-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.definitions.util.SCADefinitionsUtil;
-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 SecurityPolicyDefinitionsProvider implements SCADefinitionsProvider {
-    private static final String tuscanyDefinitionsFile = "org/apache/tuscany/sca/policy/security/tuscany_definitions.xml";
-    private String definitionsFile = "org/apache/tuscany/sca/policy/security/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-
-    public SecurityPolicyDefinitionsProvider(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);
-
-            definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-                public URL run() {
-                    return getClass().getClassLoader().getResource(tuscanyDefinitionsFile);
-                }
-            }); 
-
-            uri = new URI(definitionsFile);
-            tuscanyDefns = (SCADefinitions)urlArtifactProcessor.read(null, 
-                                                                     uri, 
-                                                                     definitionsFileUrl);
-
-            SCADefinitionsUtil.aggregateSCADefinitions(tuscanyDefns, scaDefns);
-            return scaDefns;
-
-        } catch ( Exception e ) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
deleted file mode 100644
index 185982a749..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.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.security.jaas;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-/**
- * Policy handler to handle PolicySet containing JaasAuthenticationPolicy instances
- *
- * @version $Rev$ $Date$
- */
-public class JaasAuthenticationImplementationPolicyProvider implements PolicyProvider {
-    private RuntimeComponent component;
-    private Implementation implementation;
-
-    public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) {
-        super();
-        this.component = component;
-        this.implementation = implementation;
-    }
-
-    private List<JaasAuthenticationPolicy> findPolicies(Operation op) {
-        List<JaasAuthenticationPolicy> polices = new ArrayList<JaasAuthenticationPolicy>();
-        // FIXME: How do we get a list of effective policySets for a given operation?
-        if (implementation instanceof OperationsConfigurator) {
-            OperationsConfigurator operationsConfigurator = (OperationsConfigurator)implementation;
-            for (ConfiguredOperation cop : operationsConfigurator.getConfiguredOperations()) {
-                if (cop.getName().equals(op.getName())) {
-                    for (PolicySet ps : cop.getPolicySets()) {
-                        for (Object p : ps.getPolicies()) {
-                            if (JaasAuthenticationPolicy.class.isInstance(p)) {
-                                polices.add((JaasAuthenticationPolicy)p);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        List<PolicySet> policySets = component.getPolicySets();
-        for (PolicySet ps : policySets) {
-            for (Object p : ps.getPolicies()) {
-                if (JaasAuthenticationPolicy.class.isInstance(p)) {
-                    polices.add((JaasAuthenticationPolicy)p);
-                }
-            }
-        }
-        return polices;
-    }
-
-    public Interceptor createInterceptor(Operation operation) {
-        List<JaasAuthenticationPolicy> policies = findPolicies(operation);
-        if (policies == null || policies.isEmpty()) {
-            return null;
-        } else {
-            return new JaasAuthenticationInterceptor(findPolicies(operation));
-        }
-    }
-
-    public String getPhase() {
-        return Phase.IMPLEMENTATION_POLICY;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
deleted file mode 100644
index 328c290fad..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.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.policy.security.jaas;
-
-import java.util.List;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.login.LoginContext;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JaasAuthenticationInterceptor implements Interceptor {
-    private List<JaasAuthenticationPolicy> authenticationPolicies;
-    private Invoker next;
-
-    public JaasAuthenticationInterceptor(List<JaasAuthenticationPolicy> authenticationPolicies) {
-        super();
-        this.authenticationPolicies = authenticationPolicies;
-    }
-
-    /**
-     * @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) {
-        try {
-            for (JaasAuthenticationPolicy policy : authenticationPolicies) {
-                CallbackHandler callbackHandler =
-                    (CallbackHandler)policy.getCallbackHandlerClass().newInstance();
-                LoginContext lc = new LoginContext(policy.getConfigurationName(), callbackHandler);
-                lc.login();
-                // Subject subject = lc.getSubject();
-            }
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-        return getNext().invoke(msg);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
deleted file mode 100644
index f41d36194a..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.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.policy.security.jaas;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.policy.Policy;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class JaasAuthenticationPolicy implements Policy {

-    public static final QName NAME = new QName(Constants.SCA10_TUSCANY_NS, "jaasAuthentication");

-

-    private String configurationName = "other";

-    private String callbackHandlerClassName;

-    private Class<?> callbackHandlerClass;

-

-    public String getCallbackHandlerClassName() {

-        return callbackHandlerClassName;

-    }

-

-    public void setCallbackHandlerClassName(String callbackHandlerClassName) {

-        this.callbackHandlerClassName = callbackHandlerClassName;

-    }

-

-    public Class<?> getCallbackHandlerClass() {

-        return callbackHandlerClass;

-    }

-

-    public void setCallbackHandlerClass(Class<?> callbackHandlerClass) {

-        this.callbackHandlerClass = callbackHandlerClass;

-    }

-    

-    public QName getSchemaName() {

-        return NAME;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-    }

-

-    public String getConfigurationName() {

-        return configurationName;

-    }

-

-    public void setConfigurationName(String configurationName) {

-        this.configurationName = configurationName;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
deleted file mode 100644
index b7736fa817..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.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.security.jaas;

-

-import javax.security.auth.callback.CallbackHandler;

-import javax.security.auth.login.LoginContext;

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.xml.Constants;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.util.PolicyHandler;

-

-/**

- * Policy handler to handle PolicySet containing JaasAuthenticationPolicy instances

- *

- * @version $Rev$ $Date$

- */

-public class JaasAuthenticationPolicyHandler implements PolicyHandler {

-    private static final String jaasPolicy = "JaasPolicy";

-    public static final QName policySetQName = new QName(Constants.SCA10_TUSCANY_NS, jaasPolicy);

-    private PolicySet applicablePolicySet = null;

-

-    public void setUp(Object... context) {

-        if (applicablePolicySet != null) {

-        }

-    }

-

-    public void cleanUp(Object... context) {

-    }

-

-    public void beforeInvoke(Object... context) {

-        try {

-            JaasAuthenticationPolicy policy = (JaasAuthenticationPolicy)applicablePolicySet.getPolicies().get(0);

-            CallbackHandler callbackHandler =

-                (CallbackHandler)policy.getCallbackHandlerClass().newInstance();

-            LoginContext lc = new LoginContext(policy.getConfigurationName(), callbackHandler);

-            lc.login();

-        } catch (Exception e) {

-            throw new RuntimeException(e);

-        }

-

-    }

-

-    public void afterInvoke(Object... context) {

-

-    }

-

-    public PolicySet getApplicablePolicySet() {

-        return applicablePolicySet;

-    }

-

-    public void setApplicablePolicySet(PolicySet applicablePolicySet) {

-        this.applicablePolicySet = applicablePolicySet;

-    }

-}

diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
deleted file mode 100644
index 48d8731552..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.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.policy.security.jaas;
-
-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.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.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.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class JaasAuthenticationPolicyProcessor implements StAXArtifactProcessor<JaasAuthenticationPolicy> {
-    private static final QName JAAS_AUTHENTICATION_POLICY_QNAME = JaasAuthenticationPolicy.NAME;
-    private static final String callbackHandler = "callbackHandler";
-    public static final QName CALLBACK_HANDLER_QNAME = new QName(Constants.SCA10_TUSCANY_NS,
-                                                               callbackHandler);
-    public static final QName CONFIGURATION_QNAME = new QName(Constants.SCA10_TUSCANY_NS,
-                                                                 "configurationName");
-    private Monitor monitor;
-    
-    public QName getArtifactType() {
-        return JAAS_AUTHENTICATION_POLICY_QNAME;
-    }
-    
-    public JaasAuthenticationPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    	this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-security-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-    }
-    
-    public JaasAuthenticationPolicy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        JaasAuthenticationPolicy policy = new JaasAuthenticationPolicy();
-        int event = reader.getEventType();
-        QName name = null;
-        
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if (name.equals(CALLBACK_HANDLER_QNAME)) {
-                        String callbackHandlerClassName = reader.getElementText();
-                        if (callbackHandlerClassName != null) {
-                            policy.setCallbackHandlerClassName(callbackHandlerClassName.trim());
-                        }
-                    }
-                    if (name.equals(CONFIGURATION_QNAME)) {
-                        String configurationName = reader.getElementText();
-                        if (configurationName != null) {
-                            policy.setConfigurationName(configurationName.trim());
-                        }
-                    } 
-
-                    break;
-                }
-            }
-            
-            if ( event == END_ELEMENT ) {
-                if ( JAAS_AUTHENTICATION_POLICY_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-         
-        return policy;
-    }
-
-    public void write(JaasAuthenticationPolicy policy, XMLStreamWriter writer) throws ContributionWriteException,
-                                                        XMLStreamException {
-        String prefix = "tuscany";
-        writer.writeStartElement(prefix, 
-                                 JAAS_AUTHENTICATION_POLICY_QNAME.getLocalPart(),
-                                 JAAS_AUTHENTICATION_POLICY_QNAME.getNamespaceURI());
-        writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
-        
-       
-        writer.writeEndElement();
-    }
-
-    public Class<JaasAuthenticationPolicy> getModelType() {
-        return JaasAuthenticationPolicy.class;
-    }
-
-    public void resolve(JaasAuthenticationPolicy policy, ModelResolver resolver) throws ContributionResolveException {
-
-         if (policy.getCallbackHandlerClassName() != null) {
-             ClassReference classReference = new ClassReference(policy.getCallbackHandlerClassName());
-             classReference = resolver.resolveModel(ClassReference.class, classReference);
-             Class callbackClass = classReference.getJavaClass();
-             if (callbackClass == null) {
-            	 error("ClassNotFoundException", resolver, policy.getCallbackHandlerClassName());
-                 //throw new ContributionResolveException(new ClassNotFoundException(policy.getCallbackHandlerClassName()));
-             } else {
-                 policy.setCallbackHandlerClass(callbackClass);
-                 policy.setUnresolved(false);
-             }             
-         }
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
deleted file mode 100644
index 48a42eb711..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.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.security.jaas;
-
-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 JaasAuthenticationPolicyProviderFactory implements PolicyProviderFactory<JaasAuthenticationPolicy> {
-
-    public JaasAuthenticationPolicyProviderFactory(ExtensionPointRegistry registry) {
-        super();
-    }
-
-    /**
-     * @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 JaasAuthenticationImplementationPolicyProvider(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<JaasAuthenticationPolicy> getModelType() {
-        return JaasAuthenticationPolicy.class;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 79df6c7c62..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy
-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy
-org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index 0fa98020f9..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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.security.jaas.JaasAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy

diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/tags/java/sca/1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 790424df6b..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/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.security.SecurityPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
deleted file mode 100644
index e1be4ab03c..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ /dev/null
@@ -1,55 +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">
-
-    <!-- POLICY SETS -->
-    <policySet name="runAs" appliesTo="sca:implementation.java"/>
-    <policySet name="allow" appliesTo="sca:implementation.java"/>
-    <policySet name="rolesAllowed" appliesTo="sca:implementation.java"/>
-    <policySet name="permitAll" appliesTo="sca:implementation.java"/>
-    <policySet name="denyAll" appliesTo="sca:implementation.java"/>
-    
-	<!-- Policy Intents Defined by the SCA Runtime -->
-	<intent name="authentication" 
-	 		constrains="sca:binding">
-		<description>
-			Specifying this intent on references requires necessary authentication information
-			to be sent along with outgoing messages. Specifying this intent on service requires
-			incoming messages to be authenticated
-		</description>
-	</intent>
-	
-	<intent name="confidentiality" 
-	 		constrains="sca:binding">
-		<description>
-			Specifying this intent requires message exchanged to be encrypted
-		</description>
-	</intent>
-	
-	<intent name="integrity" 
-	 		constrains="sca:binding">
-		<description>
-			Specifying this intent requires message exchanged to be signed
-		</description>
-	</intent>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
deleted file mode 100644
index f5b79af7ee..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ /dev/null
@@ -1,26 +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">
-
-    <intent name="jaasAuthentication" constrains="sca:implementation.java">
-        <description>All invocations to be authenticated</description>
-    </intent>
-</definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/tags/java/sca/1.3/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
deleted file mode 100644
index ebb47f2b60..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/main/resources/policy-security-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.
-#
-#
-RequiredAttributeRolesMissing = Required attribute 'roles' is missing.
-ClassNotFoundException = Class Not Found Exception: {0}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/tags/java/sca/1.3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
deleted file mode 100644
index 2414fd777e..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.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.policy.security;
-
-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.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy;
-import org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;
-import org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy;
-import org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PolicyProcessorTestCase {
-    private final static List<String> SEQ =
-        Arrays.asList("permitAll",
-                      "allow [r1, r2]",
-                      "denyAll",
-                      "runAs admin",
-                      "useCallerIdentity",
-                      "permitAll",
-                      "allow [r1, r2]",
-                      "denyAll",
-                      "runAs admin");
-
-    @Test
-    public void testRead() throws Exception {
-        List<String> results = new ArrayList<String>();
-        Map<QName, StAXArtifactProcessor> processors = new HashMap<QName, StAXArtifactProcessor>();
-        processors.put(AuthorizationPolicy.NAME, new AuthorizationPolicyProcessor(null,null));
-        processors.put(SecurityIdentityPolicy.NAME, new SecurityIdentityPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "allow"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "permitAll"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "denyAll"), new AuthorizationPolicyProcessor(null,null));
-        processors.put(new QName(Constants.SCA10_NS, "runAs"), new SecurityIdentityPolicyProcessor(null,null));
-        InputStream is = getClass().getResourceAsStream("mock_policy_definitions.xml");
-        XMLInputFactory factory = XMLInputFactory.newInstance();
-        XMLStreamReader reader = factory.createXMLStreamReader(is);
-        while (true) {
-            int event = reader.getEventType();
-            if (event == XMLStreamConstants.START_ELEMENT) {
-                if ("policySet".equals(reader.getName().getLocalPart())) {
-                    reader.nextTag();
-                    results.add(processors.get(reader.getName()).read(reader).toString());
-                }
-            }
-            if (reader.hasNext()) {
-                reader.next();
-            } else {
-                break;
-            }
-        }
-        Assert.assertEquals(SEQ, results);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/tags/java/sca/1.3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
deleted file mode 100644
index 53d1a581f0..0000000000
--- a/tags/java/sca/1.3/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_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/tags/java/sca/1.3/modules/policy-transaction/LICENSE b/tags/java/sca/1.3/modules/policy-transaction/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/NOTICE b/tags/java/sca/1.3/modules/policy-transaction/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/policy-transaction/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/tags/java/sca/1.3/modules/policy-transaction/pom.xml b/tags/java/sca/1.3/modules/policy-transaction/pom.xml
deleted file mode 100644
index 1814b1e151..0000000000
--- a/tags/java/sca/1.3/modules/policy-transaction/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-modules</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</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>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <!-- 
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>4.1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>test</scope>
-        </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>
-
-    <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.transaction</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.transaction*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
deleted file mode 100644
index 8a242924ee..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
deleted file mode 100644
index 3c11fef865..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
deleted file mode 100644
index b3e90c23cd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
deleted file mode 100644
index 0de98592cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
deleted file mode 100644
index defe12967e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
deleted file mode 100644
index 31beab4fca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
deleted file mode 100644
index 3339f2e338..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
deleted file mode 100644
index a13748f232..0000000000
--- a/tags/java/sca/1.3/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.assembly.xml.Constants;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * The model for Tuscany transaction policy
- * 
- * @version $Rev$ $Date$
- */
-public interface TransactionPolicy extends Policy {
-    QName NAME = new QName(Constants.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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
deleted file mode 100644
index 7b10a7d568..0000000000
--- a/tags/java/sca/1.3/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.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to transaction
- *
- * @version $Rev$ $Date$
- */
-public class TransactionPolicyDefinitionsProvider implements SCADefinitionsProvider {
-    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(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-
-        try {
-            SCADefinitions scaTransactionPolicyDefns = null;
-            SCADefinitions tuscanyTransactionPolicyDefns = null;
-
-            URI uri = new URI(scaDefinitionsFile);
-            URL defintionsFileUrl = getClass().getResource(scaDefinitionsFile);
-            scaTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            uri = new URI(tuscanyDefinitionsFile);
-            defintionsFileUrl = getClass().getResource(tuscanyDefinitionsFile);
-            tuscanyTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
-
-            SCADefinitionsUtil.aggregateSCADefinitions(tuscanyTransactionPolicyDefns, scaTransactionPolicyDefns);
-
-            return scaTransactionPolicyDefns;
-        } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
deleted file mode 100644
index f178876a72..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
deleted file mode 100644
index 0579890a42..0000000000
--- a/tags/java/sca/1.3/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.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;
-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(ModelFactoryExtensionPoint 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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
deleted file mode 100644
index be97090378..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
deleted file mode 100644
index 0795a4e5cf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
deleted file mode 100644
index 9f9088a380..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/tags/java/sca/1.3/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
deleted file mode 100644
index 5a7ae5c4cc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 1d034e23a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index 9a35d62cad..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
deleted file mode 100644
index eeec814f60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index e9d9fab519..0000000000
--- a/tags/java/sca/1.3/modules/policy-transaction/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.transaction.TransactionPolicyDefinitionsProvider
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/log4j.properties b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/log4j.properties
deleted file mode 100644
index 698ee41d7e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
deleted file mode 100644
index ff51b131b7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/tags/java/sca/1.3/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
deleted file mode 100644
index 324fa03da6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/tags/java/sca/1.3/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
deleted file mode 100644
index e8560d775d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/tags/java/sca/1.3/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
deleted file mode 100644
index 544e0f68c0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/policy-xml-ws/LICENSE b/tags/java/sca/1.3/modules/policy-xml-ws/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/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/tags/java/sca/1.3/modules/policy-xml-ws/NOTICE b/tags/java/sca/1.3/modules/policy-xml-ws/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/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/tags/java/sca/1.3/modules/policy-xml-ws/pom.xml b/tags/java/sca/1.3/modules/policy-xml-ws/pom.xml
deleted file mode 100644
index 8eb903cbb1..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy-xml-ws</artifactId>
-    <name>Apache Tuscany SCA Policy XML WS Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-		
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.5</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>                
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>2.0.2</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.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-                
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
-            <exclusions>
-               <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-               </exclusion>
-            </exclusions>
-        </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.xml.ws</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.xml</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
deleted file mode 100644
index 263c766948..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.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.policy.xml.ws;
-
-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.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-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.neethi.PolicyEngine;
-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.policy.xml.PolicyConstants;
-
-
-/**
- * Processor for handling xml models of PolicySet definitions
- *
- * @version $Rev$ $Date$
- */
-public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<org.apache.neethi.Policy>, PolicyConstants {
-	public final static String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
-	public final static String WS_POLICY = "Policy";
-	
-    public final static QName WS_POLICY_QNAME =new QName(WS_POLICY_NS, WS_POLICY);
-
-    public WSPolicyProcessor() {
-    	System.out.println(">>>Initializing WSPolicyProcessor");
-    }
-    
-    public WSPolicyProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-    	System.out.println(">>>Initializing WSPolicyProcessor");
-    }
-    
-    public QName getArtifactType() {
-        return WS_POLICY_QNAME;
-    }
-    
-    public Class<org.apache.neethi.Policy> getModelType() {
-        return org.apache.neethi.Policy.class;
-    }
-
-    public org.apache.neethi.Policy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-		org.apache.neethi.Policy wsPolicy = null;
-
-		int event = reader.getEventType();
-		if (event == START_ELEMENT) {
-			QName name = reader.getName();
-			if (WS_POLICY_QNAME.equals(name)) {
-				OMElement policyElement = loadElement(reader);
-				wsPolicy = PolicyEngine.getPolicy(policyElement);
-			}
-		}
-		return wsPolicy;
-    }
-        
-    public void write(org.apache.neethi.Policy wsPolicy, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write an <sca:policySet>
-        writer.writeStartElement(WS_POLICY_NS, WS_POLICY);
-       
-        //FIXME write proper ws-policy stuff here
-       
-        writer.writeEndElement();
-    }
-
-    public void resolve(org.apache.neethi.Policy wsPolicy, ModelResolver resolver) throws ContributionResolveException {
-
-    }   
-
-       
-    private OMElement loadElement(XMLStreamReader reader) throws XMLStreamException {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMElement head = fac.createOMElement(reader.getName());
-        OMElement current = head;
-        
-        while (true) {
-            switch (reader.next()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    QName name = reader.getName();
-                    OMElement child = fac.createOMElement(name, current);
-
-                    int count = reader.getNamespaceCount();
-                    for (int i = 0; i < count; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        child.declareNamespace(ns, prefix);
-                    }
-
-                    if(!"".equals(name.getNamespaceURI())) {
-                        child.declareNamespace(name.getNamespaceURI(), name.getPrefix());
-                    }
-
-                    // add the attributes for this element
-                    count = reader.getAttributeCount();
-                    for (int i = 0; i < count; i++) {
-                        OMNamespace omNs = null;
-                        String ns = reader.getAttributeNamespace(i);
-                        String prefix = reader.getAttributePrefix(i);
-                        String qname = reader.getAttributeLocalName(i);
-                        String value = reader.getAttributeValue(i);
-                        
-                        if ( ns != null ) {
-                            omNs = fac.createOMNamespace(ns, prefix);
-                        }
-                            
-                        child.addAttribute(qname, value, omNs);
-                        if (ns != null) {
-                            child.declareNamespace(ns, prefix);
-                        }
-                    }
-                    current = child;
-                    break;
-                case XMLStreamConstants.CDATA:
-                    fac.createOMText(current, reader.getText());
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    fac.createOMText(current, reader.getText());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    if ( current == head ) {
-                        return head;
-                    } else {
-                        current = (OMElement)current.getParent();
-                    }
-            }
-        }
-    }
-    
-
- }
diff --git a/tags/java/sca/1.3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 2e11e31fec..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/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.xml.ws.WSPolicyProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#Policy,model=org.apache.neethi.Policy
diff --git a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
deleted file mode 100644
index b887257efe..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/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.policy.xml;
-
-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/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
deleted file mode 100644
index 8c138a57dd..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.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.policy.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.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.Policy;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
-
-    public QName getArtifactType() {
-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
-    }
-
-    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", "PolicyAttachment");
-        }
-
-        public boolean isUnresolved() {
-            return false;
-        }
-
-        public void setUnresolved(boolean unresolved) {
-        }
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
deleted file mode 100644
index 13b3c44521..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.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.policy.xml;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.io.StringReader;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.policy.xml.ws.WSPolicyProcessor;
-
-import junit.framework.TestCase;
-
-/**
- * Test reading SCA XML assembly documents.
- * 
- * @version $Rev$ $Date$
- */
-public class WSPolicyProcessorTestCase extends TestCase {
-	
-	private static final String VALID_WS_POLICY = 
-		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		    + "<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\">"
-            + " "
-            + " <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>"
-            + " </definitions>";
-	
-	private XMLInputFactory inputFactory;
-        
-    @Override
-    public void setUp() throws Exception {
-        inputFactory = XMLInputFactory.newInstance();
-        
-    }
-
-    public void testReadWsPolicy() throws Exception {
-    	XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(VALID_WS_POLICY));
-    	WSPolicyProcessor processor = new WSPolicyProcessor();
-    	Object artifact = null;
-    	
-        QName name = null;
-        reader.next();
-        while ( true ) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT: {
-                	name = reader.getName();
-                	
-                	if(WSPolicyProcessor.WS_POLICY_QNAME.equals(name)) {
-                		 artifact = processor.read(reader);
-                	}
-                	
-                    break;
-                }
-            }
-            
-            if ( reader.hasNext() ) {
-                reader.next();
-            } else {
-                break;
-            }
-        }
-        assertNotNull(artifact);
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/tags/java/sca/1.3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
deleted file mode 100644
index 814476b4f9..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ /dev/null
@@ -1,106 +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">
-
-<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/tags/java/sca/1.3/modules/policy-xml/LICENSE b/tags/java/sca/1.3/modules/policy-xml/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/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/tags/java/sca/1.3/modules/policy-xml/NOTICE b/tags/java/sca/1.3/modules/policy-xml/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/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/tags/java/sca/1.3/modules/policy-xml/pom.xml b/tags/java/sca/1.3/modules/policy-xml/pom.xml
deleted file mode 100644
index b74e1053c6..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/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-modules</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-policy-xml</artifactId>

-    <name>Apache Tuscany SCA Policy XML Model</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-policy</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <!--dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <version>1.2.5</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>                

-            </exclusions>

-        </dependency>

-        

-        <dependency>

-            <groupId>xerces</groupId>

-            <artifactId>xercesImpl</artifactId>

-            <version>2.8.1</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.neethi</groupId>

-            <artifactId>neethi</artifactId>

-            <version>2.0.2</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.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.5</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.mail</groupId>

-                    <artifactId>mail</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency-->

-                

-        <dependency>

-            <groupId>org.codehaus.woodstox</groupId>

-            <artifactId>wstx-asl</artifactId>

-            <version>3.2.1</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <!--dependency>

-            <groupId>commons-logging</groupId>

-            <artifactId>commons-logging</artifactId>

-            <version>1.1</version>

-            <scope>runtime</scope>

-            <exclusions>

-               <exclusion>

-                   <groupId>commons-logging</groupId>

-                   <artifactId>commons-logging</artifactId>

-               </exclusion>

-            </exclusions>

-        </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.xml</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.policy.xml*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
deleted file mode 100644
index d47cbd7dbe..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.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.policy.xml;
-
-import javax.xml.namespace.QName;
-
-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.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-
-
-/**
- * Processor for handling XML models of BindingType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-public class BindingTypeProcessor extends IntentAttachPointTypeProcessor {
-
-    public BindingTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, 
-    		                    StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor);
-    }
-
-    public BindingTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    		                    StAXArtifactProcessor<Object> extensionProcessor,
-    		                    Monitor monitor) {
-        super(modelFactories.getFactory(PolicyFactory.class),
-              modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor);
-    }
-
-    public QName getArtifactType() {
-        return BINDING_TYPE_QNAME;
-    }
-    
-    @Override
-    protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        if ( extnType instanceof BindingTypeImpl ) {
-            BindingTypeImpl bindingType = (BindingTypeImpl)extnType;
-            return resolver.resolveModel(BindingTypeImpl.class, bindingType);
-        } else {
-            return extnType;
-        }
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
deleted file mode 100644
index 119afa3473..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.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.policy.xml;
-
-import javax.xml.namespace.QName;
-
-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.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
-
-
-/**
- * Processor for handling XML models of ImplementationType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationTypeProcessor extends IntentAttachPointTypeProcessor {
-	
-    public ImplementationTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, 
-    		                           StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor);
-    }
-
-    public ImplementationTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    								   StAXArtifactProcessor<Object> extensionProcessor,
-    								   Monitor monitor) {
-        super(modelFactories.getFactory(PolicyFactory.class),
-              modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor);
-    }
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_TYPE_QNAME;
-    }
-    
-    @Override
-    protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        if ( extnType instanceof ImplementationTypeImpl ) {
-            ImplementationTypeImpl implType = (ImplementationTypeImpl)extnType;
-            return resolver.resolveModel(ImplementationTypeImpl.class, implType);
-        } else {
-            return extnType;
-        }
-        
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
deleted file mode 100644
index ec357aea93..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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.builder.impl.ProblemImpl;
-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;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
-
-
-/**
- * Processor for handling XML models of ExtensionType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class IntentAttachPointTypeProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<IntentAttachPointType>, PolicyConstants {
-
-    private IntentAttachPointTypeFactory attachPointTypeFactory;
-    private PolicyFactory policyFactory;
-    private Monitor monitor;
-    
-    protected abstract IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException;
-
-    public IntentAttachPointTypeProcessor(PolicyFactory policyFactory, 
-    		                              IntentAttachPointTypeFactory attachPointTypeFactory, 
-    		                              StAXArtifactProcessor<Object> extensionProcessor,
-    		                              Monitor monitor) {
-        this.policyFactory = policyFactory;
-        this.attachPointTypeFactory = attachPointTypeFactory;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-    }
-    
-    public IntentAttachPointType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        QName type = getQName(reader, TYPE);
-        
-        if ( type != null ) {
-            if ( type.getLocalPart().startsWith(BINDING) ) {
-                IntentAttachPointType bindingType = attachPointTypeFactory.createBindingType();
-                bindingType.setName(type);
-                bindingType.setUnresolved(true);
-                
-                readAlwaysProvidedIntents(bindingType, reader);
-                readMayProvideIntents(bindingType, reader);
-                return bindingType; 
-            } else if ( type.getLocalPart().startsWith(IMPLEMENTATION) ) {
-                IntentAttachPointType implType = attachPointTypeFactory.createImplementationType();
-                implType.setName(type);
-                implType.setUnresolved(true);
-                
-                readAlwaysProvidedIntents(implType, reader);
-                readMayProvideIntents(implType, reader);
-                return implType;
-            } else {
-            	error("UnrecognizedIntentAttachPointType", reader, type);
-                //throw new ContributionReadException("Unrecognized IntentAttachPointType - " + type);
-            }
-        } else {
-        	error("RequiredAttributeMissing", reader, TYPE);
-            //throw new ContributionReadException("Required attribute '" + TYPE + 
-                                                //"' missing from BindingType Definition");
-        }        
-        return null;
-    }
-
-    private void readAlwaysProvidedIntents(IntentAttachPointType extnType, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, ALWAYS_PROVIDES);
-        if (value != null) {
-            List<Intent> alwaysProvided = extnType.getAlwaysProvidedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                alwaysProvided.add(intent);
-            }
-        }
-    }
-    
-    private void readMayProvideIntents(IntentAttachPointType extnType, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, MAY_PROVIDE);
-        if (value != null) {
-            List<Intent> mayProvide = extnType.getMayProvideIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                mayProvide.add(intent);
-            }
-        }
-    }
-  
-    public void write(IntentAttachPointType extnType, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write an <sca:bindingType or sca:implementationType>
-        if ( extnType instanceof BindingTypeImpl ) {
-            writer.writeStartElement(SCA10_NS, BINDING_TYPE);
-        } else if ( extnType instanceof ImplementationTypeImpl ) {
-            writer.writeStartElement(SCA10_NS, IMPLEMENTATION_TYPE);
-        }
-        
-        writeAlwaysProvidesIntentsAttribute(extnType, writer);
-        writeMayProvideIntentsAttribute(extnType, writer);
-        
-        writer.writeEndElement();
-    }
-    
-    private void writeMayProvideIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException {
-        StringBuffer sb  = new StringBuffer();
-        for ( Intent intent : extnType.getMayProvideIntents() ) {
-            writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
-            sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart());
-            sb.append(WHITE_SPACE);
-        }
-        
-        if ( sb.length() > 0 ) {
-            writer.writeAttribute(MAY_PROVIDE, sb.toString());
-        }
-    }
-    
-    private void writeAlwaysProvidesIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException {
-        StringBuffer sb  = new StringBuffer();
-        for ( Intent intent : extnType.getAlwaysProvidedIntents() ) {
-            writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
-            sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart());
-            sb.append(WHITE_SPACE);
-        }
-        
-        if ( sb.length() > 0 ) {
-            writer.writeAttribute(ALWAYS_PROVIDES, sb.toString());
-            
-        }
-    }
-    
-    public void resolve(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        
-    	if (extnType != null && extnType.isUnresolved()) {
-    	    resolveAlwaysProvidedIntents(extnType, resolver);
-            resolveMayProvideIntents(extnType, resolver);
-            extnType.setUnresolved(false);
-            //resolveExtensionType(extnType, resolver);
-        }
-    }
-
-    private void resolveAlwaysProvidedIntents(IntentAttachPointType extensionType,
-                                              ModelResolver resolver) throws ContributionResolveException {
-        if (extensionType != null) {
-            // resolve all provided intents
-            List<Intent> alwaysProvided = new ArrayList<Intent>();
-            for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!providedIntent.isUnresolved()) {
-                        alwaysProvided.add(providedIntent);
-                    } else {
-                    	error("AlwaysProvidedIntentNotFound", resolver, providedIntent, extensionType);
-                        //throw new ContributionResolveException("Always Provided Intent - " + providedIntent
-                                                                     //+ " not found for ExtensionType "
-                                                                     //+ extensionType);
-                    }
-                } else {
-                    alwaysProvided.add(providedIntent);
-                }
-            }
-            extensionType.getAlwaysProvidedIntents().clear();
-            extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided);
-        }
-    }
-    
-    private void resolveMayProvideIntents(IntentAttachPointType extensionType,
-                                            ModelResolver resolver) throws ContributionResolveException {
-        if (extensionType != null) {
-            // resolve all provided intents
-            List<Intent> mayProvide = new ArrayList<Intent>();
-            for (Intent providedIntent : extensionType.getMayProvideIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!providedIntent.isUnresolved()) {
-                        mayProvide.add(providedIntent);
-                    } else {
-                    	error("MayProvideIntentNotFound", resolver, providedIntent, extensionType);
-                        //throw new ContributionResolveException("May Provide Intent - " + providedIntent
-                                                                     //+ " not found for ExtensionType "
-                                                                     //+ extensionType);
-                    }
-                } else {
-                    mayProvide.add(providedIntent);
-                }
-            }
-            extensionType.getMayProvideIntents().clear();
-            extensionType.getMayProvideIntents().addAll(mayProvide);
-        }
-    }
-    
-    public Class<IntentAttachPointType> getModelType() {
-        return IntentAttachPointType.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
deleted file mode 100644
index 3f1008e9a8..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.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.xml;

-

-import javax.xml.namespace.QName;

-

-/**

- * constants related to policy framework

- *

- * @version $Rev$ $Date$

- */

-public interface PolicyConstants {

-    String WHITE_SPACE = " ";

-    String COLON = ":";

-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

-    String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

-    String INTENT = "intent";

-    String POLICY_SET = "policySet";

-    String POLICY_SET_REFERENCE = "policySetReference";

-    String INTENT_MAP = "intentMap";

-    String NAME = "name";

-    String TARGET_NAMESPACE = "targetNamespace";

-    String SCA_DEFINITIONS = "definitions";

-    String CONSTRAINS = "constrains";

-    String DESCRIPTION = "description";

-    String PROVIDES = "provides";

-    String APPLIES_TO = "appliesTo";

-    String ALWAYS_APPLIES_TO = "alwaysAppliesTo";

-    String QUALIFIER = ".";

-    String INTENT_MAP_QUALIFIER = "qualifier";

-    String REQUIRES = "requires";

-    String EXCLUDES = "excludes";

-    String DEFAULT = "default";

-       

-    String ALWAYS_PROVIDES = "alwaysProvides";

-    String MAY_PROVIDE = "mayProvide";

-    String TYPE = "type";

-    String IMPLEMENTATION_TYPE = "implementationType";

-    String BINDING_TYPE = "bindingType";

-    QName IMPLEMENTATION_TYPE_QNAME = new QName(SCA10_NS, IMPLEMENTATION_TYPE);

-    QName BINDING_TYPE_QNAME = new QName(SCA10_NS, BINDING_TYPE);

-    String BINDING = "binding";

-    String IMPLEMENTATION = "implementation";

-    

-    QName POLICY_INTENT_QNAME = new QName(SCA10_NS, INTENT);

-    QName POLICY_SET_QNAME = new QName(SCA10_NS, POLICY_SET);

-    QName POLICY_INTENT_MAP_QNAME = new QName(SCA10_NS, INTENT_MAP); 

-    QName SCA_DEFINITIONS_QNAME = new QName(SCA10_NS, SCA_DEFINITIONS);

-    QName DESCRIPTION_QNAME = new QName(SCA10_NS, DESCRIPTION);

-    QName POLICY_INTENT_MAP_QUALIFIER_QNAME = new QName(SCA10_NS, INTENT_MAP_QUALIFIER);

-    QName POLICY_SET_REFERENCE_QNAME = new QName(SCA10_NS, POLICY_SET_REFERENCE);

-    

-    String QUALIFIED_INTENT_CONSTRAINS_ERROR = " - Qualified Intents must not specify 'constrains' attribute";

-    

-    

-    

-    

-    

-}

diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
deleted file mode 100644
index 109090ccab..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-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.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.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;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.ProfileIntent;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class PolicyIntentProcessor<T extends Intent> extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<T>, PolicyConstants {
-
-    private PolicyFactory policyFactory;
-    private Monitor monitor;
-
-    public PolicyIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.monitor = monitor;
-    }
-    
-    public PolicyIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        this.policyFactory = 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 = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-    }
-
-    public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Intent policyIntent = null;
-        String policyIntentName = reader.getAttributeValue(null, NAME);
-        // Read an <sca:intent>
-        if (reader.getAttributeValue(null, REQUIRES) != null) {
-            policyIntent = policyFactory.createProfileIntent();
-        } else if ( policyIntentName != null && policyIntentName.indexOf(QUALIFIER) != -1) {
-            policyIntent = policyFactory.createQualifiedIntent();
-            
-            int qualifierIndex = policyIntentName.lastIndexOf(QUALIFIER);
-            Intent qualifiableIntent = policyFactory.createIntent();
-            qualifiableIntent.setUnresolved(true);
-            qualifiableIntent.setName(new QName(policyIntentName.substring(0, qualifierIndex)));
-            
-            ((QualifiedIntent)policyIntent).setQualifiableIntent(qualifiableIntent);
-        } else {
-            policyIntent = policyFactory.createIntent();
-        }
-        policyIntent.setName(new QName(policyIntentName));
-        
-        if ( policyIntent instanceof ProfileIntent ) {
-            readRequiredIntents((ProfileIntent)policyIntent, reader);
-        }
-        else {
-            readExcludedIntents(policyIntent, reader);
-        }
-        
-        readConstrainedArtifacts(policyIntent, reader);
-
-        int event = reader.getEventType();
-        QName name = null;
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if (DESCRIPTION_QNAME.equals(name)) {
-                        policyIntent.setDescription(reader.getElementText());
-                    }
-                    break;
-                }
-            }
-            if (event == END_ELEMENT && POLICY_INTENT_QNAME.equals(reader.getName())) {
-                break;
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return (T)policyIntent;
-    }
-    
-    public void write(T policyIntent, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // Write an <sca:intent>
-        writer.writeStartElement(PolicyConstants.SCA10_NS, INTENT);
-        writer.writeNamespace(policyIntent.getName().getPrefix(), policyIntent.getName().getNamespaceURI());
-        writer.writeAttribute(PolicyConstants.NAME, 
-                              policyIntent.getName().getPrefix() + COLON + policyIntent.getName().getLocalPart());
-        if (policyIntent instanceof ProfileIntent) {
-            ProfileIntent profileIntent = (ProfileIntent)policyIntent;
-            if (profileIntent.getRequiredIntents() != null && 
-                profileIntent.getRequiredIntents().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (Intent requiredIntents : profileIntent.getRequiredIntents()) {
-                    sb.append(requiredIntents.getName());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(PolicyConstants.REQUIRES, sb.toString());
-            }
-        }
-        else {
-            if (policyIntent.getExcludedIntents() != null && 
-                policyIntent.getExcludedIntents().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (Intent excludedIntents : policyIntent.getExcludedIntents()) {
-                    sb.append(excludedIntents.getName());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(PolicyConstants.EXCLUDES, sb.toString());
-            }
-        }
-        
-        if (!(policyIntent instanceof QualifiedIntent) ) {
-            if (policyIntent.getConstrains() != null && 
-                policyIntent.getConstrains().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (QName contrainedArtifact : policyIntent.getConstrains()) {
-                    sb.append(contrainedArtifact.toString());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(CONSTRAINS, sb.toString());
-            } else {
-            	error("ContrainsAttributeMissing", policyIntent, policyIntent.getName());
-                //throw new ContributionWriteException("Contrains attribute missing from " +
-                                        //"Policy Intent Definition" + policyIntent.getName());
-            }
-        }
-        
-        if ( policyIntent.getDescription() != null && policyIntent.getDescription().length() > 0) {
-            writer.writeStartElement(PolicyConstants.SCA10_NS, DESCRIPTION);
-            writer.writeCData(policyIntent.getDescription());
-            writer.writeEndElement();
-        }
-        
-        writer.writeEndElement();
-    }
-
-    //FIXME This method is never used
-//    private Intent resolveRequiredIntents(ProfileIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-//        boolean isUnresolved = false;
-//        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 
-//        if (policyIntent != null && policyIntent.isUnresolved()) {
-//            
-//            //resolve all required intents
-//            List<Intent> requiredIntents = new ArrayList<Intent>(); 
-//            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
-//                if ( requiredIntent.isUnresolved() ) {
-//                    //policyIntent.getRequiredIntents().remove(requiredIntent);
-//                    requiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
-//                    requiredIntents.add(requiredIntent);
-//                    if (requiredIntent.isUnresolved()) {
-//                        isUnresolved = true;
-//                    }
-//                }
-//            }
-//            policyIntent.getRequiredIntents().clear();
-//            policyIntent.getRequiredIntents().addAll(requiredIntents);
-//        }
-//        policyIntent.setUnresolved(isUnresolved);
-//        
-//        return policyIntent;
-//    }
-    
-    //FIXME This method is never used
-//    private Intent resolveQualifiableIntent(QualifiedIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-//        boolean isUnresolved = false;
-//
-//        if (policyIntent != null && policyIntent.isUnresolved()) {
-//            //resolve the qualifiable intent
-//            Intent qualifiableIntent = 
-//                resolver.resolveModel(Intent.class, policyIntent.getQualifiableIntent());
-//            policyIntent.setQualifiableIntent(qualifiableIntent);
-//            isUnresolved = qualifiableIntent.isUnresolved();
-//        }
-//        policyIntent.setUnresolved(isUnresolved);
-//        
-//        return policyIntent;
-//    }
-    
-    private void resolveContrainedArtifacts(Intent policyIntent, ModelResolver resolver) {
-        //FIXME : need to figure out this resolution. 
-        policyIntent.setUnresolved(false);
-    }
-    
-    private void resolveProfileIntent(ProfileIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        // FIXME: Need to check for cyclic references first i.e an A requiring B
-        // and then B requiring A...
-        if (policyIntent != null) {
-            // resolve all required intents
-            List<Intent> requiredIntents = new ArrayList<Intent>();
-            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
-                if (requiredIntent.isUnresolved()) {
-                    Intent resolvedRequiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
-                    if (resolvedRequiredIntent != null) {
-                        requiredIntents.add(resolvedRequiredIntent);
-                    } else {
-                    	error("RequiredIntentNotFound", resolver, requiredIntent, policyIntent);
-                        //throw new ContributionResolveException("Required Intent - " + requiredIntent
-                                                    //+ " not found for ProfileIntent " + policyIntent);
-                    }
-                } else {
-                    requiredIntents.add(requiredIntent);
-                }
-            }
-            policyIntent.getRequiredIntents().clear();
-            policyIntent.getRequiredIntents().addAll(requiredIntents);
-        }
-    }
-
-    private void resolveQualifiedIntent(QualifiedIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (policyIntent != null) {
-            //resolve the qualifiable intent
-            Intent qualifiableIntent = policyIntent.getQualifiableIntent();
-            if (qualifiableIntent.isUnresolved()) {
-                Intent resolvedQualifiableIntent = resolver.resolveModel(Intent.class, qualifiableIntent);
-    
-                if (resolvedQualifiableIntent != null) {
-                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);
-                } else {
-                	error("QualifiableIntentNotFound", resolver, qualifiableIntent, policyIntent);
-                    //throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent
-                                                    //+ " not found for QualifiedIntent " + policyIntent);
-                }
-    
-            }
-        }
-    }
-    
-    public void resolve(T policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        if (policyIntent instanceof ProfileIntent) {
-            resolveProfileIntent((ProfileIntent)policyIntent, resolver);
-        }
-        else {
-            resolveExcludedIntents(policyIntent, resolver);
-        }
-
-        if (policyIntent instanceof QualifiedIntent) {
-            resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver);
-        }
-        
-        resolveContrainedArtifacts(policyIntent, resolver);
-
-        /* This is too late in the processing
-        if ( !policyIntent.isUnresolved() ) {
-            resolver.addModel(policyIntent);
-        }
-        */
-    }
-    
-    public QName getArtifactType() {
-        return POLICY_INTENT_QNAME;
-    }
-    
-    private void readConstrainedArtifacts(Intent policyIntent, XMLStreamReader reader) throws ContributionReadException {
-        String value = reader.getAttributeValue(null, CONSTRAINS);
-        if ( policyIntent instanceof QualifiedIntent && value != null) {
-        	error("ErrorInPolicyIntentDefinition", policyIntent, policyIntent.getName(), QUALIFIED_INTENT_CONSTRAINS_ERROR);
-            //String errorMsg = "Error in PolicyIntent Definition - " + policyIntent.getName() + QUALIFIED_INTENT_CONSTRAINS_ERROR;
-            //throw new ContributionReadException(errorMsg);
-        } else {
-            if (value != null) {
-                List<QName> constrainedArtifacts = policyIntent.getConstrains();
-                for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                    QName qname = getQNameValue(reader, tokens.nextToken());
-                    constrainedArtifacts.add(qname);
-                }
-            }
-        }
-    }
-    
-    private void readRequiredIntents(ProfileIntent policyIntent, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, REQUIRES);
-        if (value != null) {
-            List<Intent> requiredIntents = policyIntent.getRequiredIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                intent.setUnresolved(true);
-                requiredIntents.add(intent);
-            }
-        }
-    }
-
-    private void readExcludedIntents(Intent policyIntent, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, "excludes");
-        if (value != null) {
-            List<Intent> excludedIntents = policyIntent.getExcludedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                intent.setUnresolved(true);
-                excludedIntents.add(intent);
-            }
-        }
-    }
-
-    private void resolveExcludedIntents(Intent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (policyIntent != null) {
-            // resolve all excluded intents
-            List<Intent> excludedIntents = new ArrayList<Intent>();
-            for (Intent excludedIntent : policyIntent.getExcludedIntents()) {
-                if (excludedIntent.isUnresolved()) {
-                    Intent resolvedExcludedIntent = resolver.resolveModel(Intent.class, excludedIntent);
-                    if (resolvedExcludedIntent != null) {
-                        excludedIntents.add(resolvedExcludedIntent);
-                    } else {
-                    	error("ExcludedIntentNotFound", resolver, excludedIntent, policyIntent);
-                        //throw new ContributionResolveException("Excluded Intent " + excludedIntent
-                                                         //+ " not found for intent " + policyIntent);
-                    }
-                } else {
-                    excludedIntents.add(excludedIntent);
-                }
-            }
-            policyIntent.getExcludedIntents().clear();
-            policyIntent.getExcludedIntents().addAll(excludedIntents);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
deleted file mode 100644
index b6f33aa677..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.xml;
-
-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.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 javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.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;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-
-/**
- * Processor for handling XML models of PolicySet definitions
- *
- * @version $Rev$ $Date$
- */
-public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<PolicySet>, PolicyConstants {
-
-    private PolicyFactory policyFactory;
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private XPathFactory xpathFactory = XPathFactory.newInstance();
-    private Monitor monitor;
-    
-    public PolicySetProcessor(ModelFactoryExtensionPoint modelFactories, 
-    						  StAXArtifactProcessor<Object> extensionProcessor,
-    						  Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    public PolicySetProcessor(PolicyFactory policyFactory, 
-    						  StAXArtifactProcessor<Object> extensionProcessor,
-    						  Monitor monitor) {
-        this.policyFactory = policyFactory;
-        this.extensionProcessor = extensionProcessor;
-        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 = new ProblemImpl(this.getClass().getName(), "policy-xml-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(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-    public PolicySet read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        String policySetName = reader.getAttributeValue(null, NAME);
-        
-        PolicySet policySet = policyFactory.createPolicySet();
-        policySet.setName(new QName(policySetName));
-        String appliesTo = reader.getAttributeValue(null, APPLIES_TO);
-        String alwaysAppliesTo = reader.getAttributeValue(TUSCANY_NS, ALWAYS_APPLIES_TO);
-        
-        //TODO: with 1.0 version of specs the applies to xpath is given related to the immediate
-        //parent whereas the runtime evaluates the xpath aginst the composite element.  What the runtime
-        //is doing is what the future version of the specs could be tending towards.  When that happens
-        //this 'if' must be deleted
-        if ( appliesTo != null && !appliesTo.startsWith("/") ) {
-            appliesTo = "//" + appliesTo;
-        }
-        
-        if ( alwaysAppliesTo != null && !alwaysAppliesTo.startsWith("/") ) {
-            alwaysAppliesTo = "//" + alwaysAppliesTo;
-        }
-        
-        policySet.setAppliesTo(appliesTo);
-        policySet.setAlwaysAppliesTo(alwaysAppliesTo);
-
-        XPath path = xpathFactory.newXPath(); 
-        path.setNamespaceContext(reader.getNamespaceContext());
-        try {
-            if (appliesTo != null) {
-                policySet.setAppliesToXPathExpression(path.compile(appliesTo));
-            }
-            if (alwaysAppliesTo != null) {
-                policySet.setAlwaysAppliesToXPathExpression(path.compile(alwaysAppliesTo));
-            }
-        } catch (XPathExpressionException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", policySet, ce);
-            //throw ce;
-        }  
-        
-        readProvidedIntents(policySet, reader);
-        
-        int event = reader.getEventType();
-        QName name = null;
-        reader.next();
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-                        Intent mappedIntent = policyFactory.createIntent();
-                        mappedIntent.setName(getQName(reader, PROVIDES));
-                        if ( policySet.getProvidedIntents().contains(mappedIntent) ) {
-                            readIntentMap(reader, policySet, mappedIntent);
-                        } else {
-                        	error("IntentNotSpecified", policySet, policySetName);
-                            //throw new ContributionReadException("Intent Map provides for Intent not specified as provided by parent PolicySet - " + policySetName);
-                        }
-                    } else if ( POLICY_SET_REFERENCE_QNAME.equals(name) )  {
-                        PolicySet referredPolicySet = policyFactory.createPolicySet();
-                        referredPolicySet.setName(getQName(reader, NAME));
-                        policySet.getReferencedPolicySets().add(referredPolicySet);
-                    } /*else if ( WS_POLICY_QNAME.equals(name) )  {
-                        OMElement policyElement = loadElement(reader);
-                        org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
-                        policySet.getPolicies().add(wsPolicy);
-                    } */ else {
-                        Object extension = extensionProcessor.read(reader);
-                        if ( extension != null ) {
-                            policySet.getPolicies().add(extension);
-                        }
-                    }
-                    break;
-                }
-            }
-            if ( event == END_ELEMENT ) {
-                if ( POLICY_SET_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return policySet;
-    }
-    
-    
-    public void readIntentMap(XMLStreamReader reader, PolicySet policySet, Intent mappedIntent) throws ContributionReadException {
-        QName name = reader.getName();
-        Map<Intent, List<Object>> mappedPolicies = policySet.getMappedPolicies();
-        if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-            //Intent mappedIntent = policyFactory.createIntent();
-            //mappedIntent.setName(getQName(reader, PROVIDES));
-            String defaultQualifier = getString(reader, DEFAULT);
-            
-            String qualifierName = null;
-            String qualfiedIntentName = null;
-            Intent qualifiedIntent = null;
-        
-            int event = reader.getEventType();
-            try {
-                reader.next();
-                while (reader.hasNext()) {
-                    event = reader.getEventType();
-                    switch (event) {
-                        case START_ELEMENT : {
-                            name = reader.getName();
-                            if ( POLICY_INTENT_MAP_QUALIFIER_QNAME.equals(name)) {
-                                qualifierName = getString(reader, NAME);
-                                qualfiedIntentName = mappedIntent.getName().getLocalPart() + 
-                                                            QUALIFIER + qualifierName;
-                                qualifiedIntent = policyFactory.createIntent();
-                                qualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
-                                                                  qualfiedIntentName)); 
-                            } else if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-                                QName providedIntent = getQName(reader, PROVIDES);
-                                if ( qualifierName.equals(providedIntent.getLocalPart()) ) {
-                                    readIntentMap(reader, policySet, qualifiedIntent);
-                                } else {
-                                	error("IntentMapDoesNotMatch", providedIntent, providedIntent, qualifierName, policySet);
-                                    //throw new ContributionReadException("Intent provided by IntentMap " + 
-                                                                    //providedIntent + " does not match parent qualifier " + qualifierName +
-                                                                    //" in policyset - " + policySet);
-                                }
-                            }/* else if ( WS_POLICY_QNAME.equals(name) )  {
-                                OMElement policyElement = loadElement(reader);
-                                Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
-                                policySet.getPolicies().add(wsPolicy);
-                                
-                                List<Object> policyList = mappedPolicies.get(qualifiedIntent);
-                                if ( policyList == null ) {
-                                    policyList = new ArrayList<Object>();
-                                    mappedPolicies.put(qualifiedIntent, policyList);
-                                    
-                                    if (qualifierName.equals(defaultQualifier)) {
-                                        mappedPolicies.put(mappedIntent, policyList);
-                                    }
-                                }
-                                policyList.add((Policy)wsPolicy);
-                            }*/ else {
-                                Object extension = extensionProcessor.read(reader);
-                                if ( extension != null ) {
-                                    List<Object> policyList = mappedPolicies.get(qualifiedIntent);
-                                    if ( policyList == null ) {
-                                        policyList = new ArrayList<Object>();
-                                        mappedPolicies.put(qualifiedIntent, policyList);
-                                        
-                                        if (qualifierName.equals(defaultQualifier)) {
-                                            mappedPolicies.put(mappedIntent, policyList);
-                                        }
-                                    }
-                                    policyList.add(extension);
-                                }
-                            }
-                            break;
-                        }
-                        case END_ELEMENT : {
-                            if ( POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) {
-                                if ( defaultQualifier != null ) {
-                                    String qualifiedIntentName = mappedIntent.getName().getLocalPart() + QUALIFIER + defaultQualifier;
-                                    Intent defaultQualifiedIntent = policyFactory.createIntent();
-                                    defaultQualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
-                                                                             qualifiedIntentName));
-                                    List<Object> policyList = mappedPolicies.get(defaultQualifiedIntent);
-                                    if ( policyList != null ) {
-                                        mappedPolicies.put(mappedIntent, policyList);
-                                    } else {
-                                    	error("UnableToMapPolicies", mappedPolicies, mappedIntent, policySet);
-                                        //throw new ContributionReadException("Unable to map policies for default qualifier in IntentMap for - " +
-                                                                            //mappedIntent + " in policy set - " + policySet);
-                                    }
-                                    defaultQualifier = null;
-                                }
-                            } 
-                            break;
-                        }
-                    }
-                    if ( event == END_ELEMENT && POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) {
-                        break;
-                    }
-                    //Read the next element
-                    if (reader.hasNext()) {
-                        reader.next();
-                    }
-                }
-            }  catch (XMLStreamException e) {
-            	ContributionReadException ce = new ContributionReadException(e);
-            	error("ContributionReadException", reader, ce);
-                throw ce;
-            }
-        }
-    }
-    
-    public void write(PolicySet policySet, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write an <sca:policySet>
-        writer.writeStartElement(SCA10_NS, POLICY_SET);
-        writer.writeNamespace(policySet.getName().getPrefix(), policySet.getName().getNamespaceURI());
-        writer.writeAttribute(NAME, 
-                              policySet.getName().getPrefix() + COLON + policySet.getName().getLocalPart());
-        writer.writeAttribute(APPLIES_TO, policySet.getAppliesTo());
-        writer.writeAttribute(TUSCANY_NS, ALWAYS_APPLIES_TO, policySet.getAlwaysAppliesTo());
-        
-        writeProvidedIntents(policySet, writer);
-        
-        writer.writeEndElement();
-    }
-    
-    private void readProvidedIntents(PolicySet policySet, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, PROVIDES);
-        if (value != null) {
-            List<Intent> providedIntents = policySet.getProvidedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                providedIntents.add(intent);
-            }
-        }
-    }
-    
-    private void writeProvidedIntents(PolicySet policySet, XMLStreamWriter writer) throws XMLStreamException {
-        if (policySet.getProvidedIntents() != null && 
-            policySet.getProvidedIntents().size() > 0) {
-            StringBuffer sb = new StringBuffer();
-            for (Intent providedIntents : policySet.getProvidedIntents()) {
-                sb.append(providedIntents.getName());
-                sb.append(" ");
-            }
-            writer.writeAttribute(PolicyConstants.PROVIDES, sb.toString());
-        }
-    }
-
-   private void resolvePolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-       boolean unresolved = false;
-       for ( Object o : policySet.getPolicies() ) {
-           extensionProcessor.resolve(o, resolver);
-           /*if ( o instanceof Policy && ((Policy)o).isUnresolved() ) {
-              unresolved = true;
-           }*/
-       }
-       policySet.setUnresolved(unresolved);
-   }
-   
-   
-    
-    public QName getArtifactType() {
-        return POLICY_SET_QNAME;
-    }
-    
-    public Class<PolicySet> getModelType() {
-        return PolicySet.class;
-    }
-    
-    private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        if (policySet != null) {
-            //resolve all provided intents
-            List<Intent> providedIntents = new ArrayList<Intent>();
-            for (Intent providedIntent : policySet.getProvidedIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    Intent resolvedProvidedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (resolvedProvidedIntent != null) {
-                        providedIntents.add(resolvedProvidedIntent);
-                    } else {
-                    	error("ProvidedIntentNotFound", policySet, providedIntent, policySet);
-                        //throw new ContributionResolveException("Provided Intent - " + providedIntent
-                                                           //+ " not found for PolicySet " + policySet);
-
-                    }
-                } else {
-                    providedIntents.add(providedIntent);
-                }
-            }
-            policySet.getProvidedIntents().clear();
-            policySet.getProvidedIntents().addAll(providedIntents);
-        }
-     }
-    
-    private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();
-        for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {
-            Intent mappedIntent = entry.getKey();
-            if (mappedIntent.isUnresolved()) {
-                Intent resolvedMappedIntent = resolver.resolveModel(Intent.class, mappedIntent);
-    
-                if (resolvedMappedIntent != null) {
-                    mappedPolicies.put(resolvedMappedIntent, entry.getValue());
-                } else {
-                	error("MappedIntentNotFound", policySet, mappedIntent, policySet);
-                    //throw new ContributionResolveException("Mapped Intent - " + mappedIntent
-                                                   //+ " not found for PolicySet " + policySet);    
-                }
-            } else {
-                mappedPolicies.put(mappedIntent, entry.getValue());
-            }
-        }
-
-        policySet.getMappedPolicies().clear();
-        policySet.getMappedPolicies().putAll(mappedPolicies);
-    }
-    
-    private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-    
-        List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
-            if (referredPolicySet.isUnresolved()) {
-                PolicySet resolvedReferredPolicySet = resolver.resolveModel(PolicySet.class, referredPolicySet);
-                if (resolvedReferredPolicySet != null) {
-                    referredPolicySets.add(resolvedReferredPolicySet);
-                } else {
-                	error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
-                    //throw new ContributionResolveException("Referred PolicySet - " + referredPolicySet
-                                                             //+ "not found for PolicySet - " + policySet);
-                }
-            } else {
-                referredPolicySets.add(referredPolicySet);
-            }
-        }
-        policySet.getReferencedPolicySets().clear();
-        policySet.getReferencedPolicySets().addAll(referredPolicySets);
-    }
-    
-    private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) {
-        for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) {
-            includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet);
-        }
-        policySet.getPolicies().addAll(referredPolicySet.getPolicies());
-        policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies());
-    }
-    
-    public void resolve(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        resolveProvidedIntents(policySet, resolver);
-        resolveIntentsInMappedPolicies(policySet, resolver);
-        resolveReferredPolicySets(policySet, resolver);
-        
-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
-            includeReferredPolicySets(policySet, referredPolicySet);
-        }
-        
-        if ( policySet.isUnresolved() ) {
-            //resolve the policy attachments
-            resolvePolicies(policySet, resolver);
-             
-            if ( !policySet.isUnresolved() ) {
-                 resolver.addModel(policySet);
-            }
-        }
-     }   
- }
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
deleted file mode 100644
index 7c205292b0..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.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.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.ProfileIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions that are ProfileIntents
- *
- * @version $Rev$ $Date$
- */
-public class ProfileIntentProcessor extends PolicyIntentProcessor<ProfileIntent> {
-
-    public ProfileIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-    
-    public ProfileIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-
-    public Class<ProfileIntent> getModelType() {
-        return ProfileIntent.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
deleted file mode 100644
index abe80e2a54..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.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.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions that are QualifiedIntents
- *
- * @version $Rev$ $Date$
- */
-public class QualifiedIntentProcessor extends PolicyIntentProcessor<QualifiedIntent> {
-	
-    public QualifiedIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-    
-    public QualifiedIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-
-    public Class<QualifiedIntent> getModelType() {
-        return QualifiedIntent.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
deleted file mode 100644
index 73795349c1..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.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.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions
- *
- * @version $Rev$ $Date$
- */
-public class SimpleIntentProcessor extends PolicyIntentProcessor<Intent> {
-
-    public SimpleIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-
-    public SimpleIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-
-    public Class<Intent> getModelType() {
-        return Intent.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index c41a0cd01f..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#bindingType,model=org.apache.tuscany.sca.policy.IntentAttachPointType
-org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementationType,model=org.apache.tuscany.sca.policy.IntentAttachPointType
-org.apache.tuscany.sca.policy.xml.SimpleIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.Intent
-org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#policySet,model=org.apache.tuscany.sca.policy.PolicySet
-org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.ProfileIntent
-org.apache.tuscany.sca.policy.xml.QualifiedIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.QualifiedIntent
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/tags/java/sca/1.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
deleted file mode 100644
index d8eb214c15..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.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.
-#
-#
-ReferredPolicySetNotFound = Referred PolicySet - {0} not found for PolicySet - {1}
-MappedIntentNotFound = Mapped Intent - {0} not found for PolicySet {1}
-ProvidedIntentNotFound = Provided Intent - {0} not found for PolicySet {1}
-UnableToMapPolicies = Unable to map policies for default qualifier in IntentMap for - {0} in policy set - {1}
-IntentMapDoesNotMatch = Intent provided by IntentMap {0} does not match parent qualifier {1} in policyset - {2}
-IntentNotSpecified = Intent Map provides for Intent not specified as provided by parent PolicySet - {0}
-ContrainsAttributeMissing = Contrains attribute missing from Policy Intent Definition {0}
-RequiredIntentNotFound = Required Intent - {0} not found for ProfileIntent {1}
-QualifiableIntentNotFound = Qualifiable Intent - {0} not found for QualifiedIntent {1}
-ErrorInPolicyIntentDefinition = Error in PolicyIntent Definition - {0} {1}
-ExcludedIntentNotFound = Excluded Intent {0} not found for intent {1}
-UnrecognizedIntentAttachPointType = Unrecognized IntentAttachPointType - {0}
-RequiredAttributeMissing = Required attribute {0} missing from BindingType Definition
-AlwaysProvidedIntentNotFound = Always Provided Intent - {0} not found for ExtensionType {1}
-MayProvideIntentNotFound = May Provide Intent - {0} not found for ExtensionType {1}
-ContributionReadException = ContributionReadException occured due to: {0}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
deleted file mode 100644
index b2e16f97e7..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.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.policy.xml;
-
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-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.DefaultModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-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.ProfileIntent;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
-
-/**
- * Test reading SCA XML assembly documents.
- * 
- * @version $Rev: 551296 $ $Date: 2007-06-28 01:18:35 +0530 (Thu, 28 Jun 2007) $
- */
-public class ReadDocumentTestCase extends TestCase {
-
-    private ModelResolver resolver;
-    private StAXArtifactProcessor<Object> staxProcessor;
-    
-        
-    private Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
-    private Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
-    private Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();
-    private Map<QName, IntentAttachPointType> implTypesTable = new Hashtable<QName, IntentAttachPointType>();
-    private static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";
-    private static final String namespace = "http://test";
-    
-    private static final QName confidentiality = new QName(namespace, "confidentiality");
-    private static final QName integrity = new QName(namespace, "integrity");
-    private static final QName messageProtection = new QName(namespace, "messageProtection");
-    private static final QName confidentiality_transport = new QName(namespace, "confidentiality.transport");   
-    private static final QName confidentiality_message = new QName(namespace, "confidentiality.message");
-    private static final QName secureReliablePolicy = new QName(namespace, "SecureReliablePolicy");
-    private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");
-    private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");
-    private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");
-    private static final QName wsBinding = new QName(scaNamespace, "binding.ws");
-    private static final QName javaImpl = new QName(scaNamespace, "implementation.java");
-    
-
-    @Override
-    public void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        resolver = new DefaultModelResolver();
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
-        
-        URL url = getClass().getResource("test_definitions.xml");
-        InputStream urlStream = url.openStream();
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
-        reader.next();
-        while ( true ) {
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT: {
-                    Object artifact = staxProcessor.read(reader);
-                    if ( artifact instanceof PolicySet ) {
-                        PolicySet policySet = (PolicySet)artifact;
-                        policySet.setName(new QName(namespace, policySet.getName().getLocalPart()));
-                        policySetTable.put(policySet.getName(), policySet);
-                    } else if ( artifact instanceof Intent ) {
-                        Intent intent = (Intent)artifact;
-                        intent.setName(new QName(namespace, intent.getName().getLocalPart()));
-                        if ( intent instanceof QualifiedIntent ) {
-                            ((QualifiedIntent)intent).getQualifiableIntent().
-                                    setName(new QName(namespace, 
-                                                      ((QualifiedIntent)intent).getQualifiableIntent().getName().getLocalPart()));
-                        }
-                        intentTable.put(intent.getName(), intent);
-                    } else if ( artifact instanceof BindingTypeImpl ) {
-                        IntentAttachPointType bindingType = (IntentAttachPointType)artifact;
-                        bindingTypesTable.put(bindingType.getName(), bindingType);
-                    } else if ( artifact instanceof ImplementationTypeImpl ) {
-                        IntentAttachPointType implType = (IntentAttachPointType)artifact;
-                        implTypesTable.put(implType.getName(), implType);
-                    }
-                    
-                    if ( artifact != null ) {
-                        resolver.addModel(artifact);
-                    }
-                    
-                    break;
-                }
-            }
-            if ( reader.hasNext() ) {
-                reader.next();
-            } else {
-                break;
-            }
-        }
-        urlStream.close();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testReadSCADefinitions() throws Exception {
-        assertNotNull(intentTable.get(confidentiality));
-        assertNotNull(intentTable.get(messageProtection));
-        assertNotNull(intentTable.get(confidentiality_transport));
-        assertTrue(intentTable.get(confidentiality).getDescription().length() > 0 );
-        
-        assertNotNull(policySetTable.get(secureReliablePolicy));
-        assertTrue(policySetTable.get(secureReliablePolicy).getProvidedIntents().size() == 2);
-        assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2);
-        
-        assertNotNull(policySetTable.get(secureMessagingPolicies));
-        assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);
-        
-        assertEquals(bindingTypesTable.size(), 1);
-        assertNotNull(bindingTypesTable.get(wsBinding));
-        assertEquals(implTypesTable.size(), 1);
-        assertNotNull(implTypesTable.get(javaImpl));
-    }
-    
-    public void testResolution() throws Exception {
-        assertTrue(intentTable.get(messageProtection) instanceof ProfileIntent);
-        ProfileIntent profileIntent = (ProfileIntent)intentTable.get(new QName(namespace, "messageProtection"));
-        assertNull(profileIntent.getRequiredIntents().get(0).getDescription());
-        
-        QName confidentiality_transport = new QName(namespace, "confidentiality.transport"); 
-        assertTrue(intentTable.get(confidentiality_transport) instanceof QualifiedIntent);
-        QualifiedIntent qualifiedIntent = (QualifiedIntent)intentTable.get(new QName(namespace, "confidentiality.transport"));
-        assertNull(qualifiedIntent.getQualifiableIntent().getDescription());
-        
-        PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy);
-        PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies);
-        PolicySet securityPolicySet = policySetTable.get(securityPolicy);
-        
-        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);
-        assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
-        assertTrue(secureMessagingPolicySet.isUnresolved());
-        assertEquals(securityPolicySet.getMappedPolicies().size(), 5);
-        
-        //testing to ensure that inclusion of referred policy sets has not happened
-        PolicySet basicAuthMsgProtSecurityPolicySet = policySetTable.get(basicAuthMsgProtSecurity);
-        assertTrue(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());
-        assertTrue(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());
-        
-        IntentAttachPointType wsBindingType = bindingTypesTable.get(wsBinding);
-        assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
-        
-        IntentAttachPointType javaImplType = implTypesTable.get(javaImpl);
-        assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNull(javaImplType.getMayProvideIntents().get(0).getDescription());
-        
-        for ( Intent intent : intentTable.values() ) {
-            staxProcessor.resolve(intent, resolver);
-        }
-        
-        for ( PolicySet policySet : policySetTable.values() ) {
-            staxProcessor.resolve(policySet, resolver);
-        }
-        
-        for (  IntentAttachPointType bindingType : bindingTypesTable.values() ) {
-            staxProcessor.resolve(bindingType, resolver);
-        }
-        
-        for ( IntentAttachPointType implType : implTypesTable.values() ) {
-            staxProcessor.resolve(implType, resolver);
-        }
-        
-        
-        
-        //testing if policy intents have been linked have property been linked up 
-        assertNotNull(profileIntent.getRequiredIntents().get(0).getDescription());
-        assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription());
-        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);
-        assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
-        
-        //testing if policysets have been properly linked up with intents
-        assertFalse(secureMessagingPolicySet.isUnresolved());
-        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));
-        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));
-        
-        //testing if intent maps have been properly mapped to policies
-        assertFalse(securityPolicySet.isUnresolved());
-        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));
-        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_message)));
-        
-        //testing for inclusion of referred policysets
-        assertFalse(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());
-        assertFalse(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());
-        assertNotNull(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));
-        
-        assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNotNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
-        
-        assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNotNull(javaImplType.getMayProvideIntents().get(0).getDescription());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
deleted file mode 100644
index ce5b204787..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.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.policy.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.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.Policy;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {

-

-    public QName getArtifactType() {

-        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

-    }

-

-    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", "PolicyAttachment");

-        }

-

-        public boolean isUnresolved() {

-            return false;

-        }

-

-        public void setUnresolved(boolean unresolved) {

-        }

-        

-    }

-}

diff --git a/tags/java/sca/1.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/tags/java/sca/1.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
deleted file mode 100644
index e01a29863a..0000000000
--- a/tags/java/sca/1.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ /dev/null
@@ -1,254 +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="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="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"

-	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"

- bindings="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/tags/java/sca/1.3/modules/policy/LICENSE b/tags/java/sca/1.3/modules/policy/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/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/tags/java/sca/1.3/modules/policy/NOTICE b/tags/java/sca/1.3/modules/policy/NOTICE
deleted file mode 100644
index b3e4797aaa..0000000000
--- a/tags/java/sca/1.3/modules/policy/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-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/tags/java/sca/1.3/modules/policy/pom.xml b/tags/java/sca/1.3/modules/policy/pom.xml
deleted file mode 100644
index af7636179c..0000000000
--- a/tags/java/sca/1.3/modules/policy/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-policy</artifactId>
-    <name>Apache Tuscany SCA Policy Model</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</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.policy</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
deleted file mode 100644
index 6ca4fe72ec..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.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.policy;

-

-import org.apache.tuscany.sca.policy.impl.IntentAttachPointTypeFactoryImpl;

-

-/**

- * Default implementation for IntentAttachPointTypeFactory

- *

- * @version $Rev$ $Date$

- */

-public class DefaultIntentAttachPointTypeFactory extends IntentAttachPointTypeFactoryImpl implements IntentAttachPointTypeFactory{

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
deleted file mode 100644
index 2da41675a1..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.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.policy;
-
-import org.apache.tuscany.sca.policy.impl.PolicyFactoryImpl;
-
-/**
- * A factory for the policy model.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultPolicyFactory extends PolicyFactoryImpl implements PolicyFactory {
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
deleted file mode 100644
index 22f328f643..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.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.policy;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-/**
- * Represents a policy intent. See the Policy Framework specification for a
- * description of this element.
- *
- * @version $Rev$ $Date$
- */
-public interface Intent {
-
-    /**
-     * Returns the intent name.
-     * 
-     * @return the intent name
-     */
-    QName getName();
-
-    /**
-     * Sets the intent name
-     * 
-     * @param name the intent name
-     */
-    void setName(QName name);
-
-    /**
-     * Get the intent domain (the root intent name before any qualifiers)
-     * @return the domain
-     */
-    String getDomain();
-
-    /**
-     * Get the intent qualifiers
-     * @return the domain
-     */
-    String[] getQualifiedNames();
-
-    /**
-     * Returns the list of operations that this intent applies to.
-     * 
-     * @return
-     */
-    //List<Operation> getOperations();
-
-    /**
-     * Returns the list of SCA constructs that this intent is meant to
-     * configure.
-     * 
-     * @return the list of SCA constructs that this intent is meant to configure
-     */
-    List<QName> getConstrains();
-
-    /**
-     * Returns the list of intents which are mutually exclusive with this intent.
-     * 
-     * @return the list of mutually exclusive intents.
-     */
-    List<Intent> getExcludedIntents();
-
-    /**
-     * Returns the list of children qualified intents.
-     * 
-     * @return the list of children qualified intents.
-     */
-    List<Intent> getQualifiedIntents();
-
-    /**
-     * Returns the intent description.
-     * 
-     * @return the intent description
-     */
-    String getDescription();
-
-    /**
-     * Sets the intent description.
-     * 
-     * @param description the intent description
-     */
-    void setDescription(String description);
-
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
deleted file mode 100644
index bf2cfca924..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.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.policy;
-
-import java.util.List;
-
-/**
- * Base interface for all assembly model objects that can be have policy intents
- * attached to them.
- *
- * @version $Rev$ $Date$
- */
-public interface IntentAttachPoint {
-
-    /**
-     * Returns a list of policy intents. See the Policy Framework specification
-     * for a description of this attribute.
-     * 
-     * @return a list of policy intents.
-     */
-    List<Intent> getRequiredIntents();
-    
-   
-    /**
-     * Returns the type of the attach point such as a BindingType or an ImplementationType and so on
-     * @return
-     */
-    IntentAttachPointType getType();
-    
-    /**
-     * 
-     * Sets the type of the attach point such as a BindingType or an ImplementationType and so on
-     * @param type
-     */
-    void setType(IntentAttachPointType type);
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
deleted file mode 100644
index 6db529c7f0..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.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;

-

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-/**

- * Base interface for representing the model type of assembly model objects that can be have policy intents

- * attached to them.

- *

- * @version $Rev$ $Date$

- */

-public interface IntentAttachPointType {

-

-    /**

-     * Returns the name of the extension type defined by this instance e.g. implementation.java, binding.ws

-     * @return the extension type QName

-     */

-    QName getName();

-    

-    /**

-     * Sets the name of the extension type

-     * @param type the name of the extension type

-     */

-    void setName(QName type);

-    

-    /**

-     * Returns the list of names of policy intents that will always be provided by this Extension Type

-     * @return list of Policy Intent names

-     */

-    List<Intent> getAlwaysProvidedIntents();

-    

-    /**

-     * Returns the list of names of policy intents that may be provided by this Extension Type thro

-     * appropriate configuration

-     * @return list of Policy Intent names

-     */

-    List<Intent> getMayProvideIntents();

-    

-    /**

-     * Returns true if the model element is unresolved.

-     * 

-     * @return true if the model element is unresolved.

-     */

-    boolean isUnresolved();

-

-    /**

-     * Sets whether the model element is unresolved.

-     * 

-     * @param unresolved whether the model element is unresolved

-     */

-    void setUnresolved(boolean unresolved);

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
deleted file mode 100644
index ee67006875..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.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.policy;

-

-/**

- * Factory interface for creating extension types meta data

- *

- * @version $Rev$ $Date$

- */

-public interface IntentAttachPointTypeFactory {

-

-    /**

-     * Creates an ImplementationTypeImpl instance to hold metadata related to

-     * a particular implementation extension in the SCA Domain

-     * 

-     * @return an instance of IntentAttachPointType

-     */

-    IntentAttachPointType createImplementationType();

-    

-    /**

-     * Creates an BindingTypeImpl instance to hold metadata related to

-     * a particular binding extension in the SCA Domain

-     * 

-     * @return an instance of IntentAttachPointType

-     */

-    IntentAttachPointType createBindingType();

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
deleted file mode 100644
index 1b225bc918..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.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;
-
-import java.util.List;
-
-/**
- * Represents a policy intent map. See the Policy Framework specification for a
- * description of this element.
- *
- * @version $Rev$ $Date$
- */
-public interface IntentMap {
-
-    /**
-     * Returns the intent realized by this intent map.
-     * 
-     * @return the intent realized by this intent map
-     */
-    Intent getProvidedIntent();
-
-    /**
-     * Sets the intent realized by this intent map.
-     * 
-     * @param providedIntent the intent realized by this intent map
-     */
-    void setProvidedIntent(Intent providedIntent);
-
-    /**
-     * Returns the default qualified intent map.
-     * 
-     * @return the default qualified intent map
-     */
-    IntentMap getDefaultQualifiedIntentMap();
-
-    /**
-     * Sets the default qualified intent map.
-     * 
-     * @param defaultQualifiedIntentMap the default qualified intent map
-     */
-    void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap);
-
-    /**
-     * Returns the list of children qualified intent maps.
-     * 
-     * @return
-     */
-    List<IntentMap> getQualifiedIntentMaps();
-
-    /**
-     * Returns the list of concrete policies, either WS-Policy policy
-     * attachments, policy references, or policies expressed in another policy
-     * language.
-     * 
-     * @return the list of concrete policies
-     */
-    List<Object> getPolicies();
-
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
deleted file mode 100644
index c6393e2ada..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/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.policy;

-

-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/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
deleted file mode 100644
index 65c39803d2..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.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.policy;

-

-import java.util.List;

-

-/**

- * A context container for policies.  

- *

- * @version $Rev$ $Date$

- */

-public interface PolicyContext {

-    List<Intent> getIntents(Object key);

-    List<PolicySet> getPolicySets(Object key);

-    void addIntents(Object key, List<Intent> intents);

-    void addPolicySets(Object key, List<PolicySet> policySets);

-    void addIntent(Object key, Intent intent);

-    void addPolicySet(Object key, PolicySet policySet);

-    void clearIntents(Object key);

-    void clearPolicySets(Object key);

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
deleted file mode 100644
index 49bcbae1ae..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.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.policy;
-
-/**
- * A factory for the policy model.
- *
- * @version $Rev$ $Date$
- */
-public interface PolicyFactory {
-
-    /**
-     * Create a new intent.
-     * 
-     * @return a new intent
-     */
-    Intent createIntent();
-
-    /**
-     * Create a new policy set.
-     * 
-     * @return a new policy set
-     */
-    PolicySet createPolicySet();
-
-    /**
-     * Create a new intent map.
-     * 
-     * @return a new intent map
-     */
-    IntentMap createIntentMap();
-
-    /**
-     * create a new Profile Intent
-     * 
-     * @return a ProfileIntent instance
-     */
-    ProfileIntent createProfileIntent();
-    
-    /**
-     * create a new QualifiedIntent
-     * 
-     * @return a QualifiedIntent instance
-     */
-    QualifiedIntent createQualifiedIntent();
-    
-    /**
-     * create a new PolicySetReference
-     * 
-     * @return a PolicySetReference instance
-     */
-    PolicySetReference createPolicySetReference();
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
deleted file mode 100644
index b16072c214..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.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.policy;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.xpath.XPathExpression;
-
-/**
- * Represents a policy set. See the Policy Framework specification for a
- * description of this element.
- *
- * @version $Rev$ $Date$
- */
-public interface PolicySet {
-
-    /**
-     * Returns the intent name.
-     * 
-     * @return the intent name
-     */
-    QName getName();
-
-    /**
-     * Sets the intent name
-     * 
-     * @param name the intent name
-     */
-    void setName(QName name);
-
-    /**
-     * Returns the list of operations that this policy set applies to.
-     * 
-     * @return
-     */
-    //List<Operation> getOperations();
-    /**
-     * Returns the list of
-     * 
-     * @return
-     */
-    List<PolicySet> getReferencedPolicySets();
-
-    /**
-     * Returns the list of provided intents
-     * 
-     * @return
-     */
-    List<Intent> getProvidedIntents();
-
-    /**
-     * Returns the list of concrete policies, either WS-Policy policy
-     * attachments, policy references, or policies expressed in another policy
-     * language.
-     * 
-     * @return the list of concrete policies
-     */
-    List<Object> getPolicies();
-
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-    /**
-     * Returns the XPath expression that is to be used to evaluate
-     * if this PolicySet applies to specific attachment point
-     * 
-     * @return the XPath expression
-     */
-    String getAppliesTo();
-
-    /**
-     * Sets the XPath expression that is to be used to evaluate
-     * if this PolicySet applies to specific attachment point
-     * 
-     */
-    void setAppliesTo(String xpath);
-
-    /**
-     * Returns the policies / policy attachments provided thro intent maps
-     * 
-     * @return
-     */
-    Map<Intent, List<Object>> getMappedPolicies();
-
-    /**
-     * Gets the XPath expression that is to be used to evaluate
-     * the SCA Artifacts that this policyset will always apply to
-     * immaterial of an intent declared on the SCA Artifact
-     * 
-     * @return the XPath expression
-     */
-    String getAlwaysAppliesTo();
-
-    /**
-     * Sets the XPath expression that is to be used to evaluate
-     * the SCA Artifacts that this policyset will always apply to
-     * immaterial of an intent declared on the SCA Artifact
-     * 
-     */
-    void setAlwaysAppliesTo(String xpath);
-
-    /**
-     * Get the XPath expression for the appliesTo attribute
-     * @return the XPath expression for the appliesTo attribute
-     */
-    XPathExpression getAppliesToXPathExpression();
-
-    /**
-     * Set the XPath expression for the appliesTo attribute
-     * @param xpathExpression the XPath expression for the appliesTo attribute
-     */
-    void setAppliesToXPathExpression(XPathExpression xpathExpression);
-
-    /**
-     * Get the XPath expression for the alwaysAppliesTo attribute
-     * @return the XPath expression for the alwaysAppliesTo attribute
-     */
-    XPathExpression getAlwaysAppliesToXPathExpression();
-
-    /**
-     * Set the XPath expression for the alwaysAppliesTo attribute
-     * @param xpathExpression the XPath expression for the alwaysAppliesTo attribute
-     */
-    void setAlwaysAppliesToXPathExpression(XPathExpression xpathExpression);
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
deleted file mode 100644
index f4156fc2e6..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.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.policy;
-
-import java.util.List;
-
-/**
- * Base interface for all assembly model objects that can have policy sets
- * attached to them.
- *
- * @version $Rev$ $Date$
- */
-public interface PolicySetAttachPoint extends IntentAttachPoint {
-
-    /**
-     * Returns a list of policy sets. See the Policy Framework specification for
-     * a description of this attribute.
-     * 
-     * @return a list of policy sets.
-     */
-    List<PolicySet> getPolicySets();
-    
-    
-    /**
-     * Returns a list of policy sets defined in the domain, that are applicable to this
-     * PolicySetAttachPoint. An applicable PolicySet is one that include this PolicySetAttachPoint
-     * as part of its 'appliesTo' XPath attribute.
-     * 
-     * @return a list of policy sets applicable to this PolicySetAttachPoint
-     */
-    List<PolicySet> getApplicablePolicySets();
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
deleted file mode 100644
index caa0d04fe3..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.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.policy;

-

-import javax.xml.namespace.QName;

-

-/**

- * Interface that abstracts a PolicySet Reference

- *

- * @version $Rev$ $Date$

- */

-public interface PolicySetReference {

-    

-    /**

-     * Returns the name of the policyset being referred to

-     * 

-     * @return the QName of the referred policyset

-     */

-    QName getReferredPolicySetName();

-    

-    /**

-     * @param refPolicySetName the name of the policyset being referred to

-     * 

-     */

-    void setReferredPolicySetName(QName refPolicySetName);

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
deleted file mode 100644
index 28ff9d09d3..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.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.policy;

-

-import java.util.List;

-

-/**

- * Interface that abstracts a profile intent

- *

- * @version $Rev$ $Date$

- */

-public interface ProfileIntent extends Intent {

-    /**

-     * Returns the list of required intents.

-     * 

-     * @return the list of required intents

-     */

-    List<Intent> getRequiredIntents();

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
deleted file mode 100644
index 0f43221dd6..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.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.policy;

-

-/**

- * Abstracts a qualified policy intent

- *

- * @version $Rev$ $Date$

- */

-public interface QualifiedIntent extends Intent {

-

-    /**

-     * Returns the intent qualified by this intent

-     * 

-     * @return

-     */

-    Intent getQualifiableIntent();

-    

-    /**

-     * sets the qualifiable intent for this Qualified intent instance

-     * 

-     * @param qualifiableIntent

-     */

-    void setQualifiableIntent(Intent qualifiableIntent);

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
deleted file mode 100644
index dbdef38324..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.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.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-

-/**

- * Concrete implementation for a BindingType

- *

- * @version $Rev$ $Date$

- */

-public class BindingTypeImpl implements IntentAttachPointType {

-

-    private List<Intent> alwaysProvides = new ArrayList<Intent>();

-    private List<Intent> mayProvides = new ArrayList<Intent>();

-    private QName typeName;

-    private boolean unResolved = true;

-    

-    public List<Intent> getAlwaysProvidedIntents() {

-        return alwaysProvides;

-    }

-

-    public List<Intent> getMayProvideIntents() {

-        return mayProvides;

-    }

-

-    public QName getName() {

-        return typeName;

-    }

-

-    public void setName(QName type) {

-        this.typeName = type;

-    }

-    

-    public boolean isUnresolved() {

-        return unResolved;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        this.unResolved = unresolved;

-    }

-    

-    @Override

-    public int hashCode() {

-        return String.valueOf(getName()).hashCode();

-    }

-    

-    @Override

-    public boolean equals(Object obj) {

-        if (obj == this) {

-            return true;

-        } else if (obj instanceof BindingTypeImpl ) {

-            if (getName() != null) {

-                return getName().equals(((BindingTypeImpl)obj).getName());

-            } else {

-                return ((BindingTypeImpl)obj).getName() == null;

-            }

-        } else {

-            return false;

-        }

-    }

-    

-    @Override

-    public String toString() {

-        return getName().toString();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
deleted file mode 100644
index fa95d84c4e..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.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.policy.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-

-/**

- * Concrete implementation for a Implementation Type

- *

- * @version $Rev$ $Date$

- */

-public class ImplementationTypeImpl implements IntentAttachPointType {

-    private List<Intent> alwaysProvides = new ArrayList<Intent>();

-    private List<Intent> mayProvides = new ArrayList<Intent>();

-    private QName typeName;

-    private boolean unResolved = true;

-    

-    public List<Intent> getAlwaysProvidedIntents() {

-        return alwaysProvides;

-    }

-

-    public List<Intent> getMayProvideIntents() {

-        return mayProvides;

-    }

-

-    public QName getName() {

-        return typeName;

-    }

-

-    public void setName(QName type) {

-        this.typeName = type;

-    }

-    

-    public boolean isUnresolved() {

-        return unResolved;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-        this.unResolved = unresolved;

-    }

-    

-    @Override

-    public int hashCode() {

-        return String.valueOf(getName()).hashCode();

-    }

-    

-    @Override

-    public boolean equals(Object obj) {

-        if (obj == this) {

-            return true;

-        } else if (obj instanceof ImplementationTypeImpl ) {

-            if (getName() != null) {

-                return getName().equals(((ImplementationTypeImpl)obj).getName());

-            } else {

-                return ((ImplementationTypeImpl)obj).getName() == null;

-            }

-        } else {

-            return false;

-        }

-    }

-    

-    @Override

-    public String toString() {

-        return getName().toString();

-    }

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
deleted file mode 100644
index aa6e27c240..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.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.policy.impl;

-

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;

-

-/**

- * Default implementation for IntentAttachPointTypeFactory

- *

- * @version $Rev$ $Date$

- */

-public class IntentAttachPointTypeFactoryImpl implements IntentAttachPointTypeFactory {

-

-    public IntentAttachPointType createBindingType() {

-        return new BindingTypeImpl();

-    }

-

-    public IntentAttachPointType createImplementationType() {

-        return new ImplementationTypeImpl();

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
deleted file mode 100644
index 2d6bd0eb6f..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.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.policy.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Intent;
-
-/**
- * Represents a policy intent.
- * 
- * @version $Rev$ $Date$
- */
-public class IntentImpl implements Intent {
-
-    private static final String QUALIFIED_SEPARATOR = ".";
-    private static final String DOMAIN_SEPARATOR = ".";
-    private QName name;
-    //private List<Operation> operations = new ArrayList<Operation>();
-    private List<QName> constrains = new ArrayList<QName>();
-    private String description;
-    private List<Intent> qualifiedIntents = new ArrayList<Intent>();
-    // private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<Intent> excludedIntents = new ArrayList<Intent>();
-    private boolean unresolved = true;
-    private String domain;
-    private String[] qualifiedNames;
-
-    protected IntentImpl() {
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    public void setName(QName name) {
-        this.name = name;
-        String iname = name.getLocalPart();
-        int domainIdx = iname.indexOf(DOMAIN_SEPARATOR);
-        if (domainIdx > -1) {
-            domain = iname.substring(0, domainIdx);
-            String qualifNamesStr = iname.substring(domainIdx + 1);
-            String pattern = "\\" + QUALIFIED_SEPARATOR;
-            qualifiedNames = qualifNamesStr.split(pattern);
-        } else
-            domain = iname;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public String[] getQualifiedNames() {
-        String[] results = new String[qualifiedNames.length];
-        System.arraycopy(qualifiedNames, 0, results, 0, qualifiedNames.length);
-        return results;
-    }
-
-    /*public List<Operation> getOperations() {
-        return operations;
-    }*/
-
-    public List<QName> getConstrains() {
-        return constrains;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<Intent> getQualifiedIntents() {
-        return qualifiedIntents;
-    }
-
-    public List<Intent> getExcludedIntents() {
-        return excludedIntents;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        QName intentName = getName();
-        result = prime * result + ((intentName == null) ? 0 : intentName.hashCode());
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof IntentImpl)) {
-            return false;
-        }
-        final IntentImpl other = (IntentImpl)obj;
-        if (getName() == null) {
-            if (other.getName() != null) {
-                return false;
-            }
-        } else if (!getName().equals(other.getName())) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(getName());
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
deleted file mode 100644
index aab03281ba..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.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.policy.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentMap;
-
-/**
- * Represents an intent map.
- * 
- * @version $Rev$ $Date$
- */
-public class IntentMapImpl implements IntentMap {
-
-    private boolean unresolved;
-    private IntentMap defaultQualifiedIntentMap;
-    private List<Object> policies;
-    private Intent providedIntent;
-    private List<IntentMap> qualifiedIntentMaps;
-    
-    protected IntentMapImpl() {
-    }
-
-    public IntentMap getDefaultQualifiedIntentMap() {
-        return defaultQualifiedIntentMap;
-    }
-
-    public List<Object> getPolicies() {
-        return policies;
-    }
-
-    public Intent getProvidedIntent() {
-        return providedIntent;
-    }
-
-    public List<IntentMap> getQualifiedIntentMaps() {
-        return qualifiedIntentMaps;
-    }
-
-    public void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap) {
-        this.defaultQualifiedIntentMap = defaultQualifiedIntentMap;
-    }
-
-    public void setProvidedIntent(Intent providedIntent) {
-        this.providedIntent = providedIntent;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
deleted file mode 100644
index a0e2f10f56..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.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.policy.impl;

-

-import java.util.ArrayList;

-import java.util.Hashtable;

-import java.util.List;

-import java.util.Map;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.PolicyContext;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- *

- * @version $Rev$ $Date$

- */

-public class PolicyContextImpl implements PolicyContext {

-    private Map<Object, List<Intent>> intents = new Hashtable<Object , List<Intent>>();

-    private Map<Object, List<PolicySet>> policySets = new Hashtable<Object, List<PolicySet>>();

-    

-    public void addIntent(Object key, Intent intent) {

-        if ( intents.get(key) == null ) {

-            intents.put(key, new ArrayList<Intent>());

-        }

-        intents.get(key).add(intent);

-    }

-

-    public void addIntents(Object key, List<Intent> intents) {

-        if ( this.intents.get(key) == null ) {

-            this.intents.put(key, new ArrayList<Intent>());

-        }

-        this.intents.get(key).addAll(intents);

-    }

-

-    public void addPolicySet(Object key, PolicySet policySet) {

-        if ( policySets.get(key) == null ) {

-            policySets.put(key, new ArrayList<PolicySet>());

-        }

-        policySets.get(key).add(policySet);

-    }

-

-    public void addPolicySets(Object key, List<PolicySet> policySets) {

-        if ( this.policySets.get(key) == null ) {

-            this.policySets.put(key, new ArrayList<PolicySet>());

-        }

-        this.policySets.get(key).addAll(policySets);

-    }

-

-    public List<Intent> getIntents(Object key) {

-        if ( intents.get(key) == null ) {

-            intents.put(key, new ArrayList<Intent>());

-        }

-        return intents.get(key);

-    }

-

-    public List<PolicySet> getPolicySets(Object key) {

-        if ( policySets.get(key) == null ) {

-            policySets.put(key, new ArrayList<PolicySet>());

-        }

-        return policySets.get(key);

-    }

-

-    public void clearIntents(Object key) {

-        if ( intents.get(key) != null ) {

-            intents.clear();

-        }

-    }

-

-    public void clearPolicySets(Object key) {

-        if ( policySets.get(key) != null ) {

-            policySets.clear();

-        }

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
deleted file mode 100644
index 1db29b835e..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.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.policy.impl;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentMap;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetReference;
-import org.apache.tuscany.sca.policy.ProfileIntent;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-
-/**
- * A factory for the policy model.
- * 
- * @version $Rev$ $Date$
- */
-public abstract class PolicyFactoryImpl implements PolicyFactory {
-
-    public Intent createIntent() {
-        return new IntentImpl();
-    }
-
-    public PolicySetReference createPolicySetReference() {
-        return new PolicySetReferenceImpl();
-    }
-
-    public PolicySet createPolicySet() {
-        return new PolicySetImpl();
-    }
-
-    public IntentMap createIntentMap() {
-        return new IntentMapImpl();
-    }
-
-    public ProfileIntent createProfileIntent() {
-        return new ProfileIntentImpl();
-    }
-
-    public QualifiedIntent createQualifiedIntent() {
-        return new QualifiedIntentImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
deleted file mode 100644
index 4bd9d5b7c7..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.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.policy.impl;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.xpath.XPathExpression;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Represents a policy set.
- * 
- * @version $Rev$ $Date$
- */
-public class PolicySetImpl implements PolicySet {
-
-    private QName name;
-    //private List<Operation> operations = new ArrayList<Operation>();
-    //private List<QName> appliesTo;
-    private String appliesTo;
-    private List<Intent> providedIntents = new ArrayList<Intent>();
-    private List<PolicySet> referencedPolicySets = new ArrayList<PolicySet>();
-    private List<Object> policies = new ArrayList<Object>();
-    Map<Intent, List<Object>>  mappedPolicies = new Hashtable<Intent, List<Object>>();
-    private boolean unresolved = true;
-    private String alwaysAppliesTo;
-    
-    private XPathExpression appliesToXPathExpression;
-    private XPathExpression alwaysAppliesToXPathExpression;
-    
-    public String getAlwaysAppliesTo() {
-        return alwaysAppliesTo;
-    }
-
-    public void setAlwaysAppliesTo(String alwaysAppliesTo) {
-        this.alwaysAppliesTo = alwaysAppliesTo;
-    }
-
-    protected PolicySetImpl() {
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    public void setName(QName name) {
-        this.name = name;
-    }
-
-    /*public List<Operation> getOperations() {
-        return operations;
-    }*/
-
-    public String getAppliesTo() {
-        return appliesTo;
-    }
-
-    public void setAppliesTo(String appliesTo) {
-        this.appliesTo = appliesTo;
-    }
-
-    public List<Intent> getProvidedIntents() {
-        return providedIntents;
-    }
-
-    public List<PolicySet> getReferencedPolicySets() {
-        return referencedPolicySets;
-    }
-
-    public List<Object> getPolicies() {
-        return policies;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public Map<Intent, List<Object>> getMappedPolicies() {
-        return mappedPolicies;
-    }
-    
-    @Override
-    public int hashCode() {
-        return String.valueOf(getName()).hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else if (obj instanceof PolicySet) {
-            if (getName() != null) {
-                return getName().equals(((PolicySet)obj).getName());
-            } else {
-                return ((PolicySet)obj).getName() == null;
-            }
-        } else {
-            return false;
-        }
-    }
-    
-    @Override
-    public String toString() {
-        return getName().toString();
-    }
-
-    public XPathExpression getAppliesToXPathExpression() {
-        return appliesToXPathExpression;
-    }
-
-    public void setAppliesToXPathExpression(XPathExpression appliesToXPathExpression) {
-        this.appliesToXPathExpression = appliesToXPathExpression;
-    }
-
-    public XPathExpression getAlwaysAppliesToXPathExpression() {
-        return alwaysAppliesToXPathExpression;
-    }
-
-    public void setAlwaysAppliesToXPathExpression(XPathExpression alwaysAppliesToXPathExpression) {
-        this.alwaysAppliesToXPathExpression = alwaysAppliesToXPathExpression;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
deleted file mode 100644
index 98a116fe7b..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.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.policy.impl;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.PolicySetReference;

-

-/**

- * Concrete implementation for a PolicySetReference

- *

- * @version $Rev$ $Date$

- */

-public class PolicySetReferenceImpl implements PolicySetReference {

-

-    private QName referredPolicySetName = null;

-    

-    /* 

-     * @see org.apache.tuscany.sca.policy.PolicySetReference#getReferredPolicySetName()

-     */

-    public QName getReferredPolicySetName() {

-        return referredPolicySetName;

-    }

-

-    /* 

-     * @see org.apache.tuscany.sca.policy.PolicySetReference#setReferredPolicySetName(javax.xml.namespace.QName)

-     */

-    public void setReferredPolicySetName(QName refPolicySetName) {

-        referredPolicySetName = refPolicySetName;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
deleted file mode 100644
index e5002d2cdc..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.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.policy.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.ProfileIntent;

-

-/**

- * Concrete implementation for Profile Intent

- *

- * @version $Rev$ $Date$

- */

-public class ProfileIntentImpl extends IntentImpl implements ProfileIntent {

-    private List<Intent> requiredIntents = new ArrayList<Intent>();

-    

-    public List<Intent> getRequiredIntents() {

-        return requiredIntents;

-    }

-

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
deleted file mode 100644
index d6f65b1788..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.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.policy.impl;

-

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.QualifiedIntent;

-

-/**

- * Models a concrete implementation of a Qualified Intent

- *

- * @version $Rev$ $Date$

- */

-public class QualifiedIntentImpl extends IntentImpl implements QualifiedIntent {

-    private Intent qualifiableIntent = null;

-    

-    public Intent getQualifiableIntent() {

-        return qualifiableIntent;

-    }

-

-    public void setQualifiableIntent(Intent qualifiableIntent) {

-        this.qualifiableIntent = qualifiableIntent;

-    }

-    

-    @Override

-    public List<QName> getConstrains() {

-        return getQualifiableIntent().getConstrains();

-    }

-    

-    

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
deleted file mode 100644
index 1c56cbacbc..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * 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.util;
-
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-import java.io.StringWriter;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-
-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.ProfileIntent;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Utility methods used during computation of PolicyIntents and PolicySets sets
- *
- * @version $Rev$ $Date$
- */
-public class PolicyComputationUtils {
-    private static final String POLICYSET_PREFIX = "tp_";
-    private static final String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    private static final String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets";
-    private static final String POLICY_SETS_ATTR = "policySets"; 
-    private static final String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany";
-    private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
-
-    /**
-     * This method unconditionally adds intents from the source list to the target list.
-     * It is used for intermediate intent inheritance between promotion levels
-     * (e.g. between a composite service and a component service).  It does not check
-     * whether there are conflicting (mutually exclusive) intents.  This is because
-     * promotion cannot override intents.  If the resulting target list has conflicting
-     * intents, this will be detected later during policy computation.  
-     */
-    public static void addInheritedIntents(List<Intent> sourceList, List<Intent> targetList) {
-        if (sourceList != null) {
-            targetList.addAll(sourceList);
-        }
-    }
-
-    public static void addInheritedPolicySets(List<PolicySet> sourceList,
-                                              List<PolicySet> targetList,
-                                              boolean checkOverrides) {
-        // check overrides is true when policysets are to be copied from
-        // componentType to component level
-        if (checkOverrides) {
-            // aggregate all the provided intents present in the target
-            List<Intent> targetProvidedIntents = new ArrayList<Intent>();
-            for (PolicySet policySet : targetList) {
-                targetProvidedIntents.addAll(policySet.getProvidedIntents());
-            }
-
-            // for every policy set in the source check if it provides one of
-            // the intents that is
-            // already provided by the policysets in the destination and do not
-            // copy them.
-            for (PolicySet policySet : sourceList) {
-                for (Intent sourceProvidedIntent : policySet.getProvidedIntents()) {
-                    if (!targetProvidedIntents.contains(sourceProvidedIntent)) {
-                        targetList.add(policySet);
-                    }
-                }
-            }
-        } else {
-            targetList.addAll(sourceList);
-        }
-    }
-
-    /**
-     * This method is used to inherit intents and policy sets between hierarchical levels
-     * within the same composite (e.g. between a component and its services and references).
-     * In this case the source intents and policy sets provide defaults which are inherited
-     * into the target lists only when there is no conflict.  For example consider a component
-     * with 3 references.  The component level requires intent 'propagatesTransaction'.
-     * Reference 1 and 2 do not specify an intent, but reference 3 requires 'suspendsTransaction'.
-     * In this case the 'propagatesTransaction' intent is inherited by reference 1 and 2
-     * but not by reference 3.
-     */
-    public static void addDefaultPolicies(List<Intent> sourceIntents,
-                                          List<PolicySet> sourcePolicySets,
-                                          List<Intent> targetIntents,
-                                          List<PolicySet> targetPolicySets)
-    {
-        // form a list of all intents required by the target
-        List<Intent> combinedTargetIntents = new ArrayList<Intent>();
-        combinedTargetIntents.addAll(findAndExpandProfileIntents(targetIntents));
-        for (PolicySet targetPolicySet : targetPolicySets) {
-            combinedTargetIntents.addAll(findAndExpandProfileIntents(targetPolicySet.getProvidedIntents()));
-        }
-
-        // inherit intents in the source list that do not conflict with intents already in the target list
-        for (Intent sourceIntent : findAndExpandProfileIntents(sourceIntents)) {
-            boolean conflict = false;
-            for (Intent excluded : sourceIntent.getExcludedIntents()) {
-                if (combinedTargetIntents.contains(excluded)) {
-                    conflict = true;
-                    break;
-                }
-            }
-            if (!conflict) {
-                targetIntents.add(sourceIntent);
-            }
-        }
-
-        // inherit policy sets in the source list that do not conflict with policy sets or intents
-        // in the target list
-        for (PolicySet sourcePolicySet : sourcePolicySets) {
-            boolean conflict = false;
-            List<Intent> providedIntents = findAndExpandProfileIntents(sourcePolicySet.getProvidedIntents());
-            checkConflict: for (Intent intent : providedIntents) {
-                for (Intent excluded : intent.getExcludedIntents()) {
-                    if (combinedTargetIntents.contains(excluded)) {
-                        conflict = true;
-                        break checkConflict;
-                    }
-                }
-            }
-            if (!conflict)
-                targetPolicySets.add(sourcePolicySet);
-        }
-
-    }
-
-    public static void checkForMutuallyExclusiveIntents(
-                         List<Intent> intents,
-                         List<PolicySet> policySets,
-                         IntentAttachPointType intentAttachPointType,
-                         String id) throws PolicyValidationException
-    {
-        // gather all intents (keeping track of where they come from)
-        Map<Intent, PolicySet> combinedIntents = new HashMap<Intent,PolicySet>();
-        for (PolicySet policySet : policySets) {
-            for (Intent providedIntent : findAndExpandProfileIntents(policySet.getProvidedIntents())) {
-                combinedIntents.put(providedIntent, policySet);
-            }
-        }
-        for (Intent intent : intents) {
-            combinedIntents.put(intent, null);
-        }
-
-        // check for conflicts
-        for (Intent intent : combinedIntents.keySet()) {
-            for (Intent excluded : intent.getExcludedIntents()) {
-                if (combinedIntents.keySet().contains(excluded)) {
-                    String sIntent1, sIntent2;
-                    if (combinedIntents.get(intent) == null)
-                        sIntent1 = intent.getName().toString();
-                    else
-                        sIntent1 = intent.getName().toString() + " in policy set " + combinedIntents.get(intent).getName().toString();
-                    if (combinedIntents.get(excluded) == null)
-                        sIntent2 = excluded.getName().toString();
-                    else
-                        sIntent2 = excluded.getName().toString() + " in policy set " + combinedIntents.get(excluded).getName().toString();
-                    throw new PolicyValidationException(
-                        intentAttachPointType.getName() + " for " + id +
-                        " uses mutually-exclusive intents " + sIntent1 + " and " + sIntent2);
-                }
-            }
-        }
-    }
-
-    public static void expandProfileIntents(List<Intent> intents) {
-        List<Intent> expandedIntents = null;
-        if ( intents.size() > 0 ) {
-            expandedIntents = findAndExpandProfileIntents(intents);
-            intents.clear();
-            intents.addAll(expandedIntents);
-        }
-    }
-
-    public static List<Intent> findAndExpandProfileIntents(List<Intent> intents) {
-        List<Intent> expandedIntents = new ArrayList<Intent>();
-        for ( Intent intent : intents ) {
-            if ( intent instanceof ProfileIntent ) {
-                ProfileIntent profileIntent = (ProfileIntent)intent;
-                List<Intent> requiredIntents = profileIntent.getRequiredIntents();
-                expandedIntents.addAll(findAndExpandProfileIntents(requiredIntents));
-            } else {
-                expandedIntents.add(intent);
-            }
-        }
-        return expandedIntents;
-    }
-
-    private static byte[] addApplicablePolicySets(Document doc, Collection<PolicySet> policySets)
-        throws XPathExpressionException, TransformerConfigurationException, TransformerException {
-        
-        for (PolicySet policySet : policySets) {
-            if (policySet.getAppliesTo() != null) {
-                addApplicablePolicySets(policySet, doc);
-            }
-
-            if (policySet.getAlwaysAppliesTo() != null) {
-                addAlwaysApplicablePolicySets(policySet, doc);
-            }
-        }
-
-        StringWriter sw = new StringWriter();
-        final Source domSource = new DOMSource(doc);
-        final Result finalResult = new StreamResult(sw);
-        final Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        // transformer.setOutputProperty("omit-xml-declaration", "yes");
-        // Allow priviledged access to let transformers read property files. Requires
-        // PropertyPermission in security policy.
-        try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                public Object run() throws TransformerException {
-                    transformer.transform(domSource, finalResult);
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw (TransformerException)e.getException();
-        }
-        
-        return sw.toString().getBytes();
-    }
-
-    private static void addAlwaysApplicablePolicySets(PolicySet policySet,
-                                                      Document doc) throws XPathExpressionException {
-        XPathExpression expression = policySet.getAlwaysAppliesToXPathExpression();
-        NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
-
-        if (result != null) {
-            for (int counter = 0; counter < result.getLength(); ++counter) {
-                Node aResultNode = result.item(counter);
-
-                String alwaysApplicablePolicySets = null;
-
-                String policySetPrefix =
-                    declareNamespace((Element)aResultNode, policySet.getName().getNamespaceURI());
-                String policySetsAttrPrefix =
-                    declareNamespace((Element)aResultNode, SCA10_NS);
-                if (aResultNode.getAttributes().getNamedItem(POLICY_SETS_ATTR) != null) {
-                    alwaysApplicablePolicySets =
-                        aResultNode.getAttributes().getNamedItem(POLICY_SETS_ATTR).getNodeValue();
-                }
-
-                if (alwaysApplicablePolicySets != null && alwaysApplicablePolicySets.length() > 0) {
-                    alwaysApplicablePolicySets =
-                        alwaysApplicablePolicySets + " "
-                            + policySetPrefix
-                            + ":"
-                            + policySet.getName().getLocalPart();
-                } else {
-                    alwaysApplicablePolicySets =
-                        policySetPrefix + ":" + policySet.getName().getLocalPart();
-                }
-
-                ((Element)aResultNode).setAttribute(POLICY_SETS_ATTR, alwaysApplicablePolicySets);
-            }
-        }
-    }
-
-    private static void addApplicablePolicySets(PolicySet policySet,
-                                         Document doc) throws XPathExpressionException {
-        XPathExpression expression = policySet.getAppliesToXPathExpression();
-        NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
-
-        if (result != null) {
-            for (int counter = 0; counter < result.getLength(); ++counter) {
-                Node aResultNode = result.item(counter);
-
-                String applicablePolicySets = null;
-
-                String policySetPrefix =
-                    declareNamespace((Element)aResultNode, policySet.getName().getNamespaceURI());
-                String appPolicyAttrPrefix =
-                    declareNamespace((Element)aResultNode,
-                                     APPLICABLE_POLICYSET_ATTR_NS);
-                if (aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS,
-                                                               APPLICABLE_POLICYSET_ATTR) != null) {
-                    applicablePolicySets =
-                        aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS,
-                                                                   APPLICABLE_POLICYSET_ATTR)
-                            .getNodeValue();
-                }
-
-                if (applicablePolicySets != null && applicablePolicySets.length() > 0) {
-                    applicablePolicySets =
-                        applicablePolicySets + " "
-                            + policySetPrefix
-                            + ":"
-                            + policySet.getName().getLocalPart();
-                } else {
-                    applicablePolicySets =
-                        policySetPrefix + ":" + policySet.getName().getLocalPart();
-                }
-
-                ((Element)aResultNode).setAttributeNS(APPLICABLE_POLICYSET_ATTR_NS,
-                                                      appPolicyAttrPrefix + ":"
-                                                          + APPLICABLE_POLICYSET_ATTR,
-                                                      applicablePolicySets);
-            }
-        }
-    }
-
-    public static byte[] addApplicablePolicySets(URL artifactUrl, Collection<PolicySet> domainPolicySets) throws Exception {
-        DocumentBuilderFactory dbFac = DocumentBuilderFactory.newInstance();
-        dbFac.setNamespaceAware(true);
-        DocumentBuilder db = dbFac.newDocumentBuilder();
-        Document doc = db.parse(artifactUrl.toURI().toString());
-        return addApplicablePolicySets(doc, domainPolicySets);
-    }
-    
-    private static class DOMNamespaceContext implements NamespaceContext {
-        private Node node;
-
-        /**
-         * @param node
-         */
-        public DOMNamespaceContext(Node node) {
-            super();
-            this.node = node;
-        }
-
-        public String getNamespaceURI(String prefix) {
-            return node.lookupNamespaceURI(prefix);
-        }
-
-        public String getPrefix(String namespaceURI) {
-            return node.lookupPrefix(namespaceURI);
-        }
-
-        public Iterator<?> getPrefixes(String namespaceURI) {
-            return null;
-        }
-
-    }
-    
-    private static String declareNamespace(Element element, String ns) {
-        if (ns == null) {
-            ns = "";
-        }
-        Node node = element;
-        String prefix = "";
-        boolean declared = false;
-        while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
-            if ( node.lookupPrefix(ns) != null ) {
-                prefix = node.lookupPrefix(ns);
-                declared = true;
-                break;
-            } else {
-                /*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) {
-            // Find an available prefix
-            for (int i=1; ; i++) {
-                prefix = POLICYSET_PREFIX + i;
-                if (element.lookupNamespaceURI(prefix) == null) {
-                    break;
-                }
-            }
-            String qname = "xmlns:" + prefix;
-            org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
-            attr.setValue(ns);
-            element.setAttributeNodeNS(attr);
-        }
-        return prefix;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
deleted file mode 100644
index 1f91710f95..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.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.policy.util;

-

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * @deprecated This interface is replaced by PolicyProviderFactory/PolicyProvider SPIs

- * Handler interface for handling policies defined in policysets

- *

- * @version $Rev$ $Date$

- */

-@Deprecated

-public interface PolicyHandler {

-    PolicySet getApplicablePolicySet();

-    void setApplicablePolicySet(PolicySet policySet);

-    void setUp(Object... context);

-    void cleanUp(Object... context);

-    void beforeInvoke(Object... context);

-    void afterInvoke(Object... context);

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
deleted file mode 100644
index 14736aa34f..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.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.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-
-/**
- * Utility class for loading policy handler definitions from META-INF/services directories
- *
- * @version $Rev$ $Date$
- */
-public class PolicyHandlerDefinitionsLoader {
-    
-    public static Map<ClassLoader, List<PolicyHandlerTuple>> loadPolicyHandlerClassnames()  {
-        // Get the processor service declarations
-        Set<ServiceDeclaration> sds;
-        try {
-            sds = ServiceDiscovery.getInstance().getServiceDeclarations(PolicyHandler.class);
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-        
-        Map<ClassLoader, List<PolicyHandlerTuple>> handlerTuples = new Hashtable<ClassLoader, List<PolicyHandlerTuple>>();
-        for (ServiceDeclaration sd : sds) {
-            ClassLoader cl = sd.getClassLoader();
-            
-            List<PolicyHandlerTuple> handlerTupleList = handlerTuples.get(cl);
-            if ( handlerTupleList == null ) {
-                handlerTupleList = new ArrayList<PolicyHandlerTuple>();
-                handlerTuples.put(cl, handlerTupleList);
-            }
-            Map<String, String> attributes = sd.getAttributes();
-            String intentName = attributes.get("intent");
-            QName intentQName = getQName(intentName);
-            String policyModelClassName = attributes.get("model");
-            String appliesTo = attributes.get("appliesTo");
-            if ( appliesTo != null && !appliesTo.startsWith("/") ) {
-                appliesTo = "//" + appliesTo;
-            }
-            handlerTupleList.add(new PolicyHandlerTuple(sd.getClassName(), intentQName, policyModelClassName, appliesTo));
-        }
-
-        return handlerTuples;
-    }
-    
-    private static QName getQName(String qname) { 
-        if (qname == null) {
-            return null;
-        }
-        qname = qname.trim();
-        if (qname.startsWith("{")) {
-            int h = qname.indexOf('}');
-            if (h != -1) {
-                return new QName(qname.substring(1, h), qname.substring(h + 1));
-            }
-        } else {
-            int h = qname.indexOf('#');
-            if (h != -1) {
-                return new QName(qname.substring(0, h), qname.substring(h + 1));
-            }
-        }
-        throw new IllegalArgumentException("Invalid qname: " + qname);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
deleted file mode 100644
index 10a67383bf..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.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.policy.util;

-

-import javax.xml.namespace.QName;

-

-/**

- * PolicyHanlder tuples stored in policy handler services files

- *

- * @version $Rev$ $Date$

- */

-public class PolicyHandlerTuple {

-    private String policyHandlerClassName;

-    private QName providedIntentName;

-    private String policyModelClassName;

-    private String appliesTo;

-    

-    public String getAppliesTo() {

-        return appliesTo;

-    }

-

-    public void setAppliesTo(String appliesTo) {

-        this.appliesTo = appliesTo;

-    }

-

-    public PolicyHandlerTuple(String handlerClassName,

-                              QName providedIntentName,

-                              String policyModelClassName,

-                              String appliesTo) {

-        this.policyHandlerClassName = handlerClassName;

-        this.providedIntentName = providedIntentName;

-        this.policyModelClassName = policyModelClassName;

-        this.appliesTo = appliesTo;

-    }

-    

-    public String getPolicyHandlerClassName() {

-        return policyHandlerClassName;

-    }

-    public void setPolicyHandlerClassName(String policyHandlerClassName) {

-        this.policyHandlerClassName = policyHandlerClassName;

-    }

-    public String getPolicyModelClassName() {

-        return policyModelClassName;

-    }

-    public void setPolicyModelClassName(String policyModelClassName) {

-        this.policyModelClassName = policyModelClassName;

-    }

-    public QName getProvidedIntentName() {

-        return providedIntentName;

-    }

-    public void setProvidedIntentName(QName providedIntentName) {

-        this.providedIntentName = providedIntentName;

-    }

-    

-    public String toString() {

-        return policyHandlerClassName + ", " + providedIntentName + ", " + policyModelClassName + ", " + appliesTo;

-    }

-    

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
deleted file mode 100644
index d399cce17f..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.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.util;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Utility methods to deal with PolicyHandlers
- *
- * @version $Rev$ $Date$
- */
-public class PolicyHandlerUtils {
-    public static PolicyHandler findPolicyHandler(PolicySet policySet, 
-                                                 Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) 
-                                throws IllegalAccessException, ClassNotFoundException, InstantiationException {
-        
-        PolicyHandler handler = null;
-        
-        for (ClassLoader classLoader : policyHandlerClassNames.keySet()) {
-            for ( PolicyHandlerTuple handlerTuple : policyHandlerClassNames.get(classLoader) ) {
-                //System.out.println(handlerTuple);
-                for ( Intent intent : policySet.getProvidedIntents() ) {
-                    if ( intent.getName().equals(handlerTuple.getProvidedIntentName())) {
-                        for ( Object policy : policySet.getPolicies() ) {
-                            if ( policy.getClass().getName().equals(handlerTuple.getPolicyModelClassName())) {
-                                if ( handlerTuple.getAppliesTo() != null  ) {
-                                    if ( handlerTuple.getAppliesTo().equals(policySet.getAppliesTo() )) {
-                                        handler = 
-                                            (PolicyHandler)Class.forName(handlerTuple.getPolicyHandlerClassName(), 
-                                                                         true, 
-                                                                         classLoader).newInstance();
-                                            handler.setApplicablePolicySet(policySet);
-                                            return handler;
-                                    }
-                                } else {
-                                    handler = 
-                                        (PolicyHandler)Class.forName(handlerTuple.getPolicyHandlerClassName(), 
-                                                                     true, 
-                                                                     classLoader).newInstance();
-                                        handler.setApplicablePolicySet(policySet);
-                                        return handler;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        
-        return handler;
-    } 
-   
-
-}
diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
deleted file mode 100644
index eb97818042..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.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.policy.util;

-

-/**

- * Exception to be throw for invalid policy intents / policysets

- *

- * @version $Rev$ $Date$

- */

-public class PolicyValidationException extends Exception {

-    private static final long serialVersionUID = 506979037642587755L;

-    

-    public PolicyValidationException(String message) {

-        super(message);

-    }

-    

-    public PolicyValidationException(Throwable e) {

-        super(e);

-    }

-    

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
deleted file mode 100644
index afb3c035ae..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.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.policy.util;

-

-import java.util.List;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPoint;

-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 PolicyValidationUtils {

-

-    public static boolean isConstrained(QName constrained, IntentAttachPointType attachPointType) {

-        return (attachPointType != null && attachPointType.getName().getNamespaceURI()

-            .equals(constrained.getNamespaceURI()) && attachPointType.getName().getLocalPart()

-            .startsWith(constrained.getLocalPart()));

-    }

-

-    public static void validateIntents(IntentAttachPoint attachPoint,

-                                       IntentAttachPointType attachPointType)

-        throws PolicyValidationException {

-        boolean found = false;

-        if (attachPointType != null) {

-            // validate intents specified against the parent (binding /

-            // implementation)

-            found = false;

-            for (Intent intent : attachPoint.getRequiredIntents()) {

-                if (!intent.isUnresolved()) {

-                    for (QName constrained : intent.getConstrains()) {

-                        if (isConstrained(constrained, attachPointType)) {

-                            found = true;

-                            break;

-                        }

-                    }

-

-                    if (!found) {

-                        throw new PolicyValidationException("Policy Intent '" + intent.getName()

-                            + "' does not constrain extension type  "

-                            + attachPointType.getName());

-                    }

-                } else {

-                    throw new PolicyValidationException("Policy Intent '" + intent.getName()

-                        + "' is not defined in this domain  ");

-                }

-            }

-        }

-    }

-

-    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint)

-        throws PolicyValidationException {

-        validatePolicySets(policySetAttachPoint, 

-                           policySetAttachPoint.getType(),

-                           policySetAttachPoint.getApplicablePolicySets());

-    }

-    

-    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint,

-                                          IntentAttachPointType attachPointType)

-        throws PolicyValidationException {

-        validatePolicySets(policySetAttachPoint,

-                           attachPointType,

-                           policySetAttachPoint.getApplicablePolicySets());

-    }

-

-    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint,

-                                          IntentAttachPointType attachPointType,

-                                          List<PolicySet> applicablePolicySets)

-        throws PolicyValidationException {

-        // 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

-        for (PolicySet definedPolicySet : policySetAttachPoint.getPolicySets()) {

-            if (!definedPolicySet.isUnresolved()) {

-                if (!applicablePolicySets.contains(definedPolicySet)) {

-                    throw new PolicyValidationException("Policy Set '" + definedPolicySet

-                        .getName()

-                        + "' does not apply to extension type  "

-                        + attachPointType.getName());

-                }

-            } else {

-                throw new PolicyValidationException("Policy Set '" + definedPolicySet.getName()

-                    + "' is not defined in this domain  ");

-

-            }

-        }

-    }

-}

diff --git a/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
deleted file mode 100644
index a0e56c1822..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ /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.DefaultIntentAttachPointTypeFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
deleted file mode 100644
index 846b3b24a4..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ /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.DefaultPolicyFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/tags/java/sca/1.3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
deleted file mode 100644
index 636ff5ab45..0000000000
--- a/tags/java/sca/1.3/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.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.policy;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-/**
- * Test building of policy model instances using the policy factory.
- * 
- * @version $Rev$ $Date$
- */
-public class PolicyFactoryTestCase extends TestCase {
-
-    PolicyFactory factory;
-
-    @Override
-    public void setUp() throws Exception {
-        factory = new DefaultPolicyFactory();
-    }
-
-    public void testCreateIntent() {
-        Intent intent = factory.createIntent();
-        intent.setName(new QName("http://test", "reliability"));
-        assertEquals(intent.getName(), new QName("http://test", "reliability"));
-    }
-
-    public void testCreatePolicySet() {
-        PolicySet policySet = factory.createPolicySet();
-        policySet.setName(new QName("http://test", "reliability"));
-        assertEquals(policySet.getName(), new QName("http://test", "reliability"));
-    }
-}
diff --git a/tags/java/sca/1.3/modules/pom.xml b/tags/java/sca/1.3/modules/pom.xml
deleted file mode 100644
index 310d100d58..0000000000
--- a/tags/java/sca/1.3/modules/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-sca</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-modules</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Implementation Modules</name>
-
-    <properties>
-        <tuscany.version>1.3</tuscany.version>
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>assembly</module>
-                <module>assembly-xml</module>
-                <module>assembly-xsd</module>
-                <module>binding-dwr</module>
-                <module>binding-ejb</module>
-                <module>binding-ejb-runtime</module>
-                <module>binding-atom</module>
-                <module>binding-atom-abdera</module>
-                <module>binding-rss</module>
-                <module>binding-rss-rome</module>
-                <module>binding-http</module>
-                <module>binding-http-runtime</module>
-                <module>binding-jms</module>
-                <module>binding-jsonrpc</module>
-                <module>binding-jsonrpc-runtime</module>
-                <module>binding-notification</module>
-                <module>binding-rmi</module>
-                <module>binding-sca</module>
-                <module>binding-sca-axis2</module>
-                <module>binding-sca-xml</module>
-                <module>binding-ws</module>
-                <module>binding-ws-axis2</module>
-                <module>binding-ws-wsdlgen</module>
-                <module>binding-ws-xml</module>
-                <module>contribution</module>
-                <module>contribution-groovy</module>
-                <module>contribution-impl</module>
-                <module>contribution-namespace</module>
-                <module>contribution-java</module>
-                <module>contribution-osgi</module>
-                <module>contribution-resource</module>
-                <module>contribution-xml</module>
-                <module>core</module>
-                <module>core-databinding</module>
-                <module>core-spi</module>
-                <module>core-spring</module>
-                <module>data-api</module>
-                <module>databinding</module>
-                <module>databinding-axiom</module>
-                <module>databinding-jaxb</module>
-                <module>databinding-jaxb-axiom</module>
-                <module>databinding-sdo</module>
-                <module>databinding-sdo-axiom</module>
-                <module>databinding-json</module>
-                <module>databinding-saxon</module>
-                <module>databinding-xmlbeans</module>
-                <module>databinding-fastinfoset</module>
-                <module>definitions</module>
-                <module>definitions-xml</module>
-                <module>domain-manager</module>
-                <module>endpoint</module>
-                <module>extensibility</module>
-                <module>extension-helper</module>
-                <module>host-embedded</module>
-                <module>host-http</module>
-                <module>host-rmi</module>
-                <module>host-webapp</module>
-                <module>host-webapp-junit</module>
-                <module>host-jetty</module>
-                <module>host-tomcat</module>
-                <module>interface</module>
-                <module>interface-java</module>
-                <module>interface-java-jaxws</module>
-                <module>interface-java-xml</module>
-                <module>interface-wsdl</module>
-                <module>interface-wsdl-xml</module>
-                <module>implementation-bpel</module>
-                <module>implementation-bpel-ode</module>
-                <module>implementation-ejb</module>
-                <module>implementation-java</module>
-                <module>implementation-java-xml</module>
-                <module>implementation-java-runtime</module>
-                <module>implementation-node</module>
-                <module>implementation-node-runtime</module>
-                <module>implementation-notification</module>
-                <module>implementation-osgi</module>
-                <module>implementation-resource</module>
-                <module>implementation-resource-runtime</module>
-                <module>implementation-script</module>
-                <module>implementation-spring</module>
-                <module>implementation-widget</module>
-                <module>implementation-widget-runtime</module>
-                <module>implementation-xquery</module>
-                <module>monitor</module>
-                <module>monitor-logging</module>
-                <module>node2-api</module>
-                <module>node2-impl</module>
-                <module>node2-launcher</module>
-                <module>node2-launcher-webapp</module>
-                <module>osgi-runtime</module>
-                <module>policy</module>
-                <module>policy-xml</module>
-                <module>policy-xml-ws</module>
-                <module>policy-logging</module>
-                <module>policy-security</module>
-                <module>policy-security-jsr250</module>
-                <module>policy-security-ws</module>
-                <module>policy-transaction</module>
-                <!--module>runtime</module-->
-                <!--module>runtime-tomcat</module-->
-                <module>sca-api</module>
-                <module>workspace</module>
-                <module>workspace-impl</module>
-                <module>workspace-xml</module>
-                <module>xsd</module>
-                <module>xsd-xml</module>
-            </modules>
-        </profile>
-
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>
-                            ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-                        </manifestFile>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-</project>
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/LICENSE b/tags/java/sca/1.3/modules/runtime-tomcat/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/runtime-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/tags/java/sca/1.3/modules/runtime-tomcat/NOTICE b/tags/java/sca/1.3/modules/runtime-tomcat/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/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/tags/java/sca/1.3/modules/runtime-tomcat/pom.xml b/tags/java/sca/1.3/modules/runtime-tomcat/pom.xml
deleted file mode 100644
index acac9be54b..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-runtime-tomcat</artifactId>
-    <name>Apache Tuscany SCA Runtime for Tomcat deep integration</name>
-
-    <dependencies>
-
-        <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>
-            <scope>provided</scope>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>
-            <version>6.0.14</version>
-            <scope>provided</scope>
-        </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>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-runtime</artifactId>
-	        <version>1.3</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>org.apache.tuscany.sca</groupId>
-                  <artifactId>tuscany-endpoint</artifactId>
-               </exclusion>
-            </exclusions>
-        </dependency-->
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-	        <version>1.3</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.runtime.tomcat</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.runtime.tomcat*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
deleted file mode 100644
index 45ea279889..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.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.runtime.tomcat;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint;
-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 EndpointResolverFactoryImpl implements EndpointResolverFactory<Endpoint> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public EndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;     
-    } 
-    
-    public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) {
-              
-        return  new EndpointResolverImpl(extensionPoints, endpoint);
-    }
-
-    public Class<Endpoint> getModelType() {
-        return Endpoint.class;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
deleted file mode 100644
index e05004160c..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.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.runtime.tomcat;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import org.apache.catalina.core.StandardContext;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.builder.DefaultEndpointBuilder;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolver;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory;
-import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain;
-import org.apache.tuscany.sca.host.webapp.WebAppServletHost;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-
-
-/** 
- * 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 EndpointResolverImpl implements EndpointResolver {
-
-    private final static Logger logger = Logger.getLogger(EndpointResolverImpl.class.getName());
-
-    private Endpoint endpoint;
-    private List<EndpointResolver> endpointResolvers = new ArrayList<EndpointResolver>();    
-
-    public EndpointResolverImpl(ExtensionPointRegistry extensionPoints,
-                                Endpoint endpoint) {
-        this.endpoint = endpoint;
-        
-        EndpointResolverFactoryExtensionPoint resolverFactories = 
-            extensionPoints.getExtensionPoint(EndpointResolverFactoryExtensionPoint.class);
-        
-        for (Binding binding : endpoint.getCandidateBindings()){
-            EndpointResolverFactory resolverFactory = resolverFactories.getEndpointResolverFactory(binding.getClass());
-            
-            // if the binding in question has a endpoint resolver factory they try and 
-            // create an endpoint resolver
-            if (resolverFactory != null){
-                EndpointResolver resolver = resolverFactory.createEndpointResolver(endpoint, binding);
-                
-                if (resolver != null){
-                    endpointResolvers.add(resolver);
-                }
-            }
-        }
-    }
-    
-    public void start(){
-        // do nothing
-    }
-    
-    public void resolve() {
-        if (endpoint.isUnresolved()){
-            logger.info("resolving endpoint: " + endpoint.getTargetName());
-
-            Component target = findTarget();
-            if (target != null) {
-                logger.info("endpoint target found: " + endpoint.getTargetName() + " component " + target);
-                resolveEndpoint(target);
-            } else {
-                logger.info("endpoint target not found: " + endpoint.getTargetName());
-            }
-            
-        }
-    }
-
-    protected void resolveEndpoint(Component targetComponent) {
-        
-        endpoint.setTargetComponent(targetComponent);
-        endpoint.setTargetComponentService(targetComponent.getServices().get(0)); // TODO real service
-
-        DefaultEndpointBuilder ebi = new DefaultEndpointBuilder(new Monitor() {
-            public void problem(Problem problem) {
-                logger.warning(problem.toString());
-            }
-            
-            public List<Problem> getProblems() {
-                return null;
-            }    
-        });
-
-        ebi.build(endpoint);
-    }
-
-    protected Component findTarget() {
-        for (StandardContext sc : TuscanyHost.scaApps) {
-            SCADomain scaDomain = (SCADomain)sc.getServletContext().getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE);
-            if (scaDomain != null) {
-                Component component = ((DefaultSCADomain)scaDomain).getComponent(endpoint.getTargetName());
-                if ( component != null) {
-                    return component;
-                }
-            }
-        }
-        return null;
-    }
-
-    public void stop() {
-        if (!endpoint.isUnresolved()){
-            // Currently the CompositeActivator stop() should take care of the providers and 
-            // wires that have been added. 
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
deleted file mode 100644
index c8d3aa7a46..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.runtime.tomcat;
-
-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 javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import org.apache.catalina.core.StandardContext;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyContext extends StandardContext {
-    private static final long serialVersionUID = 1L;
-
-    public TuscanyContext() {
-        setProcessTlds(false);
-    }
-    
-    @Override
-    public boolean getConfigured() {
-        return true;
-    }
-    
-    @Override
-    public DirContext getResources() {
-         return DUMMY_CONTEXT;
-    }
-
-    @Override
-    public synchronized void setResources(DirContext resources) {
-        setDocBase("tuscany");
-        super.setResources(DUMMY_CONTEXT);
-    }
-    
-    private static final DirContext DUMMY_CONTEXT = new DirContext(){
-
-        public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
-        }
-
-        public void bind(String name, Object obj, Attributes attrs) throws NamingException {
-        }
-
-        public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
-            return null;
-        }
-
-        public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
-            return null;
-        }
-
-        public Attributes getAttributes(Name name) throws NamingException {
-            return null;
-        }
-
-        public Attributes getAttributes(String name) throws NamingException {
-            return null;
-        }
-
-        public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
-            return null;
-        }
-
-        public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
-            return null;
-        }
-
-        public DirContext getSchema(Name name) throws NamingException {
-            return null;
-        }
-
-        public DirContext getSchema(String name) throws NamingException {
-            return null;
-        }
-
-        public DirContext getSchemaClassDefinition(Name name) throws NamingException {
-            return null;
-        }
-
-        public DirContext getSchemaClassDefinition(String name) throws NamingException {
-            return null;
-        }
-
-        public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
-        }
-
-        public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
-        }
-
-        public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
-        }
-
-        public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
-        }
-
-        public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
-        }
-
-        public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
-        }
-
-        public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
-            return null;
-        }
-
-        public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
-            return null;
-        }
-
-        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 {
-            throw new NamingException();
-        }
-
-        public Object lookup(Name name) throws NamingException {
-            return null;
-        }
-
-        public Object lookup(String name) throws NamingException {
-            return null;
-        }
-
-        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/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
deleted file mode 100644
index b19e2326a2..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.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.runtime.tomcat;
-
-import java.io.File;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.core.StandardContext;
-//import org.apache.tuscany.sca.runtime.Launcher;
-
-/**
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyContextListener implements LifecycleListener {
-
-//    private Launcher launcher;
-
-//    public TuscanyContextListener(Launcher launcher) {
-//        this.launcher = launcher;
-//    }
-
-    public void lifecycleEvent(LifecycleEvent event) {
-        String type = event.getType();
-        if (Lifecycle.AFTER_START_EVENT.equals(type)) {
-            startContext((Context) event.getLifecycle());
-        } else if (Lifecycle.STOP_EVENT.equals(type)) {
-            stopContext((Context) event.getLifecycle());
-        }
-    }
-
-    protected void startContext(Context context) {
-        StandardContext sc = (StandardContext) context;
-        String path = sc.getServletContext().getRealPath("/");
-        try {
-            File f = new File(path + "WEB-INF/classes");
-            if (f.exists()) {
-                System.out.println("adding contribution: "+ path);
-//                launcher.addContribution(f.toURL());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    protected void stopContext(Context context) {
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
deleted file mode 100644
index 190fe137d9..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.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.runtime.tomcat;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.LifecycleException;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.deploy.FilterDef;
-import org.apache.catalina.deploy.FilterMap;
-
-/**
- * To use this copy all the Tuscany jars to the Tomcat lib folder and update
- * the Tomcat conf/server.xml <Host> to include className="org.apache.tuscany.sca.runtime.tomcat.TomcatHost"
- * 
- * For example: 
- * 
- * <Host name="localhost"  appBase="webapps"
- *       className="org.apache.tuscany.sca.runtime.tomcat.TuscanyHost"
- *       unpackWARs="true" autoDeploy="true"
- *       xmlValidation="false" xmlNamespaceAware="false">
- *       
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyHost extends StandardHost {
-    private static final long serialVersionUID = 1L;
-    private static final Logger logger = Logger.getLogger(TuscanyHost.class.getName());
-    
-    // TODO static for expedience, find a better way to share when/if this is working properly
-    protected static List<StandardContext> scaApps = new ArrayList<StandardContext>();
-
-    public synchronized void start() throws LifecycleException {
-        try {
-            logger.log(Level.INFO, "Starting Tuscany/SCA runtime");
-
-            super.start();
-            
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Exception starting Tuscany/SCA runtime", e);
-        }
-    }
-
-    public synchronized void stop() throws LifecycleException {
-        try {
-            logger.log(Level.INFO, "Stopping Tuscany/SCA runtime");
-
-            super.stop();
-
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Exception Stopping Tuscany/SCA runtime", e);
-        }
-    }
-
-    public synchronized void addChild(Container child) {
-        try {
-            if (isSCAApp(child)) {
-                initSCAApplication((StandardContext)child);
-            }
-        } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception detecting SCA application " + child.getName(), e);
-        }
-        super.addChild(child);
-    }
-
-    /**
-     * Tests if the child is an SCA application by checking for the presence
-     * of either an sca-contribution.xml file or a sca-deployables folder
-     */
-    protected boolean isSCAApp(Container child) throws IOException {
-        if (child instanceof StandardContext) {
-            StandardContext sc = (StandardContext) child;
-            
-            if (sc.getDocBase().endsWith(".war")) {
-                JarFile jar = null;
-                try {
-                    jar = new JarFile(((StandardEngine)this.getParent()).getBaseDir() + "/" + getAppBase() + "/" + sc.getDocBase());
-
-                    if (jar.getEntry("META-INF/sca-deployables/") != null) {
-                        return true;
-                    }
-
-                    if (jar.getEntry("META-INF/sca-contribution.xml") != null) {
-                        return true;
-                    }
-
-                } finally {
-                    if (jar != null) {
-                        jar.close();
-                    }
-                }
-            } else {
-                File webappRoot = new File(sc.getConfigFile()).getParentFile().getParentFile();
-
-                File scaDeployables = new File(webappRoot, "META-INF/sca-deployables");
-                if (scaDeployables.exists()) {
-                    return true;
-                }
-
-                File scaContribution = new File(webappRoot, "META-INF/sca-contribution.xml");
-                if (scaContribution.exists()) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    protected void initSCAApplication(StandardContext scaApp) {
-        logger.log(Level.INFO, "Initilizing SCA application: " + scaApp.getName());
-        
-        // Add the Tuscany ContextListener
-        scaApp.addApplicationListener(org.apache.tuscany.sca.host.webapp.TuscanyContextListener.class.getName());
-        
-        // Add the Tuscany Servlet Filter
-        FilterDef filterDef = new FilterDef();
-        filterDef.setFilterClass(org.apache.tuscany.sca.host.webapp.TuscanyServletFilter.class.getName());
-        filterDef.setFilterName(org.apache.tuscany.sca.host.webapp.TuscanyServletFilter.class.getName());
-        scaApp.addFilterDef(filterDef);
-        FilterMap filterMap = new FilterMap();
-        filterMap.setFilterName(filterDef.getFilterName());
-        filterMap.addURLPattern("/*");
-        scaApp.addFilterMap(filterMap);
-
-        scaApps.add(scaApp);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
deleted file mode 100644
index 112b404515..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.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.runtime.tomcat;
-
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.tuscany.sca.host.webapp.WebAppServletHost;
-
-/**
- * A Servlet that forwards requests to the Servlets registered with the Tuscany
- * ServletHost.
- * 
- * TODO: Copy of host-webapp TuscanyServlet. Can be removed once host-webapp TuscanyServlet
- *       moved over to latest SCADomain API.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyServlet extends HttpServlet {
-    private static final long serialVersionUID = 1L;
-
-    private transient WebAppServletHost servletHost;
-
-    @Override
-    public void init(ServletConfig config) throws ServletException {
-        servletHost = WebAppServletHost.getInstance();
-        servletHost.init(config);
-    }
-
-    @Override
-    public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
-        String path = ((HttpServletRequest)req).getPathInfo();
-        RequestDispatcher dispatcher = servletHost.getRequestDispatcher(path);
-        if (dispatcher == null) {
-            throw new IllegalStateException("No servlet registered for path: " + path);
-        }
-
-        dispatcher.forward(req, res);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
deleted file mode 100644
index 17c3cb1707..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.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.runtime.tomcat;
-
-import javax.servlet.Servlet;
-
-import org.apache.catalina.core.StandardWrapper;
-
-/**
- * Override the StandardWrapper so that Servlets are not instantiated from the 
- * class name but just the instance Tuscany passes in the constructor is always used.  
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyWrapper extends StandardWrapper {
-    private static final long serialVersionUID = 1L;
-
-    private final Servlet servlet;
-
-    public TuscanyWrapper(Servlet servlet) {
-        super();
-        this.servlet = servlet;
-    }
-
-    public synchronized Servlet loadServlet() {
-        return servlet;
-    }
-
-    public Servlet getServlet() {
-        return servlet;
-    }
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/tags/java/sca/1.3/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
deleted file mode 100644
index e59ade0150..0000000000
--- a/tags/java/sca/1.3/modules/runtime-tomcat/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

-org.apache.tuscany.sca.runtime.tomcat.EndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.Endpoint

diff --git a/tags/java/sca/1.3/modules/runtime-tomcat/src/test/resources/content/test.html b/tags/java/sca/1.3/modules/runtime-tomcat/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/tags/java/sca/1.3/modules/runtime-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/tags/java/sca/1.3/modules/runtime/LICENSE b/tags/java/sca/1.3/modules/runtime/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/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/tags/java/sca/1.3/modules/runtime/NOTICE b/tags/java/sca/1.3/modules/runtime/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/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/tags/java/sca/1.3/modules/runtime/pom.xml b/tags/java/sca/1.3/modules/runtime/pom.xml
deleted file mode 100644
index 5fc4ddf2a8..0000000000
--- a/tags/java/sca/1.3/modules/runtime/pom.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA Runtime</name>
-    <artifactId>tuscany-runtime</artifactId>
-    <packaging>jar</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-binding-dwr</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ejb</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-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-jsonrpc</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</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-binding-ws</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <exclusions>
-               <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
-                  <groupId>junit</groupId>
-                  <artifactId>junit</artifactId>
-               </exclusion>
-            </exclusions>
-        </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-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-contribution-resource</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-core-spring</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-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-definitions</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-definitions-xml</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-extension-helper</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-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>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-implementation-spring</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-node</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>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>tuscany-sca</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.tuscany.sca.runtime.standalone.Launcher</mainClass>
-                            <addClasspath>false</addClasspath>
-                        </manifest>
-                        <manifestEntries>
-                            <!-- Add an entry for the renamed bundle jar in the distro -->
-                            <Class-Path>tuscany-standalone-${pom.version}.jar</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java b/tags/java/sca/1.3/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
deleted file mode 100644
index b3774a364d..0000000000
--- a/tags/java/sca/1.3/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.runtime;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.node.NodeException;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * A Launcher using a multiple nodes part as part of a domain
- *
- * @version $Rev$ $Date$
- */
-public class Launcher {
-    private static final Logger logger = Logger.getLogger(Launcher.class.getName());
-
-    protected SCANodeFactory scaNodeFactory;
-    protected List<SCANode> scaNodes;
-    protected String domainName;
-    protected File repository;
-
-    protected boolean started;
-
-    protected String cp;
-
-    public Launcher(File repository) {
-        this(repository, "http://localhost:8080/Tuscany");
-    }
-
-    public Launcher(File repository, String cp) {
-        this.repository = repository;
-        this.cp = cp;
-
-        initFromPropertyFile();
-        
-        logger.info("SCA runtime starting");
-        logger.info("repository: " + repository.getAbsolutePath());
-        logger.info("domain: " + ((domainName != null) ? domainName : "STANDALONE"));
-        
-        scaNodeFactory = SCANodeFactory.newInstance();
-        scaNodes = new ArrayList<SCANode>();
-        
-        if (repository != null && repository.exists()) {
-            if (isExplodedContribution(repository)) {
-                addContributionFolder(repository);
-            } else {
-                addTopLevelJARs(repository);
-                addSubFolders(repository);
-            }
-        }
-    }
-    
-    protected boolean isExplodedContribution(File folder) {
-        return getJARsInFolder(folder).length < 1 && containsCompositeFile(folder);
-    }
-
-    protected void addContributionFolder(File folder) {
-        SCANode repoNode;
-        try {
-            repoNode = createNode(cp);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-        try {
-            repoNode.addContribution(folder.toURL().toString(), folder.toURL());
-            logger.info("added contribution folder: " + folder.toURL());
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.log(Level.WARNING, "exception adding contribution folder: " + folder, e);
-        }
-    }
-
-    protected URL[] addTopLevelJARs(File repository) {
-        SCANode repoNode;
-        try {
-            repoNode = createNode(cp);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        
-        URL[] jars = getJARsInFolder(repository);
-        for (URL jarURL : jars) {
-            try {
-                repoNode.addContribution(jarURL.toString(), jarURL);
-                logger.info("added contribution: " + jarURL);
-            } catch (NodeException e) {
-                e.printStackTrace();
-                logger.log(Level.WARNING, "exception adding contribution: " + jarURL, e);
-            }
-        }
-        
-        return jars;
-    }
-
-    protected URL[] addSubFolders(File repository) {
-        URL[] folders = getSubFolders(repository);
-        for (URL folderURL : folders) {
-            try {
-                SCANode scaNode = createNode(cp + "/" + folderURL);
-                scaNode.addContribution(folderURL.toString(), folderURL);
-                logger.info("added contribution: " + folderURL);
-            } catch (Exception e) {
-                e.printStackTrace();
-                logger.log(Level.WARNING, "exception adding contribution: " + folderURL, e);
-            }
-        }
-        return folders;
-    }
-
-    public void addContribution(URL contributionURL) throws NodeException {
-        SCANode scaNode = createNode(cp + "/" + contributionURL);
-
-        if (started && domainName == null) {
-            scaNode.stop();
-        }
-        
-        scaNode.addContribution(contributionURL.toString(), contributionURL);
-        logger.info("added contribution: " + contributionURL);
-        
-        if (started) {
-            if (domainName == null) {
-                scaNode.addToDomainLevelComposite((QName)null);
-                scaNode.start();
-            } else {
-                scaNode.addToDomainLevelComposite((QName)null);
-                scaNode.start();
-            }
-        }
-    }
-
-    public void start() {
-        try {
-
-            for (SCANode scaNode : scaNodes) {
-                scaNode.addToDomainLevelComposite((QName)null);
-                scaNode.start();
-            }
-
-        } catch (NodeException e) {
-            throw new RuntimeException(e);
-        }
-        started = true;
-    }
-
-    public void stop() {
-        try {
-            for (SCANode scaNode : scaNodes) {
-                scaNode.stop();
-            }
-        } catch (NodeException e) {
-            throw new RuntimeException(e);
-        }
-        started = false;
-    }
-
-    public void destroy() {
-        try {
-            stop();
-            for (SCANode scaNode : scaNodes) {
-                scaNode.destroy();
-            }
-        } catch (NodeException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected URL[] getJARsInFolder(File repository) {
-
-        String[] jarNames = repository.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".jar");
-            }
-        });
-
-        List<URL> contributionJars = new ArrayList<URL>();
-        if (jarNames != null) {
-            for (String jar : jarNames) {
-                try {
-                    contributionJars.add(new File(repository, jar).toURL());
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        return contributionJars.toArray(new URL[contributionJars.size()]);
-    }
-
-    protected URL[] getSubFolders(File repositoryDir) {
-        String[] folderNames = repositoryDir.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return new File(dir, name).isDirectory();
-            }
-        });
-
-        List<URL> contributionFolders = new ArrayList<URL>();
-        if (folderNames != null) {
-            for (String folder : folderNames) {
-                try {
-                    contributionFolders.add(new File(repositoryDir, folder).toURL());
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        return contributionFolders.toArray(new URL[contributionFolders.size()]);
-    }
-
-    /**
-     * Tests if the directory or any sub-directories contains a .composite file
-     */
-    protected boolean containsCompositeFile(File repository) {
-        String[] compositesFileNames = repository.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".composite");
-            }
-        });
-
-        if (compositesFileNames == null || compositesFileNames.length < 1) {
-            for (URL subFolder : getSubFolders(repository)) {
-                try {
-                    if (containsCompositeFile(new File(subFolder.toURI()))) {
-                        return true;
-                    }
-                } catch (URISyntaxException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Creates a new SCA Node unless running as a standalone node in 
-     * which case just a single node is used to run for all contributions
-     */
-    protected SCANode createNode(String nodeName) throws NodeException {
-        SCANode scaNode;
-
-        if (domainName == null || domainName.length() < 1) {
-            if (scaNodes.size() < 1) {
-                scaNode = scaNodeFactory.createSCANode(nodeName, null);
-                scaNodes.add(scaNode);
-            } else {
-                scaNode = scaNodes.get(0);
-            }
-        } else {
-            scaNode = scaNodeFactory.createSCANode(nodeName, null);
-            scaNodes.add(scaNode);
-        }
-
-        return scaNode;
-    }
-
-    protected void initFromPropertyFile() {
-        File file = new File(repository, "tuscany.properties");
-        if (!file.exists()) {
-            return;
-        }
-
-        Properties properties = new Properties();
-        try {
-            properties.load(new FileInputStream(file));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        
-//        if (properties.getProperty("nodeName") != null) {
-//            this.nodeName = properties.getProperty("nodeName");
-//        }
-        if (properties.getProperty("domainName") != null && properties.getProperty("domainName").length() > 0) {
-            this.domainName = properties.getProperty("domainName");
-        }
-//        if (properties.getProperty("hotDeployInterval") != null) {
-//            this.hotDeployInterval = Long.parseLong(properties.getProperty("hotDeployInterval"));
-//        }
-    }
-
-//    protected void initHotDeploy(final File repository) {
-//
-//        if (hotDeployInterval == 0) {
-//            return; // hotUpdateInterval of 0 disables hotupdate
-//        }
-//        
-//        Runnable runable = new Runnable() {
-//
-//            public void run() {
-//                logger.info("Contribution hot deploy activated");
-//                while (!stopHotDeployThread) {
-//                    try {
-//                        Thread.sleep(hotDeployInterval);
-//                    } catch (InterruptedException e) {
-//                    }
-//                    if (!stopHotDeployThread) {
-//                        checkForUpdates(repository);
-//                    }
-//                }
-//                logger.info("contribution hot deploy stopped");
-//            }
-//        };
-//        hotDeployThread = new Thread(runable, "TuscanyHotDeploy");
-//        stopHotDeployThread = false;
-//        hotDeployThread.start();
-//    }
-//
-//    protected void checkForUpdates(File repository) {
-//        URL[] currentContributions = getContributionJarURLs(repository);
-//        if (areContributionsAltered(currentContributions)) {
-//            restartNode(node);
-//        }
-//    }
-//
-//    protected boolean areContributionsAltered(URL[] currentContrabutions) {
-//        try {
-//            
-//            List addedContributions = getAddedContributions(currentContrabutions);
-//            List removedContributions = getRemovedContributions(currentContrabutions);
-//            List updatedContributions = getUpdatedContributions(currentContrabutions);
-//            
-//            return (addedContributions.size() > 0 || removedContributions.size() > 0 || updatedContributions.size() > 0);
-//
-//        } catch (URISyntaxException e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-//
-//    protected List<URL> getAddedContributions(URL[] currentContrabutions) {
-//        List<URL> urls = new ArrayList<URL>();
-//        for (URL url : currentContrabutions) {
-//            if (!existingContributions.containsKey(url)) {
-//                urls.add(url);
-//            }
-//        }
-//        return urls;
-//    }
-//
-//    protected List<URL> getUpdatedContributions(URL[] currentContrabutions) throws URISyntaxException {
-//        List<URL> urls = new ArrayList<URL>();
-//        for (URL url : currentContrabutions) {
-//            if (existingContributions.containsKey(url)) {
-//                File curentFile = new File(url.toURI());
-//                if (curentFile.lastModified() != existingContributions.get(url)) {
-//                    urls.add(url);
-//                    logger.info("updated contribution: " + curentFile.getName());
-//                }
-//            }
-//        }
-//        return urls;
-//    }
-//
-//    protected List getRemovedContributions(URL[] currentContrabutions) throws URISyntaxException {
-//        List<URL> currentUrls = Arrays.asList(currentContrabutions);
-//        List<URL> urls = new ArrayList<URL>();
-//        for (URL url : existingContributions.keySet()) {
-//            if (!currentUrls.contains(url)) {
-//                urls.add(url);
-//            }
-//        }
-//        for (URL url : urls) {
-//            logger.info("removed contributions: " + new File(url.toURI()).getName());
-//        }
-//        return urls;
-//    }
-//    
-//    protected void copyFiles(File origin, File destination) throws IOException {
-//        if (origin.isDirectory()) {
-//            if (!destination.exists()) {
-//                destination.mkdir();
-//            }
-//            for (String file : origin.list()) {
-//                copyFiles(new File(origin, file), new File(destination, file));
-//            }
-//        } else {
-//            InputStream in = new FileInputStream(origin);
-//            OutputStream out = new FileOutputStream(destination);
-//            try {
-//                byte[] buf = new byte[4096];
-//                int len;
-//                while ((len = in.read(buf)) > 0) {
-//                    out.write(buf, 0, len);
-//                }
-//            } finally {
-//                in.close();
-//                out.close();
-//            }
-//        }
-//    }
-}
diff --git a/tags/java/sca/1.3/modules/sca-api/LICENSE b/tags/java/sca/1.3/modules/sca-api/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/sca-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/tags/java/sca/1.3/modules/sca-api/NOTICE b/tags/java/sca/1.3/modules/sca-api/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/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/tags/java/sca/1.3/modules/sca-api/pom.xml b/tags/java/sca/1.3/modules/sca-api/pom.xml
deleted file mode 100644
index 15cff600f7..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/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-modules</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-sca-api</artifactId>
-    <name>Apache Tuscany SCA API</name>
-
-    <description>API classes for the Service Component Architecture</description>
-    <packaging>jar</packaging>
- 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>2.0</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.description}</Bundle-Description>
-                        <Export-Package>org.osoa.sca*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
deleted file mode 100644
index c32d229a76..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
deleted file mode 100644
index 616d4c6338..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.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.osoa.sca;
-
-/**
- * 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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
deleted file mode 100644
index b1b2af8048..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
deleted file mode 100644
index 64423a4aa2..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/Conversation.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
deleted file mode 100644
index 63e3907cff..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
deleted file mode 100644
index 7c067a3a43..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
deleted file mode 100644
index 900d5eecc1..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
deleted file mode 100644
index 8790aac4fb..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
deleted file mode 100644
index 1c6b436afa..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
deleted file mode 100644
index d3543799ed..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
deleted file mode 100644
index bab9713026..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
deleted file mode 100644
index 1d1ecdbc13..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
deleted file mode 100644
index a9fc36f769..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
deleted file mode 100644
index 477053670a..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
deleted file mode 100644
index f54e421c81..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
deleted file mode 100644
index 86d2d6560d..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
deleted file mode 100644
index 37f767c1f4..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
deleted file mode 100644
index 1484d4ac77..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
deleted file mode 100644
index 13ca9a2931..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
deleted file mode 100644
index f16bf44808..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
deleted file mode 100644
index 7d3da46ea9..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
deleted file mode 100644
index b9483bc9a8..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
deleted file mode 100644
index 9e6942651b..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
deleted file mode 100644
index 32654fea17..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
deleted file mode 100644
index 1a9288934c..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
deleted file mode 100644
index 0769a94fbb..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
deleted file mode 100644
index fbc7398da4..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
deleted file mode 100644
index 57247cd8a3..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
deleted file mode 100644
index 864a69b19a..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
deleted file mode 100644
index a0abe16068..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
deleted file mode 100644
index 768429cd91..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
deleted file mode 100644
index 1021f6e37f..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
deleted file mode 100644
index aa439cabab..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
deleted file mode 100644
index 6fded2dec8..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.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.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/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
deleted file mode 100644
index 1e475cd4c8..0000000000
--- a/tags/java/sca/1.3/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.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.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/tags/java/sca/1.3/modules/workspace-impl/LICENSE b/tags/java/sca/1.3/modules/workspace-impl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace-impl/NOTICE b/tags/java/sca/1.3/modules/workspace-impl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/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/tags/java/sca/1.3/modules/workspace-impl/pom.xml b/tags/java/sca/1.3/modules/workspace-impl/pom.xml
deleted file mode 100644
index 28bd2d09d6..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</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.workspace.impl</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.workspace*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
deleted file mode 100644
index 016c764d47..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.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.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.assembly.builder.impl.ProblemImpl;
-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.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.ContributionDependencyBuilder;
-
-/**
- * A contribution dependency builder.
- *
- * @version $Rev$ $Date$
- */
-public class ContributionDependencyBuilderImpl implements ContributionDependencyBuilder {
-    private static final Logger logger = Logger.getLogger(ContributionDependencyBuilderImpl.class.getName());
-    
-    private Monitor monitor;
-    
-    /**
-     * Constructs a new ContributionDependencyBuilder.
-     */
-    public ContributionDependencyBuilderImpl(Monitor monitor) {
-               
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Calculate the set of contributions that a contribution depends on.
-     * @param contribution
-     * @param workspace
-     * @return
-     */
-    public List<Contribution> buildContributionDependencies(Contribution contribution, Workspace workspace) {
-        List<Contribution> dependencies = new ArrayList<Contribution>();
-        Set<Contribution> set = new HashSet<Contribution>();
-
-        dependencies.add(contribution);
-        set.add(contribution);
-        addContributionDependencies(contribution, workspace, dependencies, set);
-        
-        Collections.reverse(dependencies);
-        return dependencies;
-    }
-    
-    /**
-     * Analyze a contribution and add its dependencies to the given dependency set.
-     * @param contribution
-     * @param workspace
-     * @param dependencies
-     * @param set
-     */
-    private void addContributionDependencies(Contribution contribution, Workspace workspace, List<Contribution> dependencies, Set<Contribution> set) {
-        
-        // 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);
-                        }
-                    }
-                }
-            }
-            
-            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("UnresolvedImport", import_, import_);
-                }
-            }
-        }
-    }
-
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = new ProblemImpl(getClass().getName(), "workspace-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
deleted file mode 100644
index 880e95480e..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.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.workspace.processor.impl;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-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.ContributionFactory;
-import org.apache.tuscany.sca.contribution.ContributionMetadata;
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-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.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
-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.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner;
-import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner;
-
-/**
- * URLArtifactProcessor that handles contribution files and the artifacts they contain
- * and returns a contribution model.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionContentProcessor implements URLArtifactProcessor<Contribution>{
-    private ContributionFactory contributionFactory;
-    private ModelResolverExtensionPoint modelResolvers;
-    private ModelFactoryExtensionPoint modelFactories;
-    private URLArtifactProcessor<Object> artifactProcessor;
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private UtilityExtensionPoint utilities;
-    private Monitor monitor = null;
-
-    public ContributionContentProcessor(ExtensionPointRegistry extensionPoints, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        hackResolvers(modelResolvers);
-        this.monitor = monitor;
-        URLArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        this.artifactProcessor = new ExtensibleURLArtifactProcessor(artifactProcessors, this.monitor);
-        this.extensionProcessor = extensionProcessor;
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-    }
-    
-    public ContributionContentProcessor(ModelFactoryExtensionPoint modelFactories, ModelResolverExtensionPoint modelResolvers,
-                                        URLArtifactProcessor<Object> artifactProcessor, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        this.modelFactories = modelFactories;
-        this.modelResolvers = modelResolvers;
-        hackResolvers(modelResolvers);
-        this.artifactProcessor = artifactProcessor;
-        this.extensionProcessor = extensionProcessor;
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-        this.monitor = monitor;
-    }
-    
-    public String getArtifactType() {
-        return ".contribution/content";
-    }
-    
-    public Class<Contribution> getModelType() {
-        return Contribution.class;
-    }
-    
-    public Contribution read(URL parentURL, URI contributionURI, URL contributionURL) throws ContributionReadException {
-        
-        // Create contribution model
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(contributionURI.toString());
-        contribution.setLocation(contributionURL.toString());
-        ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-        contribution.setModelResolver(modelResolver);
-        contribution.setUnresolved(true);
-
-        // Create a contribution scanner
-        ContributionScanner scanner;
-        if ("file".equals(contributionURL.getProtocol()) && new File(contributionURL.getFile()).isDirectory()) {
-            scanner = new DirectoryContributionScanner();
-        } else {
-            scanner = new JarContributionScanner();
-        }
-        
-        // Scan the contribution and list the artifacts contained in it
-        List<Artifact> artifacts = contribution.getArtifacts();
-        boolean contributionMetadata = false;
-        List<String> artifactURIs = scanner.getArtifacts(contributionURL);
-        for (String artifactURI: artifactURIs) {
-            URL artifactURL = scanner.getArtifactURL(contributionURL, artifactURI);
-
-            // Add the deployed artifact model to the contribution
-            Artifact artifact = this.contributionFactory.createArtifact();
-            artifact.setURI(artifactURI);
-            artifact.setLocation(artifactURL.toString());
-            artifacts.add(artifact);
-            modelResolver.addModel(artifact);
-            
-            // Read each artifact
-            Object model = artifactProcessor.read(contributionURL, URI.create(artifactURI), artifactURL);
-            if (model != null) {
-                artifact.setModel(model);
-
-                // Add the loaded model to the model resolver
-                modelResolver.addModel(model);
-
-                // Merge contribution metadata into the contribution model
-                if (model instanceof ContributionMetadata) {
-                    contributionMetadata = true;
-                    ContributionMetadata c = (ContributionMetadata)model;
-                    contribution.getImports().addAll(c.getImports());
-                    contribution.getExports().addAll(c.getExports());
-                    contribution.getDeployables().addAll(c.getDeployables());
-                }
-            }
-        }
-        
-        // If no sca-contribution.xml file was provided then just consider
-        // all composites in the contribution as deployables
-        if (!contributionMetadata) {
-            for (Artifact artifact: artifacts) {
-                if (artifact.getModel() instanceof Composite) {
-                    contribution.getDeployables().add((Composite)artifact.getModel());
-                }
-            }
-
-            // Add default contribution import and export
-            DefaultImport defaultImport = contributionFactory.createDefaultImport();
-            defaultImport.setModelResolver(new DefaultModelResolver());
-            contribution.getImports().add(defaultImport);
-            DefaultExport defaultExport = contributionFactory.createDefaultExport();
-            contribution.getExports().add(defaultExport);
-        }
-        
-        return contribution;
-    }
-    
-    public void resolve(Contribution contribution, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Resolve the contribution model itself
-        ModelResolver contributionResolver = contribution.getModelResolver();
-        contribution.setUnresolved(false);
-        contributionResolver.addModel(contribution);
-        
-        // Resolve imports and exports
-        for (Export export: contribution.getExports()) {
-            if (export instanceof DefaultExport) {
-                
-                // Initialize the default export's resolver
-                export.setModelResolver(contributionResolver);
-                
-            } else {
-                extensionProcessor.resolve(export, contributionResolver);
-            }
-        }
-        for (Import import_: contribution.getImports()) {
-            extensionProcessor.resolve(import_, contributionResolver);
-        }
-        
-        // Resolve all artifact models
-        for (Artifact artifact : contribution.getArtifacts()) {
-            Object model = artifact.getModel();
-            if (model != null) {
-                try {
-                   artifactProcessor.resolve(model, contributionResolver);
-                } catch (Exception e) {
-                    //FIXME this shouldn't happen
-                }
-            }
-        }
-        
-        // Resolve deployable composites
-        List<Composite> deployables = contribution.getDeployables();
-        for (int i = 0, n = deployables.size(); i < n; i++) {
-            Composite deployable = deployables.get(i);
-            Composite resolved = (Composite)contributionResolver.resolveModel(Composite.class, deployable);
-            if (resolved != deployable) {
-                deployables.set(i, resolved);
-            }
-        }
-    }
-
-    /**
-     * FIXME Temporary hack for testing the ClassLoaderModelResolver.
-     * 
-     * @param modelResolvers
-     */
-    private static void hackResolvers(ModelResolverExtensionPoint modelResolvers) {
-        Class<?> resolverClass = modelResolvers.getResolver(ClassReference.class);
-        if (resolverClass==null || !resolverClass.getName().equals("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver")) {
-            try {
-                Class<?> loaderResolverClass = Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver", true, ContributionContentProcessor.class.getClassLoader());
-                modelResolvers.addResolver(ClassReference.class, (Class<? extends ModelResolver>)loaderResolverClass);
-            } catch (ClassNotFoundException e) {
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
deleted file mode 100644
index 6ef0fa753d..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.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.workspace.processor.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-
-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.ContributionMetadata;
-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.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-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.contribution.resolver.ModelResolverExtensionPoint;
-import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
-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.monitor.Monitor;
-import org.apache.tuscany.sca.workspace.scanner.impl.DirectoryContributionScanner;
-import org.apache.tuscany.sca.workspace.scanner.impl.JarContributionScanner;
-
-/**
- * URLArtifactProcessor that handles contribution files and returns a contribution
- * info model.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionInfoProcessor implements URLArtifactProcessor<Contribution>{
-    private ContributionFactory contributionFactory;
-    private ModelResolverExtensionPoint modelResolvers;
-    private ModelFactoryExtensionPoint modelFactories;
-    private URLArtifactProcessorExtensionPoint artifactProcessors;
-    private URLArtifactProcessor<Object> artifactProcessor;
-    private StAXArtifactProcessor<Object> extensionProcessor;
-
-    public ContributionInfoProcessor(ExtensionPointRegistry extensionPoints, StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        this.modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        this.modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
-        hackResolvers(modelResolvers);
-        URLArtifactProcessorExtensionPoint artifactProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        this.artifactProcessors = artifactProcessors;
-        this.artifactProcessor = new ExtensibleURLArtifactProcessor(artifactProcessors, monitor);
-        this.extensionProcessor = extensionProcessor;
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-    }
-    
-    public ContributionInfoProcessor(ModelFactoryExtensionPoint modelFactories, ModelResolverExtensionPoint modelResolvers, URLArtifactProcessor<Object> artifactProcessor) {
-        this.modelFactories = modelFactories;
-        this.modelResolvers = modelResolvers;
-        hackResolvers(modelResolvers);
-        this.artifactProcessor = artifactProcessor;
-        this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-    }
-    
-    public String getArtifactType() {
-        return ".contribution/info";
-    }
-    
-    public Class<Contribution> getModelType() {
-        return null;
-    }
-    
-    public Contribution read(URL parentURL, URI contributionURI, URL contributionURL) throws ContributionReadException {
-        
-        // Create contribution model
-        Contribution contribution = contributionFactory.createContribution();
-        contribution.setURI(contributionURI.toString());
-        contribution.setLocation(contributionURL.toString());
-        ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
-        contribution.setModelResolver(modelResolver);
-        contribution.setUnresolved(true);
-
-        // Create a contribution scanner
-        ContributionScanner scanner;
-        if ("file".equals(contributionURL.getProtocol()) && new File(contributionURL.getFile()).isDirectory()) {
-            scanner = new DirectoryContributionScanner();
-        } else {
-            scanner = new JarContributionScanner();
-        }
-        
-        // Read generated and user sca-contribution.xml files
-        boolean contributionMetadata = false;
-        for (String path: new String[]{
-                                       Contribution.SCA_CONTRIBUTION_GENERATED_META,
-                                       Contribution.SCA_CONTRIBUTION_META}) {
-            URL url = scanner.getArtifactURL(contributionURL, path);
-            try {
-                // Check if the file actually exists before trying to read it
-                URLConnection connection = url.openConnection();
-                connection.setUseCaches(false);
-                InputStream is = connection.getInputStream();
-                is.close();
-            } catch (IOException e) {
-                continue;
-            }
-            contributionMetadata = true;
-            
-            // Read the sca-contribution.xml file
-            ContributionMetadata c = (ContributionMetadata)artifactProcessor.read(contributionURL, URI.create(path), url);
-            contribution.getImports().addAll(c.getImports());
-            contribution.getExports().addAll(c.getExports());
-            contribution.getDeployables().addAll(c.getDeployables());
-        }
-        
-        // If no sca-contribution.xml file was provided then consider
-        // all composites in the contribution as deployables, and also
-        // read any files that are explicitly asssigned artifact processors
-        // as they are likely to provide relevant metadata info
-        if (!contributionMetadata) {
-            List<String> artifactURIs;
-            try {
-                artifactURIs = scanner.getArtifacts(contributionURL);
-            } catch (ContributionReadException e) {
-                artifactURIs = null;
-            }
-            if (artifactURIs != null) {
-                for (String artifactURI: artifactURIs) {
-                    boolean read = false;
-                    if (artifactURI.endsWith(".composite")) {
-                        read = true;
-                    } else {
-                        int s= artifactURI.lastIndexOf("/");
-                        String fileName = artifactURI.substring(s + 1);
-                        if (artifactProcessors.getProcessor(fileName) != null) {
-                            read = true;
-                        }
-                    }
-                    if (read) {
-                        URL artifactURL = scanner.getArtifactURL(contributionURL, artifactURI);
-        
-                        // Read each artifact
-                        Object model = artifactProcessor.read(contributionURL, URI.create(artifactURI), artifactURL);
-                        
-                        // In the absence of more info, consider all composites as deployable
-                        if (model instanceof Composite) {
-                            contribution.getDeployables().add((Composite)model);
-                        }
-                    }
-                }
-            }
-            
-            // Add default contribution import and export
-            DefaultImport defaultImport = contributionFactory.createDefaultImport();
-            defaultImport.setModelResolver(new DefaultModelResolver());
-            contribution.getImports().add(defaultImport);
-            DefaultExport defaultExport = contributionFactory.createDefaultExport();
-            contribution.getExports().add(defaultExport);
-        }
-        
-        return contribution;
-    }
-    
-    public void resolve(Contribution contribution, ModelResolver resolver) throws ContributionResolveException {
-        
-        // Mark the contribution model resolved
-        ModelResolver contributionResolver = contribution.getModelResolver();
-        contribution.setUnresolved(false);
-        contributionResolver.addModel(contribution);
-        
-        // Resolve imports and exports
-        for (Export export: contribution.getExports()) {
-            if (export instanceof DefaultExport) {
-                
-                // Initialize the default export's resolver
-                export.setModelResolver(contributionResolver);
-                
-            } else {
-                extensionProcessor.resolve(export, contributionResolver);
-            }
-        }
-        for (Import import_: contribution.getImports()) {
-            extensionProcessor.resolve(import_, contributionResolver);
-        }
-        
-    }
-
-    /**
-     * FIXME Temporary hack for testing the ClassLoaderModelResolver.
-     * 
-     * @param modelResolvers
-     */
-    private static void hackResolvers(ModelResolverExtensionPoint modelResolvers) {
-        Class<?> resolverClass = modelResolvers.getResolver(ClassReference.class);
-        if (resolverClass==null || !resolverClass.getName().equals("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver")) {
-            try {
-                Class<?> loaderResolverClass = Class.forName("org.apache.tuscany.sca.contribution.java.impl.ClassLoaderModelResolver", true, ContributionContentProcessor.class.getClassLoader());
-                modelResolvers.addResolver(ClassReference.class, (Class<? extends ModelResolver>)loaderResolverClass);
-            } catch (ClassNotFoundException e) {
-            }
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
deleted file mode 100644
index 45ba8c0609..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.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.workspace.scanner.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * Folder contribution processor.
- * 
- * @version $Rev$ $Date$
- */
-public class DirectoryContributionScanner implements ContributionScanner {
-
-    public DirectoryContributionScanner() {
-    }
-
-    public String getContributionType() {
-        return "application/vnd.tuscany.folder";
-    }
-
-    public URL getArtifactURL(URL contributionURL, String artifact) throws ContributionReadException {
-        File directory = directory(contributionURL);
-        File file = new File(directory, artifact);
-        try {
-            return file.toURI().toURL();
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    public List<String> getArtifacts(URL contributionURL) throws ContributionReadException {
-        File directory = directory(contributionURL);
-        List<String> artifacts = new ArrayList<String>();
-        try {
-            traverse(artifacts, directory, directory);
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-        return artifacts;
-    }
-
-    /**
-     * Recursively traverse a root directory
-     * 
-     * @param fileList
-     * @param file
-     * @param root
-     * @throws IOException
-     */
-    private static void traverse(List<String> fileList, File file, File root) throws IOException {
-        if (file.isFile()) {
-            fileList.add(root.toURI().relativize(file.toURI()).toString());
-        } else if (file.isDirectory()) {
-            String uri = root.toURI().relativize(file.toURI()).toString();
-            if (uri.endsWith("/")) {
-                uri = uri.substring(0, uri.length() - 1);
-            }
-            fileList.add(uri);
-            
-            File[] files = file.listFiles();
-            for (File f: files) {
-                if (!f.getName().startsWith(".")) {
-                    traverse(fileList, f, root);
-                }
-            }
-        }
-    }
-
-    private static File directory(URL url) throws ContributionReadException {
-        File file;
-        try {
-            file = new File(url.toURI());
-        } catch (URISyntaxException e) {
-            throw new ContributionReadException(e);
-        }
-        if (!file.exists() || !file.isDirectory()) {
-            throw new ContributionReadException(url.toString());
-        }
-        return file;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
deleted file mode 100644
index 9dd1b3a15b..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.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.workspace.scanner.impl;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-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.scanner.ContributionScanner;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-
-/**
- * JAR Contribution processor.
- * 
- * @version $Rev$ $Date$
- */
-public class JarContributionScanner implements ContributionScanner {
-
-    public JarContributionScanner() {
-    }
-
-    public String getContributionType() {
-        return "application/x-compressed";
-    }
-
-    public URL getArtifactURL(URL contributionURL, String artifact) throws ContributionReadException {
-        try {
-            URL url;
-            if (contributionURL.toString().startsWith("jar:")) {
-                url = new URL(contributionURL, artifact.toString());
-            } else {
-                url = new URL("jar:" + contributionURL.toExternalForm() + "!/" + artifact);
-            }
-            return url;
-        } catch (MalformedURLException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-
-    public List<String> getArtifacts(URL contributionURL) throws ContributionReadException {
-
-        // Assume the URL references a JAR file
-        try {
-            URLConnection connection = contributionURL.openConnection();
-            connection.setUseCaches(false);
-            JarInputStream jar = new JarInputStream(connection.getInputStream());
-            try {
-                Set<String> names = new HashSet<String>();
-                while (true) {
-                    JarEntry entry = jar.getNextJarEntry();
-                    if (entry == null) {
-                        // EOF
-                        break;
-                    }
-
-                    String name = entry.getName(); 
-                    if (name.length() != 0 && !name.startsWith(".")) {
-                        
-                        // Trim trailing /
-                        if (name.endsWith("/")) {
-                            name = name.substring(0, name.length() - 1);
-                        }
-
-                        // Add the entry name
-                        if (!names.contains(name)) {
-                            names.add(name);
-                            
-                            // Add parent folder names to the list too
-                            for (;;) {
-                                int s = name.lastIndexOf('/');
-                                if (s == -1) {
-                                    name = "";
-                                } else {
-                                    name = name.substring(0, s);
-                                }
-                                if (name.length() != 0 && !names.contains(name)) {
-                                    names.add(name);
-                                } else {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-                
-                // Return list of URIs
-                List<String> artifacts = new ArrayList<String>(names);
-                return artifacts;
-                
-            } finally {
-                jar.close();
-            }
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-    }
-}
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 41d0ebe27d..0000000000
--- a/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ /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.workspace.processor.impl.ContributionContentProcessor;type=.contribution/content,model=org.apache.tuscany.sca.contribution.Contribution
-org.apache.tuscany.sca.workspace.processor.impl.ContributionInfoProcessor;type=.contribution/info
diff --git a/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
deleted file mode 100644
index 0c07a3a30f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/tags/java/sca/1.3/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
deleted file mode 100644
index 2e8326c062..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/tags/java/sca/1.3/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
deleted file mode 100644
index f7b6b35679..0000000000
--- a/tags/java/sca/1.3/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 java.util.List;
-
-import junit.framework.TestCase;
-
-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.NamespaceExport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory;
-import org.apache.tuscany.sca.contribution.namespace.impl.NamespaceImportExportFactoryImpl;
-import org.apache.tuscany.sca.workspace.DefaultWorkspaceFactory;
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-
-/**
- * Test the contribution dependency analyzer.
- * 
- * @version $Rev$ $Date$
- */
-public class ContributionDependencyBuilderTestCase extends TestCase {
-
-    private ContributionFactory contributionFactory;
-    private WorkspaceFactory workspaceFactory;
-    private NamespaceImportExportFactory importExportFactory;
-
-    @Override
-    public void setUp() throws Exception {
-        contributionFactory = new DefaultContributionFactory();
-        workspaceFactory = new DefaultWorkspaceFactory();
-        importExportFactory = new NamespaceImportExportFactoryImpl();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-    }
-
-    public void testAnalyze() {
-        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 analyzer = new ContributionDependencyBuilderImpl(null);
-        List<Contribution> dependencies = analyzer.buildContributionDependencies(importer, workspace);
-        assertTrue(dependencies.size() == 3);
-        assertTrue(dependencies.contains(importer));
-        assertTrue(dependencies.contains(imported));
-        assertTrue(dependencies.contains(imported2));
-    }
-    
-}
diff --git a/tags/java/sca/1.3/modules/workspace-xml/LICENSE b/tags/java/sca/1.3/modules/workspace-xml/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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/tags/java/sca/1.3/modules/workspace-xml/NOTICE b/tags/java/sca/1.3/modules/workspace-xml/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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/tags/java/sca/1.3/modules/workspace-xml/pom.xml b/tags/java/sca/1.3/modules/workspace-xml/pom.xml
deleted file mode 100644
index e6acded521..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-workspace-xml</artifactId>
-    <name>Apache Tuscany SCA Domain Workspace XML Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>1.3</version>
-        </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.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.workspace.xml</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.workspace.xml*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/tags/java/sca/1.3/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
deleted file mode 100644
index 49041b3263..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.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.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.assembly.builder.impl.ProblemImpl;
-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.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-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$ $Date$
- */
-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 = new ProblemImpl(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/tags/java/sca/1.3/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/tags/java/sca/1.3/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
deleted file mode 100644
index d0665a4ec8..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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.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.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-
-/**
- * A contribution workspace processor.
- * 
- * @version $Rev$ $Date$
- */
-public class WorkspaceProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Workspace> {
-    
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    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(ModelFactoryExtensionPoint 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/tags/java/sca/1.3/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9ea7874b52..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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.0#workspace,model=org.apache.tuscany.sca.workspace.Workspace
diff --git a/tags/java/sca/1.3/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties b/tags/java/sca/1.3/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
deleted file mode 100644
index e054591a31..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/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/tags/java/sca/1.3/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/tags/java/sca/1.3/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
deleted file mode 100644
index 8e4d30e7a0..0000000000
--- a/tags/java/sca/1.3/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.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.workspace.xml;
-
-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.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;
-
-/**
- * Test the workspace processor.
- * 
- * @version $Rev$ $Date$
- */
-
-public class ContributionWorkspaceProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<workspace xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\">"
-            + "<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.0\">"
-            + "<contribution uri=\"uri1\" location=\"location1\"/>"
-            + "<contribution uri=\"uri2\" location=\"location2\"/>"
-            + "</contribution>"
-            + "</workspace>";
-
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor;
-
-    @Override
-    protected void setUp() throws Exception {
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-        StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-    }
-
-    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());
-  }
-
-    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/tags/java/sca/1.3/modules/workspace/LICENSE b/tags/java/sca/1.3/modules/workspace/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace/NOTICE b/tags/java/sca/1.3/modules/workspace/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/modules/workspace/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/tags/java/sca/1.3/modules/workspace/pom.xml b/tags/java/sca/1.3/modules/workspace/pom.xml
deleted file mode 100644
index cb6ca7906d..0000000000
--- a/tags/java/sca/1.3/modules/workspace/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.3</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.workspace</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.workspace*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
deleted file mode 100644
index e895669d23..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
deleted file mode 100644
index 66f38afec7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
deleted file mode 100644
index 2656068bea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
deleted file mode 100644
index 6fab700243..0000000000
--- a/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.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.workspace.builder;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * A contribution dependency builder.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionDependencyBuilder {
-
-    /**
-     * Build the set of contributions that a contribution depends on.
-     * @param workspace
-     * @param contribution
-     * @return
-     */
-    List<Contribution> buildContributionDependencies(Contribution contribution, Workspace workspace);
-
-}
diff --git a/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
deleted file mode 100644
index e41cc3ea83..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
deleted file mode 100644
index e60a5d8108..0000000000
--- a/tags/java/sca/1.3/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.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.workspace.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.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 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; 
-    
-    /**
-     * Constructs a new workspace. 
-     */
-    WorkspaceImpl() {
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-
-    public Object getModel() {
-        return 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 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;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/tags/java/sca/1.3/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
deleted file mode 100644
index d390d29d90..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/modules/xsd-xml/pom.xml b/tags/java/sca/1.3/modules/xsd-xml/pom.xml
deleted file mode 100644
index 822cbf2480..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-xsd-xml</artifactId>

-    <name>Apache Tuscany SCA XSD XML Processor</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-contribution</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-contribution-namespace</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-contribution-impl</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-assembly-xml</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-xsd</artifactId>

-            <version>1.3</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.xsd.xml</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.xsd.xml*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
deleted file mode 100644
index 595795a2d9..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.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.xsd.xml;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.InputSource;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLDocumentHelper {
-    public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions");
-    public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema");
-    public static final QName WSDL20 = new QName("http://www.w3.org/ns/wsdl", "description");
-
-    protected static final int BUFFER_SIZE = 256;
-
-    /**
-     * Detect the XML encoding of the document
-     * 
-     * @param is The input stream
-     * @return The encoding
-     * @throws IOException
-     */
-    public static String getEncoding(InputStream is) throws IOException {
-        if (!is.markSupported())
-            is = new BufferedInputStream(is);
-
-        byte[] buffer = readBuffer(is);
-        return getXMLEncoding(buffer);
-    }
-
-    /**
-     * Searches the array of bytes to determine the XML encoding.
-     */
-    protected static String getXMLEncoding(byte[] bytes) {
-        String javaEncoding = null;
-
-        if (bytes.length >= 4) {
-            if (((bytes[0] == -2) && (bytes[1] == -1)) || ((bytes[0] == 0) && (bytes[1] == 60)))
-                javaEncoding = "UnicodeBig";
-            else if (((bytes[0] == -1) && (bytes[1] == -2)) || ((bytes[0] == 60) && (bytes[1] == 0)))
-                javaEncoding = "UnicodeLittle";
-            else if ((bytes[0] == -17) && (bytes[1] == -69) && (bytes[2] == -65))
-                javaEncoding = "UTF8";
-        }
-
-        String header = null;
-
-        try {
-            if (javaEncoding != null)
-                header = new String(bytes, 0, bytes.length, javaEncoding);
-            else
-                header = new String(bytes, 0, bytes.length);
-        } catch (UnsupportedEncodingException e) {
-            return null;
-        }
-
-        if (!header.startsWith("<?xml"))
-            return "UTF-8";
-
-        int endOfXMLPI = header.indexOf("?>");
-        int encodingIndex = header.indexOf("encoding", 6);
-
-        if ((encodingIndex == -1) || (encodingIndex > endOfXMLPI))
-            return "UTF-8";
-
-        int firstQuoteIndex = header.indexOf("\"", encodingIndex);
-        int lastQuoteIndex;
-
-        if ((firstQuoteIndex == -1) || (firstQuoteIndex > endOfXMLPI)) {
-            firstQuoteIndex = header.indexOf("'", encodingIndex);
-            lastQuoteIndex = header.indexOf("'", firstQuoteIndex + 1);
-        } else
-            lastQuoteIndex = header.indexOf("\"", firstQuoteIndex + 1);
-
-        return header.substring(firstQuoteIndex + 1, lastQuoteIndex);
-    }
-
-    protected static byte[] readBuffer(InputStream is) throws IOException {
-        if (is.available() == 0) {
-            return new byte[0];
-        }
-
-        byte[] buffer = new byte[BUFFER_SIZE];
-        is.mark(BUFFER_SIZE);
-        int bytesRead = is.read(buffer, 0, BUFFER_SIZE);
-        int totalBytesRead = bytesRead;
-
-        while (bytesRead != -1 && (totalBytesRead < BUFFER_SIZE)) {
-            bytesRead = is.read(buffer, totalBytesRead, BUFFER_SIZE - totalBytesRead);
-
-            if (bytesRead != -1)
-                totalBytesRead += bytesRead;
-        }
-
-        if (totalBytesRead < BUFFER_SIZE) {
-            byte[] smallerBuffer = new byte[totalBytesRead];
-            System.arraycopy(buffer, 0, smallerBuffer, 0, totalBytesRead);
-            smallerBuffer = buffer;
-        }
-
-        is.reset();
-        return buffer;
-    }
-
-    public static InputSource getInputSource(URL url) throws IOException {
-        URLConnection connection = url.openConnection();
-        connection.setUseCaches(false);
-        InputStream is = connection.getInputStream();
-        return getInputSource(url, is);
-    }
-
-    public static InputSource getInputSource(URL url, InputStream is) throws IOException {
-        is = new BufferedInputStream(is);
-        String encoding = getEncoding(is);
-        InputSource inputSource = new InputSource(is);
-        inputSource.setEncoding(encoding);
-        // [rfeng] Make sure we set the system id as it will be used as the base URI for nested import/include 
-        inputSource.setSystemId(url.toString());
-        return inputSource;
-    }
-
-    private final static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-    public static String readTargetNamespace(URL doc, QName element, boolean rootOnly, String attribute)
-        throws IOException, XMLStreamException {
-        if (attribute == null) {
-            attribute = "targetNamespace";
-        }
-        URLConnection connection = doc.openConnection();
-        connection.setUseCaches(false);
-        InputStream is = connection.getInputStream();
-        try {
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-            int eventType = reader.getEventType();
-            while (true) {
-                if (eventType == XMLStreamConstants.START_ELEMENT) {
-                    if (element.equals(reader.getName())) {
-                        return reader.getAttributeValue(null, attribute);
-                    } else if (rootOnly) {
-                        return null;
-                    }
-                }
-                if (reader.hasNext()) {
-                    eventType = reader.next();
-                } else {
-                    break;
-                }
-            }
-            return null;
-        } finally {
-            is.close();
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
deleted file mode 100644
index daff7696f6..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.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.xsd.xml;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-
-/**
- * An ArtifactProcessor for XSD documents.
- * 
- * @version $Rev$ $Date$
- */
-public class XSDDocumentProcessor implements URLArtifactProcessor<XSDefinition> {
-
-    private XSDFactory factory;
-    private Monitor monitor;
-
-    public XSDDocumentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.factory = modelFactories.getFactory(XSDFactory.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 = new ProblemImpl(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex);
-            monitor.problem(problem);
-        }        
-    }
-
-    public XSDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
-        try {
-            return indexRead(artifactURL);
-        } catch (Exception e) {
-            ContributionReadException ce = new ContributionReadException(e);
-            error("ContributionReadException", artifactURL, ce);
-            throw ce;
-        }
-    }
-
-    public void resolve(XSDefinition model, ModelResolver resolver) throws ContributionResolveException {
-    }
-
-    public String getArtifactType() {
-        return ".xsd";
-    }
-
-    public Class<XSDefinition> getModelType() {
-        return XSDefinition.class;
-    }
-
-    public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema");
-
-    protected XSDefinition indexRead(URL doc) throws Exception {
-        XSDefinition xsd = factory.createXSDefinition();
-        xsd.setUnresolved(true);
-        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace"));
-        xsd.setLocation(doc.toURI());
-        xsd.setUnresolved(false);
-        return xsd;
-    }
-}
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
deleted file mode 100644
index 652d9e8d83..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.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.xsd.xml;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.DefaultImport;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionRuntimeException;
-import org.apache.tuscany.sca.xsd.DefaultXSDFactory;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.xml.sax.InputSource;
-
-/**
- * A Model Resolver for XSD models.
- * 
- * @version $Rev$ $Date$
- */
-public class XSDModelResolver implements ModelResolver {
-    private XSDFactory factory;
-    private Contribution contribution;
-    private Map<String, List<XSDefinition>> map = new HashMap<String, List<XSDefinition>>();
-    private XmlSchemaCollection schemaCollection;
-
-    public XSDModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-        this.schemaCollection = new XmlSchemaCollection();
-        schemaCollection.setSchemaResolver(new URIResolverImpl(contribution));
-        this.factory = new DefaultXSDFactory();
-    }
-
-    public void addModel(Object resolved) {
-        XSDefinition definition = (XSDefinition)resolved;
-        List<XSDefinition> list = map.get(definition.getNamespace());
-        if (list == null) {
-            list = new ArrayList<XSDefinition>();
-            map.put(definition.getNamespace(), list);
-        }
-        list.add(definition);
-    }
-
-    public Object removeModel(Object resolved) {
-        XSDefinition definition = (XSDefinition)resolved;
-        List<XSDefinition> list = map.get(definition.getNamespace());
-        if (list == null) {
-            return null;
-        } else {
-            return list.remove(definition);
-        }
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
-        XSDefinition definition = (XSDefinition)unresolved;
-        // Lookup a definition for the given namespace
-        String namespace = definition.getNamespace();
-        List<XSDefinition> list = map.get(namespace);
-        XSDefinition modelXSD = null;
-        if (list != null && definition.getDocument() != null) {
-            // Set the document for the inline schema
-            int index = list.indexOf(definition);
-            if (index != -1) {  // a matching (not identical) document was found
-                modelXSD = list.get(index);
-                modelXSD.setDocument(definition.getDocument());
-            }
-        }
-        if (list == null && definition.getDocument() != null) {
-            // Hit for the 1st time
-            list = new ArrayList<XSDefinition>();
-            list.add(definition);
-            map.put(namespace, list);
-        }
-        XSDefinition resolved = null;
-        try {
-            resolved = aggregate(list);
-        } catch (IOException e) {
-            throw new ContributionRuntimeException(e);
-        }
-        if (resolved != null && !resolved.isUnresolved()) {
-            if (definition.isUnresolved() && definition.getSchema() == null && modelXSD != null) {
-                // Update the unresolved model with schema information and mark it
-                // resolved.  This information in the unresolved model is needed when
-                // this method is called by WSDLModelResolver.readInlineSchemas().
-                definition.setSchema(modelXSD.getSchema());
-                definition.setSchemaCollection(modelXSD.getSchemaCollection());
-                definition.setUnresolved(false);
-            }
-            return modelClass.cast(resolved);
-        }
-
-        // No definition found, delegate the resolution to the imports
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                if (namespaceImport.getNamespace().equals(namespace)) {
-
-                    // Delegate the resolution to the namespace import resolver
-                    resolved =
-                        namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            } else if (import_ instanceof DefaultImport) {
-
-                // Delegate the resolution to the default import resolver
-                resolved =
-                    import_.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved);
-                if (!resolved.isUnresolved()) {
-                    return modelClass.cast(resolved);
-                }
-            }
-        }
-        return modelClass.cast(unresolved);
-    }
-
-    private void loadOnDemand(XSDefinition definition) throws IOException {
-        if (definition.getSchema() != null) {
-            return;
-        }
-        if (definition.getDocument() != null) {
-            String uri = null;
-            if (definition.getLocation() != null) {
-                uri = definition.getLocation().toString();
-            }
-            XmlSchema schema = schemaCollection.read(definition.getDocument(), uri, null);
-            definition.setSchemaCollection(schemaCollection);
-            definition.setSchema(schema);
-            definition.setUnresolved(false);
-        } else if (definition.getLocation() != null) {
-            if (definition.getLocation().getFragment() != null) {
-                // It's an inline schema
-                return;
-            }
-            // Read an XSD document
-            InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL());
-            XmlSchema schema = schemaCollection.read(xsd, null);
-            definition.setSchemaCollection(schemaCollection);
-            definition.setSchema(schema);
-        }
-    }
-
-    /**
-     * Create a facade XmlSchema which includes all the definitions
-     * 
-     * @param definitions A list of the XmlSchema under the same target
-     *                namespace
-     * @return The aggregated XmlSchema
-     */
-    private XSDefinition aggregate(List<XSDefinition> definitions) throws IOException {
-        if (definitions == null || definitions.size() == 0) {
-            return null;
-        }
-        if (definitions.size() == 1) {
-            XSDefinition d = definitions.get(0);
-            loadOnDemand(d);
-            return d;
-        }
-        XSDefinition aggregated = factory.createXSDefinition();
-        for (XSDefinition d : definitions) {
-            loadOnDemand(d);
-        }
-        String ns = definitions.get(0).getNamespace();
-        XmlSchema facade = new XmlSchema(ns, schemaCollection);
-
-        for (XmlSchema d : schemaCollection.getXmlSchemas()) {
-            if (ns.equals(d.getTargetNamespace())) {
-                XmlSchemaInclude include = new XmlSchemaInclude();
-                include.setSchema(d);
-                include.setSourceURI(d.getSourceURI());
-                include.setSchemaLocation(d.getSourceURI());
-                facade.getIncludes().add(include);
-                facade.getItems().add(include);
-            }
-        }
-        aggregated.setUnresolved(true);
-        aggregated.setSchema(facade);
-        aggregated.setNamespace(ns);
-        aggregated.setAggregatedDefinitions(definitions);
-        aggregated.setUnresolved(false);
-
-        // FIXME: [rfeng] This is hacky
-        //definitions.clear();
-        //definitions.add(aggregated);
-        return aggregated;
-    }
-
-    /**
-     * URI resolver implementation for XML schema
-     */
-    public static class URIResolverImpl implements URIResolver {
-        private Contribution contribution;
-
-        public URIResolverImpl(Contribution contribution) {
-            this.contribution = contribution;
-        }
-
-        public org.xml.sax.InputSource resolveEntity(java.lang.String targetNamespace,
-                                                     java.lang.String schemaLocation,
-                                                     java.lang.String baseUri) {
-            try {
-                if (schemaLocation == null) {
-                    return null;
-                }
-                URL url = null;
-                if (schemaLocation.startsWith("/")) {
-                    // The URI is relative to the contribution
-                    String uri = schemaLocation.substring(1);
-                    for (Artifact a : contribution.getArtifacts()) {
-                        if (a.getURI().equals(uri)) {
-                            url = new URL(a.getLocation());
-                            break;
-                        }
-                    }
-                } else {
-                    url = new URL(new URL(baseUri), schemaLocation);
-                }
-                return XMLDocumentHelper.getInputSource(url);
-            } catch (IOException e) {
-                return null;
-            }
-        }
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/tags/java/sca/1.3/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
deleted file mode 100644
index 1ec3d27200..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/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.xsd.xml.XSDDocumentProcessor;type=.xsd,model=org.apache.tuscany.sca.xsd.XSDefinition
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.3/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index a67ecf063a..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/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.xsd.xml.XSDModelResolver;model=org.apache.tuscany.sca.xsd.XSDefinition
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
deleted file mode 100644
index fbcdf3d861..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.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.xsd.xml;
-
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLDocumentHelperTestCase {
-    private URL xsd;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        xsd = getClass().getResource("/xsd/greeting.xsd");
-    }
-
-    @Test
-    public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(xsd, XMLDocumentHelper.XSD, true, null);
-        Assert.assertEquals("http://greeting", tns);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
deleted file mode 100644
index 76e6a57c29..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.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.xsd.xml;
-
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XSDDocumentProcessorTestCase {
-    private URLArtifactProcessor<Object> documentProcessor;
-    private ModelResolver resolver;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Before
-    public void setUp() throws Exception {
-        ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        resolver = new XSDModelResolver(null, modelFactories);
-    }
-
-    @Test
-    public void testXSD() throws Exception {
-        URL url = getClass().getResource("/xsd/greeting.xsd");
-        XSDefinition definition = (XSDefinition)documentProcessor.read(null, URI.create("xsd/greeting.xsd"), url);
-        Assert.assertNull(definition.getSchema());
-        Assert.assertEquals("http://greeting", definition.getNamespace());
-        URL url1 = getClass().getResource("/xsd/name.xsd");
-        XSDefinition definition1 = (XSDefinition)documentProcessor.read(null, URI.create("xsd/name.xsd"), url1);
-        Assert.assertNull(definition1.getSchema());
-        Assert.assertEquals("http://greeting", definition1.getNamespace());
-        resolver.addModel(definition);
-        XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition);
-        XmlSchemaObjectCollection collection = resolved.getSchema().getIncludes();
-        Assert.assertTrue(collection.getCount() == 1);
-        XmlSchemaType type =
-            ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
-        Assert.assertNotNull(type);
-        resolver.addModel(definition1);
-        resolved = resolver.resolveModel(XSDefinition.class, definition);
-        collection = resolved.getSchema().getIncludes();
-        Assert.assertTrue(collection.getCount() == 2);
-        XmlSchemaType type1 =
-            ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
-        XmlSchemaType type2 =
-            ((XmlSchemaInclude)collection.getItem(1)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
-        Assert.assertTrue(type1 != null || type2 != null);
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/greeting.xsd b/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
deleted file mode 100644
index 635ca25bfc..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
+++ /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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-    <include schemaLocation="name.xsd" />
-    <complexType name="Greeting">
-        <sequence>
-            <element name="message" type="string" />
-            <element name="name" type="Name" />
-        </sequence>
-    </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/name.xsd b/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/name.xsd
deleted file mode 100644
index 300de931ec..0000000000
--- a/tags/java/sca/1.3/modules/xsd-xml/src/test/resources/xsd/name.xsd
+++ /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.
--->
-<schema targetNamespace="http://greeting" xmlns="http://www.w3.org/2001/XMLSchema">
-
-    <complexType name="Name">
-        <sequence>
-            <element name="firstName" type="string" />
-            <element name="lastName" type="string" />
-        </sequence>
-    </complexType>
-
-</schema>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/modules/xsd/pom.xml b/tags/java/sca/1.3/modules/xsd/pom.xml
deleted file mode 100644
index 5c1bad7ec2..0000000000
--- a/tags/java/sca/1.3/modules/xsd/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>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-xsd</artifactId>

-    <name>Apache Tuscany SCA XSD Model</name>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-assembly</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.schema</groupId>

-            <artifactId>XmlSchema</artifactId>

-            <version>1.3.2</version>

-        </dependency>

-    </dependencies>

-

-    <repositories>

-        <!-- Apache repository for Web Services artifacts -->

-        <repository>

-            <id>apache.ws.zone</id>

-            <name>Apache WS Zone Repository</name>

-            <url>http://ws.zones.apache.org/repository2</url>

-            <releases>

-                <enabled>true</enabled>

-            </releases>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </repository>

-    </repositories>

-

-

-    <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.xsd</Bundle-SymbolicName>

-                        <Bundle-Description>${pom.name}</Bundle-Description>

-                        <Export-Package>org.apache.tuscany.sca.xsd*</Export-Package>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
deleted file mode 100644
index 92dce98fa1..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.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.xsd;
-
-import org.apache.tuscany.sca.xsd.impl.XSDFactoryImpl;
-
-/**
- * A factory for XSD definitions
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultXSDFactory extends XSDFactoryImpl implements XSDFactory {
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
deleted file mode 100644
index 08a1c8dd63..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.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.xsd;
-
-/**
- * Factory for XSD definitions
- * 
- * @version $Rev$ $Date$
- */
-public interface XSDFactory {
-    
-    /**
-     * Creates a new XML Schema definition.
-     * 
-     * @return a new XML Schema definition
-     */
-    XSDefinition createXSDefinition();
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
deleted file mode 100644
index 9a973cd095..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.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.xsd;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.w3c.dom.Document;
-
-/**
- * Represents an XML Schema definition.
- *
- * @version $Rev: 633545 $ $Date: 2008-03-04 16:52:24 +0000 (Tue, 04 Mar 2008) $
- */
-public interface XSDefinition extends Base {
-    XmlSchemaCollection getSchemaCollection();
-
-    void setSchemaCollection(XmlSchemaCollection schemaCollection);
-
-    /**
-     * Returns the XmlSchema definition model
-     * @return the XmlSchema definition model
-     */
-    XmlSchema getSchema();
-
-    /**
-     * Sets the XmlSchema definition model
-     * @param definition the XmlSchema definition model
-     */
-    void setSchema(XmlSchema definition);
-
-    /**
-     * Returns the namespace of this XmlSchema definition.
-     * @return the namespace of this XmlSchema definition
-     */
-    String getNamespace();
-
-    /**
-     * Sets the namespace of this XmlSchema definition.
-     * @param namespace the namespace of this XmlSchema definition
-     */
-    void setNamespace(String namespace);
-
-    /**
-     * Get the location of the XSD
-     * @return
-     */
-    URI getLocation();
-
-    /**
-     * Set the location of the XSD
-     * @param uri
-     */
-    void setLocation(URI uri);
-
-    /**
-     * Get the DOM representation of the XSD
-     * @return
-     */
-    Document getDocument();
-
-    /**
-     * Set the DOM representation of the XSD
-     * @param document
-     */
-    void setDocument(Document document);
-
-    /**
-     * Get an XSD element by QName
-     * @param name The element name
-     * @return The XSD element
-     */
-    XmlSchemaElement getXmlSchemaElement(QName name);
-
-    /**
-     * Get an XSD type by QName
-     * @param name The type name
-     * @return The XSD type
-     */
-    XmlSchemaType getXmlSchemaType(QName name);
-
-    /**
-     * Get the aggregated definitions for a facade XSDefinition
-     * @return The aggregated definitions, or null if not a facade
-     */
-    List<XSDefinition> getAggregatedDefinitions();
-
-    /**
-     * Set the aggregated definitions for a facade XSDefinition
-     * @param name The aggregated definitions
-     */
-    void setAggregatedDefinitions(List<XSDefinition> definitions);
-}
diff --git a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
deleted file mode 100644
index 60ff6b6fd9..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.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.xsd.impl;
-
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.tuscany.sca.xsd.XSDFactory;
-
-/**
- * A factory for XSD definitions
- * 
- * @version $Rev$ $Date$
- */
-public abstract class XSDFactoryImpl implements XSDFactory {
-    
-    public XSDefinition createXSDefinition() {
-        return new XSDefinitionImpl();
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
deleted file mode 100644
index e57cbee8b8..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.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.xsd.impl;
-
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.xsd.XSDefinition;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaImport;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaType;
-import org.w3c.dom.Document;
-
-/**
- * Represents a XML schema definition.
- *
- * @version $Rev: 582399 $ $Date: 2007-10-05 22:28:30 +0100 (Fri, 05 Oct 2007) $
- */
-public class XSDefinitionImpl implements XSDefinition {
-    private XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
-    private XmlSchema schema;
-    private String namespace;
-    private URI location;
-    private Document document;
-    private boolean unresolved;
-    private List<XSDefinition> definitions;
-
-    public XSDefinitionImpl() {
-    }
-
-    public XmlSchema getSchema() {
-        return schema;
-    }
-
-    public void setSchema(XmlSchema definition) {
-        this.schema = definition;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean undefined) {
-        this.unresolved = undefined;
-    }
-
-    public String getNamespace() {
-        if (isUnresolved()) {
-            return namespace;
-        } else if (schema != null) {
-            return schema.getTargetNamespace();
-        } else {
-            return namespace;
-        }
-    }
-
-    public void setNamespace(String namespace) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        } else {
-            this.namespace = namespace;
-        }
-    }
-
-    /**
-     * @return the location
-     */
-    public URI getLocation() {
-        return location;
-    }
-
-    /**
-     * @param location the location to set
-     */
-    public void setLocation(URI location) {
-        this.location = location;
-    }
-
-    /**
-     * @return the document
-     */
-    public Document getDocument() {
-        return document;
-    }
-
-    /**
-     * @param document the document to set
-     */
-    public void setDocument(Document document) {
-        this.document = document;
-    }
-
-    /**
-     * @return the schemaCollection
-     */
-    public XmlSchemaCollection getSchemaCollection() {
-        return schemaCollection;
-    }
-
-    /**
-     * @param schemaCollection the schemaCollection to set
-     */
-    public void setSchemaCollection(XmlSchemaCollection schemaCollection) {
-        this.schemaCollection = schemaCollection;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((location == null) ? 0 : location.hashCode());
-        result = prime * result + ((namespace == null) ? 0 : namespace.hashCode());
-        return result;
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (!(obj instanceof XSDefinitionImpl))
-            return false;
-        final XSDefinitionImpl other = (XSDefinitionImpl)obj;
-        if (location == null) {
-            if (other.location != null)
-                return false;
-        } else if (!location.equals(other.location))
-            return false;
-        if (namespace == null) {
-            if (other.namespace != null)
-                return false;
-        } else if (!namespace.equals(other.namespace))
-            return false;
-        return true;
-    }
-
-    public static <T extends XmlSchemaObject> T getXmlSchemaObject(XmlSchema schema, QName name, Class<T> type) {
-        if (schema != null) {
-            XmlSchemaObject object = null;
-            if (type == XmlSchemaElement.class) {
-                object = schema.getElementByName(name);
-            } else if (type == XmlSchemaType.class) {
-                object = schema.getTypeByName(name);
-            }
-            if (object != null) {
-                return type.cast(object);
-            }
-            for (Iterator i = schema.getIncludes().getIterator(); i.hasNext();) {
-                XmlSchemaObject obj = (XmlSchemaObject)i.next();
-                XmlSchema ext = null;
-                if (obj instanceof XmlSchemaInclude) {
-                    ext = ((XmlSchemaInclude)obj).getSchema();
-                }
-                if (obj instanceof XmlSchemaImport) {
-                    ext = ((XmlSchemaImport)obj).getSchema();
-                }
-                object = getXmlSchemaObject(ext, name, type);
-                if (object != null) {
-                    return type.cast(object);
-                }
-            }
-        }
-        return null;
-    }
-
-    public XmlSchemaElement getXmlSchemaElement(QName name) {
-        if (schema != null) {
-            XmlSchemaElement element = getXmlSchemaObject(schema, name, XmlSchemaElement.class);
-            if (element != null) {
-                return element;
-            }
-        }
-
-        if (schemaCollection != null) {
-            return schemaCollection.getElementByQName(name);
-        }
-        return null;
-    }
-
-    public XmlSchemaType getXmlSchemaType(QName name) {
-        if (schema != null) {
-            XmlSchemaType type = getXmlSchemaObject(schema, name, XmlSchemaType.class);
-            if (type != null) {
-                return type;
-            }
-        }
-        if (schemaCollection != null) {
-            return schemaCollection.getTypeByQName(name);
-        }
-        return null;
-    }
- 
-    public List<XSDefinition> getAggregatedDefinitions() {
-        return definitions;
-    }
-
-    public void setAggregatedDefinitions(List<XSDefinition> definitions) {
-        this.definitions = definitions;
-    }
-
-}
diff --git a/tags/java/sca/1.3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/tags/java/sca/1.3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
deleted file mode 100644
index ca06127c06..0000000000
--- a/tags/java/sca/1.3/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
+++ /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.xsd.DefaultXSDFactory
\ No newline at end of file
diff --git a/tags/java/sca/1.3/pom.xml b/tags/java/sca/1.3/pom.xml
deleted file mode 100644
index 6c41959758..0000000000
--- a/tags/java/sca/1.3/pom.xml
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>4</version>
-    </parent>
-
-    <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-sca</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Implementation Project</name>
-    <url>http://incubator.apache.org/tuscany/</url>
-    <version>1.3</version>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/java/sca</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tuscany/java/sca</developerConnection>
-        <url>http://svn.apache.org/repos/asf/tuscany/java/sca</url>
-    </scm>
-
-    <prerequisites>
-        <maven>2.0.6</maven>
-    </prerequisites>
-
-    <properties>
-        <notice.dir>.</notice.dir>
-    </properties>
-
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/TUSCANY</url>
-    </issueManagement>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-       <!-- Apache SNAPSHOT repository for unreleased artifacts -->
-       <repository>
-            <id>apache.snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
-        </repository>
-        <repository>
-            <id>osuosl.org</id>
-            <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url>
-        </repository>        
-    </repositories>
-
-    <pluginRepositories>
-        <!-- Apache repository for artifacts released by Apache TLP projects -->
-        <pluginRepository>
-            <id>apache</id>
-            <name>Apache Repository</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Apache Incubator repository for artifacts released by Incubator projects -->
-        <pluginRepository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Apache SNAPSHOT repository for unreleased artifacts -->
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Codehaus SNAPSHOT repository -->
-        <pluginRepository>
-            <id>codehaus-snapshot</id>
-            <name>Codehaus Snapshot Repository</name>
-            <url>http://snapshots.repository.codehaus.org</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <distributionManagement>
-        <repository>
-            <id>apache.releases</id>
-            <name>Apache Release Distribution Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </repository>
-        <snapshotRepository>
-            <id>apache.snapshots</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>modules</module>
-                <module>tools</module>
-                <module>samples</module>
-                <module>itest</module>
-                <module>vtest</module>
-                <module>tutorial</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>distribution</id>
-            <modules>
-                <module>modules</module>
-                <module>tools</module>
-                <module>samples</module>
-                <module>itest</module>
-                <module>vtest</module>
-                <module>tutorial</module>
-                <module>demos</module>
-                <module>distribution</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>sources</id>
-            <modules>
-                <module>modules</module>
-                <module>tools</module>
-                <module>samples</module>
-                <module>itest</module>
-                <module>vtest</module>
-                <module>tutorial</module>
-            </modules>
-            <properties>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>         
-            </build>
-        </profile>
-
-        <profile>
-            <id>eclipse</id>
-            <properties>
-                <notice.dir>src/main/resources</notice.dir>
-            </properties>
-            <modules>
-                <module>modules</module>
-                <module>tools</module>
-                <module>samples</module>
-                <module>itest</module>
-                <module>vtest</module>
-                <module>tutorial</module>
-                <module>demos</module>
-                <module>distribution</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>dependencies</id>
-            <modules>
-                <module>modules</module>
-                <module>samples</module>
-                <module>tutorial</module>
-                <module>demos</module>
-            </modules>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-dependency-lister</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>           
-                </plugins>         
-            </build>
-        </profile>
-        
-        <profile>
-            <id>security</id>
-            <modules>
-                <!-- <module>demos</module> -->
-                <module>itest</module>
-                <module>vtest</module>
-            </modules>
-            <activation>
-                <property>
-                    <name>tuscany.policy.file</name>
-                </property>
-            </activation>
-            <properties>
-                <tuscany.policy.file>file:///${java.home}/lib/security/tuscany.policy</tuscany.policy.file>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <configuration>
-                            <includes>
-                                <include>**/*TestCase.java</include>
-                            </includes>
-                            <reportFormat>brief</reportFormat>
-                            <useFile>false</useFile>
-                            <forkMode>once</forkMode>
-                            <!-- Place tuscany.policy in your Java home security directory. Alternatively, hardcode the file location here. -->
-                            <argLine>-Djava.security.manager -Djava.security.policy=${tuscany.policy.file} -Dpolicy.allowSystemProperty=true -Djava.security.debug=policy</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>         
-            </build>
-        </profile>
-
-        <!-- profile for verifying source code correctness -->
-        <profile>
-            <id>sourcecheck</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-pmd-plugin</artifactId>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>1.5</source>
-                            <target>1.5</target>
-                            <showDeprecation>true</showDeprecation>
-                            <compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally</compilerArgument>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
- 
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${notice.dir}</directory>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <pluginManagement>
-            <plugins>
-
-                <!-- compiler plugin configuration -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-<!--                        <compilerId>eclipse</compilerId> -->
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-<!--
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-compiler-eclipse</artifactId>
-                        </dependency>
-                    </dependencies>
--->
-                </plugin>
-
-                <!-- surefire plugin configuration -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3.1</version>
-                    <configuration>
-                        <includes>
-                            <include>**/*TestCase.java</include>
-                        </includes>
-                        <reportFormat>brief</reportFormat>
-                        <useFile>false</useFile>
-                        <forkMode>once</forkMode>
-                        <argLine>-ea -Xmx256m</argLine>
-                    </configuration>
-                </plugin>
-
-                <!-- jar plugin configuration -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Extension-Name>${project.artifactId}</Extension-Name>
-                                <Specification-Title>${name}</Specification-Title>
-                                <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                                <Specification-Version>${version}</Specification-Version>
-                                <Implementation-Title>${name}</Implementation-Title>
-                                <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                                <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
-                                <Implementation-Version>${version}</Implementation-Version>
-                            </manifestEntries>
-                         </archive>
-                    </configuration>
-                </plugin>
-
-                <!-- code coverage check plugin configuration -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clover-plugin</artifactId>
-                    <configuration>
-                        <jdk>1.5</jdk>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/samples/README b/tags/java/sca/1.3/samples/README
deleted file mode 100644
index 2646fbb73a..0000000000
--- a/tags/java/sca/1.3/samples/README
+++ /dev/null
@@ -1,306 +0,0 @@
-The Apache Tuscany SCA Samples
-==============================
-The Apache Tuscany SCA samples are built as part of the main Maven build and 
-run, using the provided JUnit test cases, as tests in the Maven build.
-
-In the binary distribution of Apache Tuscany most samples can also 
-be run using the provided Ant build.xml files. These show the samples running 
-from a simple main() method without the need for a JUnit test case. 
-
-In these notes text that appears in angled brackets like this <example> means 
-that you need to make a choice and provide your own text at that point. 
-
-These simple samples have been created with the intention of illustrating the 
-usage of the SCA API and annotations and certainly not to levels of SCA component 
-abstraction.  In real life situations you should use SCA to assemble real and 
-usually bigger components, and when you do that you'll get all the benefits of 
-SCA, bindings, policies, integration in an SOA environment etc..
-
-Sample Overview
----------------
-The samples generally show off different features of the SCA runtime
-and the extensions that come packaged with it.
-
-binding-notification-broker        - A broker for notificatione
-binding-notification-consumer      - A consumer of notifications
-binding-notification-producer      - A producer of notifications
-
-calculator                         - Calculator built with java components and 
-                                     local wires. 
-calculator-distributed             - A calculator built using SCA nodes running 
-                                     on multiple JVMs
-calculator-implementation-policies - Shows logging policites associated with 
-                                     SCA implementations
-calculator-rmi-reference           - The calculator configured to talk RMI to
-                                     the calculator-rmi-service sample
-calculator-rmi-service             - The calculator configured to accept RMI
-                                     requests from calculator-rmi-reference
-calculator-script                  - Calculator built using various script languages
-calculator-webapp                  - Calculator running inside a web app
-calculator-ws-webapp               - Calculator running inside a web app also 
-                                     showing webservices binding
-
-callbck-ws-client                  - The client for showing callbacks across web services
-callback-ws-service                - The server for showing callbacks across web serviced
-
-chat-webapp                        - A simple chat style web app demonstrating
-                                     use of AJAX binding
-
-databinding-echo                   - An SCA application that shows how databindings 
-                                     transform data
-                    
-feed-aggregator                    - Demonstrates using the ATOM binding
-feed-aggregator-webapp             - feed-aggregator running in webapp
-
-helloworld-bpel                    - Demonstrates an SCA component invoking a BPEL 
-                                     process in a composition
-
-helloworld-dojo-webapp             - An SCA application that exposes a service using 
-                                     JSONRPC and a client using the Dojo toolkit
-helloworld-jsonrpc-webapp          - helloworld using jsonrpc binding
-helloworld-ws-reference            - The client side of a hello world sample that uses a 
-                                     web service binding (requires helloworld-ws-service)
-helloworld-ws-service              - The server side of a hello world sample that uses a 
-                                     web service binding
-helloworld-ws-reference-jms        - The client side of a hello world sample that uses a 
-                                     web service binding with SOAP/JMS (requires 
-                                     helloworld-ws-service)
-helloworld-ws-service-jms          - The server side of a hello world sample that 
-                                     uses a web service binding with SOAP/JMS
-helloworld-ws-reference-secure     - The client side of a hello world sample that 
-                                     shows how policy intent can be used.
-helloworld-ws-service-secure       - The client side of a hello world sample that 
-                                     shows how policy intent can be used.
-helloworld-ws-sdo                  - helloworld using ws binding and SDO
-helloworld-ws-sdo-webapp           - helloworld using ws binding and SDO within a webapp
-
-implementation-composite           - Shows how SCA composites are used 
-                     
-osgi-supplychain                   - SCA asynchronous API with OSGi and Java 
-                                     implementation types
-
-simple-bigbank                     - A banking application built with java components 
-                                     and local wire
-simple-bigbank-spring              - A banking application showing how SCA works with Spring
-
-simple-callback                    - demonstrates the callback interface
-simple-callback-ws                 - demonstrates use of callback interface across WS binding
-
-store                              - Step by step guide for creating an online store
-
-supplychain                        - shows how asynchronous callbacks can be used
-
-web-resource                       - Demonstrates using an SCA Web resource component
-
-quote-xquery                       - Demonstrate SCA components using XQuery
-
-Samples for building extensions
--------------------------------
-There are samples that demonstrate how to build extensions for the 
-Tuscany SCA runtime. These samples are slightly different from the samples
-above in that the provided code is concerned with building the extension
-and not with building an application that uses it. The application
-that shows how the new extension can be used is provided in an associated
-sample. 
-
-implementation-crud-extension - Shows how to build new implementation type 
-                                extensions
-implementation-crud        - A sample application that exercises the new 
-                             implementation extensions
-binding-echo-extension     - Shows how to build new binding extensions
-binding-echo               - A sample application that exercises the new 
-                             binding extension
-implementation-notifiaction- Illustrates the use of <implementation.notification/>
-implementation-pojo-extension - shows how new implementation types are constructed 
-
-Sample Layout
--------------
-All sample directories are organized in the same way based on the default 
-project template provided by Maven. For example, take a look at the calculator 
-sample;
-
-calculator/        
-  src/              - Holds all of the source files for the sample
-    main/           - Groups together the files that implement the sample 
-      java/         - Java source files
-      resources/    - Non java resource files such as composte files
-    test/           - Groups together files that provide sample tests
-      java          - Java test sources files. Usually JUnit test cases
-  target/           - Holds the files generated when the sample is built
-    classes/        - For example, Java class files
-    test-classes/   - classes from src/test and other test files
-
-Getting Ready To Build
-----------------------
-You will need to install the following software before you start. 
-
-J2SE Development Kit (JDK) 5.0
-Apache Ant 1.7.0                - if you are going to use Ant 
-Apache Maven 2.0.6              - if you are going to use Maven
-
-Java and Ant and/or Maven binary directories must be present in your PATH so 
-that their executable programs are available in your environment. You may 
-find it useful to use a script to set up your environment, for example;
-
-For UNIX:
-  JAVA_HOME=/<installation_directory>
-  ANT_HOME=/<installation_directory>/apache-ant-1.7.0
-  MAVEN_HOME=/<installation_directory>/maven-2.0.6
-  export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$MAVEN_HOME/bin:$PATH
-
-For Windows:
-  set JAVA_HOME=C:\<installation_directory>
-  set ANT_HOME=C:\<installation_directory>\apache-ant-1.7.0
-  set MAVEN_HOME=C:\<installation_directory>\maven-2.0.6
-  set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%MAVEN_HOME%\bin;%PATH%
-
-
-Building And Running The SCA Samples Using Ant
-----------------------------------------------
-The build.xml files provided with the Apache Tuscany SCA samples are designed 
-to work with the binary distribution. They rely on the tuscany-sca-manifest.jar
-to describe the class path and this jar is only provided as part of the 
-binary distribution.
-
-The binary distribution of SCA also includes precompiled versions of each sample. 
-If you look in the target directory of each sample you will see this jar file. To
-run a sample based on all of the precompiled artifacts all you have to do is:
-
-cd <sampledir>
-ant run
-
-Check each <sampledir>/README file as some samples require that two progams are
-run to get the desired result, for example, the two samples that show how
-to build extensions are run from their associated application samples. 
-
-If you want to rebuild a sample, for example, if you have changed it, do the
-following:
-
-cd <sampledir>
-ant compile
-
-Once the sample is built you have the option of running the sample in whatever 
-way best suits you. Two alternatives are provided in the ant build files.
-
-The compile target builds the class files and then builds the jar so you can use 
-the same command as before:
-
-ant run
-
-This will use the generated jar to run the samples. The command line version of
-this is:
-
-on Windows
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\<sample jar file> <sample runnable class>
-
-for example : java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
-
-on *nix 
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/<sample jar file> <sample runnable class>
-
-for example : java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-
-You can use the compiled classes directly using
-
-ant run-classes
-
-The command line version of this is:
-
-on Windows
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes <sample runnable class>
-
-for example : java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes calculator.CalculatorClient
-
-on *nix 
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/classes <sample runnable class>
-
-for example : java -cp ../../lib/tuscany-sca-manifest.jar:target/classes calculator.CalculatorClient
-
-The class specified on the command of course depends on which sample you want to 
-run. In the examples we have used we are running the CalculatorClient from the calculator sample. 
-
-
-Building And Running The SCA Samples Using Maven
-------------------------------------------------
-
-The Maven build process will work from both source and binary distributions. 
-To build and test all of the Apache Tuscany SCA sources, including the samples,
-do the following.
-
-cd sca
-mvn
-
-This will take a little while to complete. Experience with Maven tells us that 
-sometimes there are problems downloading the dependencies that Apache Tuscany 
-SCA requires. If Maven reports that it cannot download required dependencies 
-try running the Maven build again. 
-
-Once you have all of the source built you can build and run each sample 
-independently if required.
-
-cd <sampledir>
-mvn
-
-When using Maven the samples are run within JUnit test cases and so you will 
-sometimes not see any test output. You will always see an indication of test 
-success or failure. 
-
-Using The Samples In An IDE
----------------------------------------------
-The easiest way to use the samples in an IDE is to use Maven to generate all 
-of the IDE project files for you automatically. This works best if you 
-generate IDE projects for all of the Apache Tuscany modules. You can then 
-include the ones you are interested in working with in you IDE. 
-
-To build IDE project files for all of the modules in Apache Tuscany SCA;
-
-cd sca 
-
-If you are an Eclipse user do the following
-
-mvn -Peclipse eclipse:eclipse  
-
-If you are an IDEA user do the following 
-
-mvn idea:idea
-
-These commands generate project files for each module in Apache Tuscany SCA. 
-The modules you are interested in can now be included in your IDE, for example,
-in Eclipse, if you create a new Java project and use the option to "create a 
-new project from existing source" you can specify an SCA module directory, 
-which includes the generated project files, and Eclipse will treat it like any
-other Java project. 
-
-Using The Samples In An IDE Without Maven
------------------------------------------
-We don't provide any IDE project files with our distributions so you will have to 
-import the sample files into your IDE manually. Here's an example of how it can be 
-done using Eclipse.
- 
-In a new or existing workspace
-    Create a new java project to represent the sample you want to work on, e.g.
-        calculator
-    Import all of the sample code and resources into this project, e.g.
-        File, Import and then select tuscany-sca-1.0-incubating\samples\calculator from the filesystem
-    Configure the source path to include
-        src/main/java
-        src/main/resources
-    Configure the output folder to be
-        calculator/target
-    Configure the build path to include all of the jars provided in
-        lib
-     If you select calculator.CalculatorClient.java and run as "Java Application" you should see
-        3 + 2=5.0
-        3 - 2=1.0
-        3 * 2=6.0
-        3 / 2=1.5
-
-The details of how to do this for other development environments will
-vary but the process will be similar. 
-
-
diff --git a/tags/java/sca/1.3/samples/binding-echo-extension/README b/tags/java/sca/1.3/samples/binding-echo-extension/README
deleted file mode 100644
index 94716b151f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/build.xml b/tags/java/sca/1.3/samples/binding-echo-extension/build.xml
deleted file mode 100644
index 5df5981bea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/pom.xml b/tags/java/sca/1.3/samples/binding-echo-extension/pom.xml
deleted file mode 100644
index e5d81e86b5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
deleted file mode 100644
index 3fe1598e0d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
deleted file mode 100644
index 0f6fee82be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
deleted file mode 100644
index af759dbf93..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
deleted file mode 100644
index 19c9271bb8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
deleted file mode 100644
index 45fdb73f67..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
deleted file mode 100644
index 91697fcd9a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
deleted file mode 100644
index 4877bade7f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
deleted file mode 100644
index ba74d8f99a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
deleted file mode 100644
index 0efc319af9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
deleted file mode 100644
index 1cd1e5af4e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
deleted file mode 100644
index 33dc761aa4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
deleted file mode 100644
index c847d088a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
deleted file mode 100644
index 7d38e3b7a8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
deleted file mode 100644
index 72b8002238..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
deleted file mode 100644
index deda8d9744..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
deleted file mode 100644
index ffadfc7fff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
deleted file mode 100644
index 6fa5f26977..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
deleted file mode 100644
index cf55b36fc2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
deleted file mode 100644
index ac610cfb51..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
deleted file mode 100644
index fcb250b444..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
deleted file mode 100644
index 8ea2395d04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
deleted file mode 100644
index 32336dd94f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
deleted file mode 100644
index 55be293862..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index efa475ef92..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/tags/java/sca/1.3/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
deleted file mode 100644
index 9b64df4871..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/Echo.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
deleted file mode 100644
index ba68dfe908..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
deleted file mode 100644
index 7383077f18..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
deleted file mode 100644
index ab05516622..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
deleted file mode 100644
index 176d67cc4b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo-extension/src/test/resources/definitions.xml b/tags/java/sca/1.3/samples/binding-echo-extension/src/test/resources/definitions.xml
deleted file mode 100644
index 155e175a31..0000000000
--- a/tags/java/sca/1.3/samples/binding-echo-extension/src/test/resources/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.    

--->

-<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="sca:confidentiality"

-       appliesTo="e:binding.echo"

-       >

-        <p:echoBindingPolicy name="Encryption" strategy="echo.provider.policy.ReverseEncryptionStrategy" />

-    </sca:policySet>

-</sca:definitions>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/samples/binding-echo/README b/tags/java/sca/1.3/samples/binding-echo/README
deleted file mode 100644
index 2772460cc6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/binding-echo.png b/tags/java/sca/1.3/samples/binding-echo/binding-echo.png
deleted file mode 100644
index a38d985363..0000000000
--- a/tags/java/sca/1.3/samples/binding-echo/binding-echo.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/binding-echo/binding-echo.svg b/tags/java/sca/1.3/samples/binding-echo/binding-echo.svg
deleted file mode 100644
index 5b5051bef5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/build.xml b/tags/java/sca/1.3/samples/binding-echo/build.xml
deleted file mode 100644
index 7689ef3a54..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/pom.xml b/tags/java/sca/1.3/samples/binding-echo/pom.xml
deleted file mode 100644
index b8903408e7..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-binding-echo-extension</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/Echo.java b/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
deleted file mode 100644
index 21bdff4011..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/tags/java/sca/1.3/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
deleted file mode 100644
index ba68dfe908..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-echo/src/main/resources/EchoBinding.composite b/tags/java/sca/1.3/samples/binding-echo/src/main/resources/EchoBinding.composite
deleted file mode 100644
index 94612fb325..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/tags/java/sca/1.3/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
deleted file mode 100644
index 1a597fc80f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/README b/tags/java/sca/1.3/samples/binding-notification-broker/README
deleted file mode 100644
index e47f12cb20..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-broker/README
+++ /dev/null
@@ -1,110 +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, first set the

-following environment variables:

-

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

-

-Then navigate to this sample directory and do:

-

-java -Dnotification.httpPort=8080 -cp "target\sample-binding-notification-broker.jar;%TUSCANY_SCA_MANIFEST_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

-  pom.xml                                          - the Maven build file        

diff --git a/tags/java/sca/1.3/samples/binding-notification-broker/binding-notification-broker.png b/tags/java/sca/1.3/samples/binding-notification-broker/binding-notification-broker.png
deleted file mode 100644
index 49030650f2..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-broker/binding-notification-broker.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/binding-notification-broker/build.xml b/tags/java/sca/1.3/samples/binding-notification-broker/build.xml
deleted file mode 100644
index a042b9036a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/pom.xml b/tags/java/sca/1.3/samples/binding-notification-broker/pom.xml
deleted file mode 100644
index ea378a4801..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-broker/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>1.3</version>

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

-    </parent>

-    <artifactId>sample-binding-notification-broker</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Broker Sample</name>

-    <version>1.3</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-databinding</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        <!-- test dependencies -->

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>  

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>     

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
deleted file mode 100644
index 35fa1a9ee9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
deleted file mode 100644
index d5bc8fbb50..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
deleted file mode 100644
index cd3befe076..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;

-import org.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
deleted file mode 100644
index 8caefaf1d2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
deleted file mode 100644
index b0f0d2a800..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index f490c34ea6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/tags/java/sca/1.3/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/README b/tags/java/sca/1.3/samples/binding-notification-consumer/README
deleted file mode 100644
index 0fdfa8461a..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-consumer/README
+++ /dev/null
@@ -1,102 +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, first set the

-following environment variables:

-

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

-

-Then navigate to this sample directory and do:

-

-java -Dnotification.httpPort=8082 -cp "target\sample-binding-notification-consumer.jar;%TUSCANY_SCA_MANIFEST_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

-  pom.xml                                          - the Maven build file        

diff --git a/tags/java/sca/1.3/samples/binding-notification-consumer/binding-notification-consumer.png b/tags/java/sca/1.3/samples/binding-notification-consumer/binding-notification-consumer.png
deleted file mode 100644
index 33e1966c3e..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-consumer/binding-notification-consumer.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/binding-notification-consumer/build.xml b/tags/java/sca/1.3/samples/binding-notification-consumer/build.xml
deleted file mode 100644
index f57fe1bb26..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/pom.xml b/tags/java/sca/1.3/samples/binding-notification-consumer/pom.xml
deleted file mode 100644
index fe57223c4c..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-consumer/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-sca</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>sample-binding-notification-consumer</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Consumer Sample</name>

-    <version>1.3</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-interface-java-xml</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <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/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
deleted file mode 100644
index 0efd1195bc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
deleted file mode 100644
index f6c27a2f55..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;

-import org.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
deleted file mode 100644
index c53adb1944..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 8f9bcc4438..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/tags/java/sca/1.3/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/tags/java/sca/1.3/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index c5318f405c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/README b/tags/java/sca/1.3/samples/binding-notification-producer/README
deleted file mode 100644
index 58611f64bd..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-producer/README
+++ /dev/null
@@ -1,131 +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, first set the

-following environment variables:

-

-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>

-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar

-

-Then navigate to this sample directory and do:

-

-java -Dnotification.httpPort=8083 -cp "target\sample-binding-notification-producer.jar;%TUSCANY_SCA_MANIFEST_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

-  pom.xml                                          - the Maven build file        

diff --git a/tags/java/sca/1.3/samples/binding-notification-producer/binding-notification-producer.png b/tags/java/sca/1.3/samples/binding-notification-producer/binding-notification-producer.png
deleted file mode 100644
index 34c347c893..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-producer/binding-notification-producer.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/binding-notification-producer/build.xml b/tags/java/sca/1.3/samples/binding-notification-producer/build.xml
deleted file mode 100644
index d13e4c8a6c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/pom.xml b/tags/java/sca/1.3/samples/binding-notification-producer/pom.xml
deleted file mode 100644
index 027c3c44a5..0000000000
--- a/tags/java/sca/1.3/samples/binding-notification-producer/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>1.3</version>

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

-    </parent>

-    <artifactId>sample-binding-notification-producer</artifactId>

-    <name>Apache Tuscany SCA Notification Binding Producer Sample</name>

-    <version>1.3</version>

-    <description>A sample illustrating use of binding.notification</description>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-notification</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-interface-wsdl-xml</artifactId>

-            <version>1.3</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>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
deleted file mode 100644
index be80e71249..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
deleted file mode 100644
index 39f06d5dde..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
deleted file mode 100644
index 7d49b00607..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
deleted file mode 100644
index efd3657dc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 2db6ea655b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/tags/java/sca/1.3/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/tags/java/sca/1.3/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index d3901ee407..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/README b/tags/java/sca/1.3/samples/calculator-distributed/README
deleted file mode 100644
index 51f4b07e81..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/build.xml b/tags/java/sca/1.3/samples/calculator-distributed/build.xml
deleted file mode 100644
index 855c70cb46..0000000000
--- a/tags/java/sca/1.3/samples/calculator-distributed/build.xml
+++ /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.    
--->
-<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.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.3.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.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.3.jar"/>
-            </classpath>    	        	
-        </java>
-    </target>
-	
-    <target name="runNodeA">
-        <java classname="node.LaunchCalculatorNodeA"
-              fork="true">
-            <classpath>
-            	<pathelement location="../../lib/jaxb-api-2.1.jar"/>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.3.jar"/>
-            </classpath>     	        	
-        </java>
-    </target>
-	
-    <target name="runNodeB">
-        <java classname="node.LaunchCalculatorNodeB"
-              fork="true">
-            <classpath>
-            	<pathelement location="../../lib/jaxb-api-2.1.jar"/>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.3.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="runNodeC">
-        <java classname="node.LaunchCalculatorNodeC"
-              fork="true">
-            <classpath>
-            	<pathelement location="../../lib/jaxb-api-2.1.jar"/>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../modules/tuscany-sca-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-api-1.3.jar"/>
-            	<pathelement location="../../modules/tuscany-node2-launcher-1.3.jar"/>
-            </classpath>      	
-        </java>
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>	
-	
-	
-</project>
diff --git a/tags/java/sca/1.3/samples/calculator-distributed/calculator-distributed.png b/tags/java/sca/1.3/samples/calculator-distributed/calculator-distributed.png
deleted file mode 100644
index 7c0e175664..0000000000
--- a/tags/java/sca/1.3/samples/calculator-distributed/calculator-distributed.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-distributed/calculator-distributed.svg b/tags/java/sca/1.3/samples/calculator-distributed/calculator-distributed.svg
deleted file mode 100644
index be5a4b8185..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/cloud.composite b/tags/java/sca/1.3/samples/calculator-distributed/cloud.composite
deleted file mode 100644
index 85e2f9c7f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/domain.composite b/tags/java/sca/1.3/samples/calculator-distributed/domain.composite
deleted file mode 100644
index 643e22d0cf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/pom.xml b/tags/java/sca/1.3/samples/calculator-distributed/pom.xml
deleted file mode 100644
index 1569d072de..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>                                        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</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>1.3</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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
deleted file mode 100644
index b61d1da85d..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;
-import org.apache.tuscany.sca.node.launcher.NodeLauncher;
-import org.osoa.sca.ServiceRuntimeException;
-
-import calculator.CalculatorService;
-
-public class LaunchCalculatorNodeA {
-    public static void main(String[] args) throws Exception {
-        
-        SCANode2 node = null;
-        try {
-            
-            NodeLauncher nodeLauncher = NodeLauncher.newInstance();
-            node = nodeLauncher.createNode("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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
deleted file mode 100644
index 50600eaedc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
deleted file mode 100644
index 95d8934665..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/tags/java/sca/1.3/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
deleted file mode 100644
index 8b4fe566a1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
deleted file mode 100644
index ed7fe55abc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
deleted file mode 100644
index 8f29cc17aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
deleted file mode 100644
index 9ad132b0d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 172676a3c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 1b1c0291e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index b770dbe8d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 6c0ffe4ac0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index 66caf0d17b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 8c311553c3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/tags/java/sca/1.3/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
deleted file mode 100644
index 9c3f06ee53..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-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 SCANode2 manager;

-    private static SCANode2 nodeA;

-    private static SCANode2 nodeB;

-    private static SCANode2 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();

-            

-            SCANode2Factory nodeFactory = SCANode2Factory.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/tags/java/sca/1.3/samples/calculator-distributed/workspace.xml b/tags/java/sca/1.3/samples/calculator-distributed/workspace.xml
deleted file mode 100644
index 7d6d3dbdbd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/README b/tags/java/sca/1.3/samples/calculator-implementation-policies/README
deleted file mode 100644
index bd66eee1c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/build.xml b/tags/java/sca/1.3/samples/calculator-implementation-policies/build.xml
deleted file mode 100644
index 7afa23a07f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/calculator.png b/tags/java/sca/1.3/samples/calculator-implementation-policies/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/tags/java/sca/1.3/samples/calculator-implementation-policies/calculator.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-implementation-policies/calculator.svg b/tags/java/sca/1.3/samples/calculator-implementation-policies/calculator.svg
deleted file mode 100644
index af34f07e04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/pom.xml b/tags/java/sca/1.3/samples/calculator-implementation-policies/pom.xml
deleted file mode 100644
index 1a8e4f572c..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-policy-logging</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-policy-security</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
deleted file mode 100644
index 5a1e7a638a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index caf4d358df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 2bce187049..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ae4ed12b7b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ef6a8b375b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index cd91935f08..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c85357fcd8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 56ee372fc4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1b669084d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
deleted file mode 100644
index b48fb90148..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
deleted file mode 100644
index fe4097640b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
deleted file mode 100644
index 595626e672..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
deleted file mode 100644
index d91bf88d96..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
deleted file mode 100644
index 0e7cb86633..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
deleted file mode 100644
index f62125eaa9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/main/resources/definitions.xml
deleted file mode 100644
index 6cccde0d13..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 157570c3df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-rmi-reference/README b/tags/java/sca/1.3/samples/calculator-rmi-reference/README
deleted file mode 100644
index 837b5ce75f..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/README
+++ /dev/null
@@ -1,138 +0,0 @@
-Calculator RMI Reference Sample
-===============================
-
-This sample illustrates the use of Tuscany RMI Binding to call reference 
-services that are hosted as Java RMI services.  
-
-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, first 
-navigate to the calculator-rmi-service sample and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-Now you have the server running you need to open another 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-rmi-reference.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local wired 
-connections with RMI bindings. Instead of local add, subtract, multiply and 
-divide components, an RMI service implementation now provides the
-add, subtract, multiply and divide interfaces and is hosted as an RMI server. 
-References specified in the .composite file include an RMI binding which targets
-this RMI server.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-rmi-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 RMI service
-                                    that provides the target for the 
-                                    RMI bindings in the composite 
-      resources/
-        CalculatorRMIReference.composite - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorRMIReferenceTestCase.java - JUnit test case
-          CalculatorRMIServiceImpl.java - test RMI service to call
-  calculator-rmi-reference.png    - a pictorial representation of the 
-                                    .composite file
-  build.xml                       - the Ant build file for the client
-  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 Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. 
-
-The server provides an RMI server that the acts as a target for the SCA RMI 
-bindings. Start a new console and use the following commands.
-
-cd calculator-rmi-service
-ant compile
-ant run
-
-This will run up the server and display the following.
-
-run:
-     [java] Starting of the SCA Calculator Application exposed as RMI Services... 
-     [java] ...Press Enter to Exit...
-     
-The client is very similar to the calculator sample. It starts the SCA runtime
-and calls each of the calculator operations. In doing this the RMI bindings
-make calls out to the RMI server you started in the previous step. Start
-a new console and use the following commands. 
-
-cd calculator-rmi-reference
-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
-     
-If you now return to the console window running the server and press enter the 
-server should stop.     
-
-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-rmi-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorRMIReferenceTestCase
-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/tags/java/sca/1.3/samples/calculator-rmi-reference/build.xml b/tags/java/sca/1.3/samples/calculator-rmi-reference/build.xml
deleted file mode 100644
index ca75625b42..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/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="calculator-rmi-reference" default="compile">

-    <property name="test.class"   value="calculator.CalculatorClient" />

-    <property name="test.jar"     value="sample-calculator-rmi-reference.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/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.png b/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.png
deleted file mode 100644
index 8c76b77a9f..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
deleted file mode 100644
index ba802e6717..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ /dev/null
@@ -1,412 +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-rmi-reference"
-   sodipodi:docname="calculator-rmi-reference.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-reference\calculator-rmi-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="553.58838"
-     inkscape:cy="368.42498"
-     inkscape:document-units="px"
-     inkscape:current-layer="g2997"
-     inkscape:window-width="1134"
-     inkscape:window-height="721"
-     inkscape:window-x="1"
-     inkscape:window-y="105" />
-  <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.679966,0,0,1.144214,82.34853,-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:2.2674253;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="matrix(1.365843,0,0,1,-103.2086,0)"><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="773.32635"
-       y="331.87738"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(498.7355,125.2248)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Calculator</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">RMI</flowPara><flowPara
-         id="flowPara2004">Impl</flowPara></flowRoot>    <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 567.77069,220.86752 L 630.65876,220.86752 L 642.09292,246.48812 L 628.75306,270.13795 L 567.77069,270.13795 L 582.06342,246.48812 L 567.77069,220.86752 z "
-       id="path1913" />
-    <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" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1950"
-       transform="translate(301.0221,17.10977)"
-       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="flowRegion1952"><rect
-           id="rect1954"
-           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="flowPara1958">Add</flowPara><flowPara
-         id="flowPara1962">Reference</flowPara></flowRoot>    <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 567.83889,304.45927 L 630.72696,304.45927 L 642.16112,330.07987 L 628.82126,353.7297 L 567.83889,353.7297 L 582.13162,330.07987 L 567.83889,304.45927 z "
-       id="path1964" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1966"
-       transform="translate(301.0903,100.7015)"
-       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="flowRegion1968"><rect
-           id="rect1970"
-           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="flowPara1972">Subtract</flowPara><flowPara
-         id="flowPara1974">Reference</flowPara></flowRoot>    <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 567.1246,382.31641 L 630.01267,382.31641 L 641.44683,407.93701 L 628.10697,431.58684 L 567.1246,431.58684 L 581.41733,407.93701 L 567.1246,382.31641 z "
-       id="path1976" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1978"
-       transform="translate(300.376,178.5587)"
-       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="flowRegion1980"><rect
-           id="rect1982"
-           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="flowPara1984">Multiply</flowPara><flowPara
-         id="flowPara1986">Reference</flowPara></flowRoot>    <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 569.98175,459.45927 L 632.86982,459.45927 L 644.30398,485.07987 L 630.96412,508.7297 L 569.98175,508.7297 L 584.27448,485.07987 L 569.98175,459.45927 z "
-       id="path1988" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1990"
-       transform="translate(303.2332,255.7015)"
-       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="flowRegion1992"><rect
-           id="rect1994"
-           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="flowPara1996">Divide</flowPara><flowPara
-         id="flowPara1998">Reference</flowPara></flowRoot>    <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:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2000"
-       sodipodi:cx="736.78571"
-       sodipodi:cy="361.95163"
-       sodipodi:rx="39.642857"
-       sodipodi:ry="38.57143"
-       d="M 758.87546,329.92324 A 39.642857,38.57143 0 1 1 757.94075,329.33134"
-       sodipodi:start="5.3034219"
-       sodipodi:end="11.558474"
-       sodipodi:open="true"
-       transform="translate(-22.42857,4.142857)" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2006"
-       transform="translate(411.7392,139.0467)"><flowRegion
-         id="flowRegion2008"><rect
-           id="rect2010"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2016">RMI</flowPara><flowPara
-         id="flowPara2018">Registry</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 642.14286,246.23734 L 692.85714,333.3802"
-       id="path2027" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 640.71429,330.52305 L 677.14286,350.52305"
-       id="path2029" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 640.71429,408.3802 L 677.85714,382.66591"
-       id="path2031" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 645,484.80877 L 693.57143,400.52305"
-       id="path2033" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 753.57143,366.95163 L 773.57143,366.95163"
-       id="path2035" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2037"
-       transform="translate(385.3078,69.25256)"
-       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="flowRegion2039"><rect
-           id="rect2041"
-           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="flowPara2045">RMI</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2059"
-       transform="translate(371.9396,116.0363)"
-       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="flowRegion2061"><rect
-           id="rect2063"
-           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="flowPara2065">RMI</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2067"
-       transform="translate(366.9396,168.8935)"
-       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="flowRegion2069"><rect
-           id="rect2071"
-           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="flowPara2073">RMI</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2075"
-       transform="translate(376.9396,209.6077)"
-       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="flowRegion2077"><rect
-           id="rect2079"
-           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="flowPara2081">RMI</flowPara></flowRoot>  </g>
-</svg>
diff --git a/tags/java/sca/1.3/samples/calculator-rmi-reference/pom.xml b/tags/java/sca/1.3/samples/calculator-rmi-reference/pom.xml
deleted file mode 100644
index 0a4983e76b..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/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>1.3</version>

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

-    </parent>

-    <artifactId>sample-calculator-rmi-reference</artifactId>

-    <name>Apache Tuscany SCA Calculator RMI 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>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index cd1076c3f1..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index d310dad4b1..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index f28f0ca179..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
deleted file mode 100644
index a5a6e1cd29..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.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.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
-		</reference>

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

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

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

-    </component>

-    

-</composite>

diff --git a/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
deleted file mode 100644
index 15e00f5946..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.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;

-

-import java.rmi.registry.LocateRegistry;

-import java.rmi.registry.Registry;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalculatorRMIReferenceTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private CalculatorService calculatorService;

-

-    @Override

-    protected void setUp() throws Exception {

-        CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl();

-        Registry rmiRegistry = LocateRegistry.createRegistry(8099);

-        rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl);

-        

-        scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");

-        calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-        LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService");

-    }

-

-    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/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
deleted file mode 100644
index d8ded42cb2..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.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 java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorRMIServiceImpl extends UnicastRemoteObject implements CalculatorService {
-
-    private static final long serialVersionUID = -1543948944662001428L;
-    
-    public CalculatorRMIServiceImpl() throws RemoteException {
-        super();       
-    }
-
-    public double add(double n1, double n2) throws RemoteException {
-        return n1 + n2;
-    }
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-}
diff --git a/tags/java/sca/1.3/samples/calculator-rmi-service/README b/tags/java/sca/1.3/samples/calculator-rmi-service/README
deleted file mode 100644
index 454cdc0d37..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/README
+++ /dev/null
@@ -1,147 +0,0 @@
-Calculator RMI Service Sample
-=============================
-
-This sample illustrates the use of Tuscany RMI Binding to expose component 
-services as Java RMI Services. It also demonstrates how a simple Java RMI 
-Client application invokes the SCA Application's services exposed as RMI 
-Services.
-
-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-rmi-service.jar calculator.CalculatorServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-Now you have the server running you need to open another command prompt, navigate
-to the calculator-rmi-reference 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-rmi-reference.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local service 
-binding with an RMI binding. SO a java client can call the service exposed
-by the SCA application using an RMI client.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-rmi-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
-          CalculatorClient.java   - (Not currently used) Uses the
-                                    java naming service to
-                                    look up the Calculator RMI service.
-                                    It then calls add, subtract, multiple
-                                    and divide methods on the service
-          CalculatorServer.java   - starts the SCA Runtime and deploys 
-                                    the CalculatorRMIServer.composite. 
-                                    In doing this the SCA RMI binding
-                                    acts to expose the CalculatorService
-                                    over RMI.
-      resources/
-        CalculatorRMIServer.composite - the SCA assembly for this sample
-    test/
-      java/
-        calculator/
-          CalculatorRMIServerTestCase.java - JUnit test case
-  calculator-rmi-service.png     - a pictorial representation of the 
-                                    .composite file
-  build.xml                       - the Ant build file for the server
-  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 Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Two 
-build files are used to support client and server functions. 
-
-The server starts the SCA runtime and loads the SCA calculator application 
-which exposes an RMI service. Start a new console and use the following 
-commands.
-
-cd calculator-rmi-service
-ant compile
-ant run
-
-This will run up the server and display the following.
-
-run:
-     [java] Starting of the SCA Calculator Application exposed as RMI Services... 
-     [java] ...Press Enter to Exit...
-     
-The client is very similar to the calculator sample
-
-It locates the RMI service that the SCA runtime is exposing and calls each of 
-the calculator operations. Start a new console and use the following commands. 
-
-cd calculator-rmi-reference
-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
-     
-If you now return to the console window running the server and press enter the 
-server should stop.     
-
-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-rmi-service
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorRMIServerTestCase
-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/tags/java/sca/1.3/samples/calculator-rmi-service/build.xml b/tags/java/sca/1.3/samples/calculator-rmi-service/build.xml
deleted file mode 100644
index f98f35e4b0..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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="calculator-rmi-service-server" default="compile">
-    <property name="test.class" value="calculator.CalculatorServer" />
-	<property name="test.jar"   value="sample-calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.png b/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.png
deleted file mode 100644
index 574f5eb14b..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.svg b/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.svg
deleted file mode 100644
index 9253110f98..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ /dev/null
@@ -1,330 +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-rmi-service"
-   sodipodi:docname="calculator-rmi-service.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-service\calculator-rmi-service.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="186"
-     inkscape:window-y="165" />
-  <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-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="flowRegion1887"><rect
-           id="rect1889"
-           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="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara><flowPara
-         id="flowPara1950">(RMI)</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/tags/java/sca/1.3/samples/calculator-rmi-service/pom.xml b/tags/java/sca/1.3/samples/calculator-rmi-service/pom.xml
deleted file mode 100644
index 9629b1a21f..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/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>1.3</version>

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

-    </parent>

-    <artifactId>sample-calculator-rmi-service</artifactId>

-    <name>Apache Tuscany SCA Calculator RMI 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.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 2b99485b68..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.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;
-
-import java.rmi.Naming;
-
-/**
- * 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 {
-        CalculatorService calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService");
-
-        // 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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
deleted file mode 100644
index b698163c1b..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.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 org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * A claculator service server. Starts up the SCA runtime which 

- * will start listening for RMI service requests.

- */

-public class CalculatorServer {

-    public static void main(String[] args) throws Exception {

-        System.out.println("Starting of the SCA Calculator Application exposed as RMI Services...");

-        SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");

-        System.out.println("... Press Enter to Exit...");

-        System.in.read();

-        scaDomain.close();

-        System.out.println("Exited...");

-        System.exit(0);

-    }

-

-}

diff --git a/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 3ddcef61df..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index f28f0ca179..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-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/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
deleted file mode 100644
index 34d90ab451..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.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.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
-	    </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/tags/java/sca/1.3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/tags/java/sca/1.3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
deleted file mode 100644
index 8943dd24f6..0000000000
--- a/tags/java/sca/1.3/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.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 calculator;

-

-import java.rmi.Naming;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalculatorRMIServerTestCase extends TestCase {

-

-    private SCADomain scaDomain;

-    private CalculatorService calculatorService;

-

-    @Override

-    protected void setUp() throws Exception {

-        scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");

-    }

-    

-    @Override

-    protected void tearDown() throws Exception {

-        scaDomain.close();

-    }

-

-    public void testCalculator() throws Exception {

-        // Calculate

-        calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService");

-        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/tags/java/sca/1.3/samples/calculator-script/README b/tags/java/sca/1.3/samples/calculator-script/README
deleted file mode 100644
index ab1dda13df..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/build.xml b/tags/java/sca/1.3/samples/calculator-script/build.xml
deleted file mode 100644
index 429d638ca5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/calculator-script.png b/tags/java/sca/1.3/samples/calculator-script/calculator-script.png
deleted file mode 100644
index d3f8c491c3..0000000000
--- a/tags/java/sca/1.3/samples/calculator-script/calculator-script.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-script/calculator-script.svg b/tags/java/sca/1.3/samples/calculator-script/calculator-script.svg
deleted file mode 100644
index 16939f9310..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/pom.xml b/tags/java/sca/1.3/samples/calculator-script/pom.xml
deleted file mode 100644
index 9e99d203a1..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/AddService.java
deleted file mode 100644
index a235e648c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 243d1562dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ba897fa301..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 497dafd4fd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-script/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 376b3e5bb9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator-script/src/main/resources/Calculator.composite
deleted file mode 100644
index 8a765e6153..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 1d4d221364..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index d6f27ca7f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/tags/java/sca/1.3/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 132a1d13b0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index fea8f62110..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/README b/tags/java/sca/1.3/samples/calculator-webapp/README
deleted file mode 100644
index c88b92b206..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/calculator-web.png b/tags/java/sca/1.3/samples/calculator-webapp/calculator-web.png
deleted file mode 100644
index 896ddc4093..0000000000
--- a/tags/java/sca/1.3/samples/calculator-webapp/calculator-web.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-webapp/calculator-web.svg b/tags/java/sca/1.3/samples/calculator-webapp/calculator-web.svg
deleted file mode 100644
index 00ed27556f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/pom.xml b/tags/java/sca/1.3/samples/calculator-webapp/pom.xml
deleted file mode 100644
index 938039e8f8..0000000000
--- a/tags/java/sca/1.3/samples/calculator-webapp/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-sca</artifactId>

-        <version>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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.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>1.3</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>

-    </build>

-</project>

diff --git a/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/tags/java/sca/1.3/samples/calculator-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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index bf3b0303ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 50c23af0b2..0000000000
--- a/tags/java/sca/1.3/samples/calculator-webapp/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>

-        <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/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/tags/java/sca/1.3/samples/calculator-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/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b5a828d55b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/calc.jsp b/tags/java/sca/1.3/samples/calculator-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4bc5c984dd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/README b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/README
deleted file mode 100644
index a6e6c897e4..0000000000
--- a/tags/java/sca/1.3/samples/calculator-ws-secure-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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/calculator-web.png b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/calculator-web.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/calculator-web.svg b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/calculator-web.svg
deleted file mode 100644
index 1b7015b156..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/pom.xml b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/pom.xml
deleted file mode 100644
index f577e14ecb..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-    

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-        </dependency>   

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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.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>1.3</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-</project>

diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index c3c789e745..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the add service

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 46ec182124..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index bf3b0303ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index c8653806aa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the subtract service

- */

-@Remotable

-public interface SubtractService {

-

-    double subtract(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
deleted file mode 100644
index 9625c0d692..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
deleted file mode 100644
index 23a62680c5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 4d511f887e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
deleted file mode 100644
index b6b244244b..0000000000
--- a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
deleted file mode 100644
index 4611669bbd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
deleted file mode 100644
index a7a6f3aa9c..0000000000
--- a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-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
\ No newline at end of file
diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 20a455ad67..0000000000
--- a/tags/java/sca/1.3/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>1.3</d:version>

-            <d:type>war</d:type>

-        </d:moduleId>

-        <!-- TUSCANY-1986 -->

-        <d:inverse-classloading />

-    </d:environment>

-</web-app>

diff --git a/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d3a62d39f4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/tags/java/sca/1.3/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/README b/tags/java/sca/1.3/samples/calculator-ws-webapp/README
deleted file mode 100644
index a6e6c897e4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/calculator-web.png b/tags/java/sca/1.3/samples/calculator-ws-webapp/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/tags/java/sca/1.3/samples/calculator-ws-webapp/calculator-web.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/calculator-ws-webapp/calculator-web.svg b/tags/java/sca/1.3/samples/calculator-ws-webapp/calculator-web.svg
deleted file mode 100644
index 1b7015b156..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/pom.xml b/tags/java/sca/1.3/samples/calculator-ws-webapp/pom.xml
deleted file mode 100644
index 1bbb45563b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-    

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-        </dependency>   

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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.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>1.3</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-</project>

diff --git a/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index c3c789e745..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the add service

- */

-@Remotable

-public interface AddService {

-

-    double add(double n1, double n2);

-

-}

diff --git a/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index a7049729f7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index bf3b0303ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 6415d5a896..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 639034a6d7..0000000000
--- a/tags/java/sca/1.3/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>1.3</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d3a62d39f4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/tags/java/sca/1.3/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 4c4366747d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/calculator/README b/tags/java/sca/1.3/samples/calculator/README
deleted file mode 100644
index ceb532faed..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/build.xml b/tags/java/sca/1.3/samples/calculator/build.xml
deleted file mode 100644
index c4b755ef94..0000000000
--- a/tags/java/sca/1.3/samples/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="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/tags/java/sca/1.3/samples/calculator/calculator.png b/tags/java/sca/1.3/samples/calculator/calculator.png
deleted file mode 100644
index 2aab2c93ea..0000000000
--- a/tags/java/sca/1.3/samples/calculator/calculator.png
+++ /dev/null
@@ -1,2 +0,0 @@
-‰PNG

-‰PNG1.3

diff --git a/tags/java/sca/1.3/samples/calculator/calculator.svg b/tags/java/sca/1.3/samples/calculator/calculator.svg
deleted file mode 100644
index 0615925c50..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/pom.xml b/tags/java/sca/1.3/samples/calculator/pom.xml
deleted file mode 100644
index 5a29f80669..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator</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-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/AddService.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9d180bf52e..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/samples/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3d861f2018..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/samples/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 divide service interface
- */
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/samples/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3/samples/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 multiply service
- */
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/calculator/src/main/resources/Calculator.composite b/tags/java/sca/1.3/samples/calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/tags/java/sca/1.3/samples/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 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/tags/java/sca/1.3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 775ad15537..0000000000
--- a/tags/java/sca/1.3/samples/calculator/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/tags/java/sca/1.3/samples/callback-ws-client/README b/tags/java/sca/1.3/samples/callback-ws-client/README
deleted file mode 100644
index 66121362c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-client/build.xml b/tags/java/sca/1.3/samples/callback-ws-client/build.xml
deleted file mode 100644
index 8698c6018d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-client/callback-ws-client.png b/tags/java/sca/1.3/samples/callback-ws-client/callback-ws-client.png
deleted file mode 100644
index 802ef604a7..0000000000
--- a/tags/java/sca/1.3/samples/callback-ws-client/callback-ws-client.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/callback-ws-client/callback-ws-client.svg b/tags/java/sca/1.3/samples/callback-ws-client/callback-ws-client.svg
deleted file mode 100644
index f49aeadbbf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-client/pom.xml b/tags/java/sca/1.3/samples/callback-ws-client/pom.xml
deleted file mode 100644
index 063dac1479..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>       

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>sample-callback-ws-service</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>        

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myapp/MyClient.java
deleted file mode 100644
index e515b55788..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;

-

-/**

- * The client interface

- */

-public interface MyClient {

-

-    void aClientMethod();

-}

diff --git a/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
deleted file mode 100644
index 3d94973880..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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 {

-        SCANode2 node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());

-        node.start();

-        run(node);

-        System.out.println("Closing the domain");

-        node.stop();

-    }

-

-    public static void run(SCANode2 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/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myserver/MyService.java b/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myserver/MyService.java
deleted file mode 100644
index 1850eae1bc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/tags/java/sca/1.3/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
deleted file mode 100644
index bf5f87a4f9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The callback interface for {@link MyService}.

- */

-@Remotable

-public interface MyServiceCallback {

-

-    void receiveResult(String result);

-}

diff --git a/tags/java/sca/1.3/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 314747d548..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-client/src/main/resources/myapp.composite b/tags/java/sca/1.3/samples/callback-ws-client/src/main/resources/myapp.composite
deleted file mode 100644
index 5b776d6df8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/tags/java/sca/1.3/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
deleted file mode 100644
index f11b0adfe4..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the callback server is available

- */

-public class CallbackClientTestCase {

-

-    private SCANode2 node;

-

-    @Before

-    public void startServer() throws Exception {

-        try {

-            node = SCANode2Factory.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/tags/java/sca/1.3/samples/callback-ws-service/README b/tags/java/sca/1.3/samples/callback-ws-service/README
deleted file mode 100644
index 2c65f745a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-service/build.xml b/tags/java/sca/1.3/samples/callback-ws-service/build.xml
deleted file mode 100644
index c91dd88a8c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-service/callback-ws-service.png b/tags/java/sca/1.3/samples/callback-ws-service/callback-ws-service.png
deleted file mode 100644
index 772ac38431..0000000000
--- a/tags/java/sca/1.3/samples/callback-ws-service/callback-ws-service.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/callback-ws-service/callback-ws-service.svg b/tags/java/sca/1.3/samples/callback-ws-service/callback-ws-service.svg
deleted file mode 100644
index ff0a1d307b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-service/pom.xml b/tags/java/sca/1.3/samples/callback-ws-service/pom.xml
deleted file mode 100644
index 922085852e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
deleted file mode 100644
index 9dfead61db..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-

-/**

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

-        

-        SCANode2 node = SCANode2Factory.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/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyService.java b/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyService.java
deleted file mode 100644
index 1850eae1bc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.OneWay;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
deleted file mode 100644
index bf5f87a4f9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The callback interface for {@link MyService}.

- */

-@Remotable

-public interface MyServiceCallback {

-

-    void receiveResult(String result);

-}

diff --git a/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/tags/java/sca/1.3/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
deleted file mode 100644
index 25469def5c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 35f7f60c2e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-service/src/main/resources/callbackws.composite b/tags/java/sca/1.3/samples/callback-ws-service/src/main/resources/callbackws.composite
deleted file mode 100644
index a09e638896..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/tags/java/sca/1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
deleted file mode 100644
index 4208f7f6b5..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests that the callback server is available

- */

-public class CallbackServerTestCase {

-

-    private SCANode2 node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = SCANode2Factory.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/tags/java/sca/1.3/samples/chat-webapp/README b/tags/java/sca/1.3/samples/chat-webapp/README
deleted file mode 100644
index dddd7e3f94..0000000000
--- a/tags/java/sca/1.3/samples/chat-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/tags/java/sca/1.3/samples/chat-webapp/chat-webapp.png b/tags/java/sca/1.3/samples/chat-webapp/chat-webapp.png
deleted file mode 100644
index fdf540d243..0000000000
--- a/tags/java/sca/1.3/samples/chat-webapp/chat-webapp.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/chat-webapp/chat-webapp.svg b/tags/java/sca/1.3/samples/chat-webapp/chat-webapp.svg
deleted file mode 100644
index b37c1dc590..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/chat-webapp/pom.xml b/tags/java/sca/1.3/samples/chat-webapp/pom.xml
deleted file mode 100644
index 7752326584..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-dwr</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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>1.3</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>       

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/samples/chat-webapp/src/main/java/sample/ChatService.java b/tags/java/sca/1.3/samples/chat-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index ca90b8f579..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-@Remotable

-public interface ChatService {

-

-    public void chat(String msg);

-

-}

diff --git a/tags/java/sca/1.3/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/tags/java/sca/1.3/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index 7d0bfb3307..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/chat-webapp/src/main/resources/chat.composite b/tags/java/sca/1.3/samples/chat-webapp/src/main/resources/chat.composite
deleted file mode 100644
index c9ce95e2dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 97d91fec56..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/chat.html b/tags/java/sca/1.3/samples/chat-webapp/src/main/webapp/chat.html
deleted file mode 100644
index 7a449a906a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/README b/tags/java/sca/1.3/samples/databinding-echo/README
deleted file mode 100644
index 67c1aa32d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/build.xml b/tags/java/sca/1.3/samples/databinding-echo/build.xml
deleted file mode 100644
index 7f2483f6fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/databinding-echo.png b/tags/java/sca/1.3/samples/databinding-echo/databinding-echo.png
deleted file mode 100644
index afbbfff285..0000000000
--- a/tags/java/sca/1.3/samples/databinding-echo/databinding-echo.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/databinding-echo/databinding-echo.svg b/tags/java/sca/1.3/samples/databinding-echo/databinding-echo.svg
deleted file mode 100644
index 87964abf86..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/pom.xml b/tags/java/sca/1.3/samples/databinding-echo/pom.xml
deleted file mode 100644
index 05939ac2b9..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-binding-echo</artifactId>
-            <version>1.3</version>
-        </dependency>      
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
deleted file mode 100644
index 5679614164..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentAImpl implements Interface1 {
-
-    private Interface1 componentBReference;
-    
-    @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/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
deleted file mode 100644
index ff8968837d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@AllowsPassByReference
-public class ComponentBImpl implements Interface2 {
-
-    private Echo echoReference;
-
-    @Constructor
-    public ComponentBImpl(@Reference(name = "echoReference", required = true)
-    Echo echoReference) {
-        this.echoReference = echoReference;
-    }
-
-    public Node call(Node msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentB --> Received message: " + request);
-        Node ret = (Node) echoReference.echo(msg);
-        String response = ret + " [" + ret.getClass().getName() + "]";
-        System.out.println("ComponentB --> Returned message: " + response);
-        return ret;
-    }
-    
-    public XMLStreamReader call1(XMLStreamReader msg) {
-        String request = msg + " [" + msg.getClass().getName() + "]";
-        System.out.println("ComponentB --> Received message: " + request);
-//        XMLStreamReader ret = (XMLStreamReader) echoReference.echo(msg);
-        String response = request;
-        System.out.println("ComponentB --> Returned message: " + response);
-        return msg;
-    }    
-}
diff --git a/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Echo.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Echo.java
deleted file mode 100644
index 25ecc90454..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@DataBinding("org.w3c.dom.Node")
-@Remotable
-public interface Echo {
-    Object echo(Object msg);
-}
diff --git a/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
deleted file mode 100644
index 9ec3819899..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Interface1.java
deleted file mode 100644
index 70b450e358..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataBinding("java.lang.String")
-@Remotable
-public interface Interface1 {
-    String call(String msg);
-    String call1(String msg);
-}
diff --git a/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/tags/java/sca/1.3/samples/databinding-echo/src/main/java/dbecho/Interface2.java
deleted file mode 100644
index b62f1f425d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/tags/java/sca/1.3/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
deleted file mode 100644
index 56857fc4d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/tags/java/sca/1.3/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
deleted file mode 100644
index ef2308aa73..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/tags/java/sca/1.3/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
deleted file mode 100644
index 43434d8cee..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/README b/tags/java/sca/1.3/samples/domain-management/README
deleted file mode 100644
index 6280a28028..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/pom.xml b/tags/java/sca/1.3/samples/domain-management/pom.xml
deleted file mode 100644
index b82a5d8b39..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-xml</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-workspace-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-monitor-logging</artifactId>
-            <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</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>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.3</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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
deleted file mode 100644
index cb61540ab1..0000000000
--- a/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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 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.SCANode2;
-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 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);
-        
-        // 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, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, 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<SCANode2> runtimeNodes = new ArrayList<SCANode2>();
-        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.NodeLauncher.Contribution[] contributions = new org.apache.tuscany.sca.node.launcher.NodeLauncher.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.NodeLauncher.Contribution(dependency.getURI(), dependency.getLocation());
-            }
-            SCANode2 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 (SCANode2 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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeComponents.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeComponents.java
deleted file mode 100644
index 4af2547a81..0000000000
--- a/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/DistributeComponents.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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 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 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);
-        
-        // 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, contractMapper, monitor);
-        
-        // Create a node composite builder
-        nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, 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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListComponents.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListComponents.java
deleted file mode 100644
index 27cb31d57f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListDependencies.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListDependencies.java
deleted file mode 100644
index 1bf8124682..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListDeployables.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/ListDeployables.java
deleted file mode 100644
index f5f0b9c655..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/WireComponents.java b/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/WireComponents.java
deleted file mode 100644
index 899a6fd412..0000000000
--- a/tags/java/sca/1.3/samples/domain-management/src/main/java/manager/WireComponents.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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 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 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);
-        
-        // 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, 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/tags/java/sca/1.3/samples/domain-management/src/test/java/services/Cart.java b/tags/java/sca/1.3/samples/domain-management/src/test/java/services/Cart.java
deleted file mode 100644
index 9e6226d963..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/tags/java/sca/1.3/samples/domain-management/src/test/java/services/Item.java b/tags/java/sca/1.3/samples/domain-management/src/test/java/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/tags/java/sca/1.3/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
deleted file mode 100644
index c32853b3a9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/tags/java/sca/1.3/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
deleted file mode 100644
index ef63dfdfa1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ShoppingCartImpl implements Cart {
-    
-    private Map<String, Item> cart;
-    
-    @Init
-    protected 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/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/assets.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/assets.xml
deleted file mode 100644
index 10693a89e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/client.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/client.xml
deleted file mode 100644
index 5b34693bee..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/store.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/assembly/store.xml
deleted file mode 100644
index d19b7eb161..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index 33fe814c3a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
deleted file mode 100644
index 14e1cdb672..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/client/client.composite b/tags/java/sca/1.3/samples/domain-management/src/test/resources/client/client.composite
deleted file mode 100644
index 1279b319c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 52348106f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-management/src/test/resources/store/store.composite b/tags/java/sca/1.3/samples/domain-management/src/test/resources/store/store.composite
deleted file mode 100644
index d4f18771d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/README b/tags/java/sca/1.3/samples/domain-webapp/README
deleted file mode 100644
index c01a0dd39a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/build.xml b/tags/java/sca/1.3/samples/domain-webapp/build.xml
deleted file mode 100644
index 448e3c540e..0000000000
--- a/tags/java/sca/1.3/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.3\sca-api-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.3\tuscany-assembly-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.3\tuscany-assembly-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.3\tuscany-binding-sca-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.3\tuscany-binding-sca-axis2-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.3\tuscany-binding-sca-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.3\tuscany-binding-ws-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.3\tuscany-binding-ws-axis2-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.3\tuscany-binding-ws-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.3\tuscany-contribution-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.3\tuscany-contribution-impl-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.3\tuscany-contribution-java-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.3\tuscany-contribution-namespace-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.3\tuscany-core-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.3\tuscany-core-databinding-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.3\tuscany-core-spi-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.3\tuscany-databinding-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.3\tuscany-databinding-axiom-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.3\tuscany-distributed-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.3\tuscany-distributed-impl-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.3\tuscany-host-embedded-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.3\tuscany-host-http-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.3\tuscany-host-jetty-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.3\tuscany-implementation-java-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.3\tuscany-implementation-java-runtime-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.3\tuscany-implementation-java-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.3\tuscany-interface-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.3\tuscany-interface-java-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.3\tuscany-interface-java-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.3\tuscany-interface-wsdl-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.3\tuscany-interface-wsdl-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.3\tuscany-policy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.3\tuscany-policy-xml-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.3\tuscany-topology-1.3.jar"/>

-        <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.3\tuscany-topology-xml-1.3.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.3\sca-api-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.3\tuscany-assembly-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.3\tuscany-assembly-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.3\tuscany-binding-http-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.3\tuscany-binding-jsonrpc-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.3\tuscany-binding-sca-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.3\tuscany-binding-sca-axis2-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.3\tuscany-binding-sca-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.3\tuscany-binding-ws-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.3\tuscany-binding-ws-axis2-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.3\tuscany-binding-ws-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.3\tuscany-contribution-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.3\tuscany-contribution-impl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.3\tuscany-contribution-java-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.3\tuscany-contribution-namespace-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.3\tuscany-core-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.3\tuscany-core-databinding-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.3\tuscany-core-spi-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.3\tuscany-databinding-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.3\tuscany-databinding-axiom-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.3\tuscany-distributed-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.3\tuscany-distributed-impl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.3\tuscany-extension-helper-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.3\tuscany-host-embedded-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.3\tuscany-host-http-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.3\tuscany-interface-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.3\tuscany-interface-java-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.3\tuscany-interface-java-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.3\tuscany-interface-wsdl-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.3\tuscany-interface-wsdl-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.3\tuscany-policy-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.3\tuscany-policy-xml-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.3\tuscany-topology-1.3.jar"/>

-    	<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.3\tuscany-topology-xml-1.3.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/tags/java/sca/1.3/samples/domain-webapp/pom.xml b/tags/java/sca/1.3/samples/domain-webapp/pom.xml
deleted file mode 100644
index 73aa6c056a..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-            

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</version>

-        </dependency>

- 

-        <dependency>

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

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>1.3</version>

-        </dependency>      

-        

-         <dependency>

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

-            <artifactId>tuscany-domain-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-                                      

-        <dependency>

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

-            <artifactId>tuscany-binding-jsonrpc</artifactId>

-            <version>1.3</version>

-        </dependency>   

-        

-         <dependency>

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

-            <artifactId>tuscany-binding-sca-axis2</artifactId>

-            <version>1.3</version>

-        </dependency> 

-        

-        <dependency>

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

-            <artifactId>tuscany-binding-http</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>        

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-resource</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/domain-webapp/src/main/java/node/DomainServer.java b/tags/java/sca/1.3/samples/domain-webapp/src/main/java/node/DomainServer.java
deleted file mode 100644
index ea3cddc01b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100755
index fbe5880db6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/domain.composite b/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/domain.composite
deleted file mode 100644
index dbaaebd3c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/index.html b/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/index.html
deleted file mode 100644
index 425bd73734..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/node.png b/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/node.png
deleted file mode 100644
index b3c949d224..0000000000
--- a/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/node.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/style.css b/tags/java/sca/1.3/samples/domain-webapp/src/main/resources/webroot/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/README b/tags/java/sca/1.3/samples/feed-aggregator-webapp/README
deleted file mode 100644
index 3668a7705e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/tags/java/sca/1.3/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
deleted file mode 100644
index 1af95a5eff..0000000000
--- a/tags/java/sca/1.3/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/tags/java/sca/1.3/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
deleted file mode 100644
index a861a5c50f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/pom.xml b/tags/java/sca/1.3/samples/feed-aggregator-webapp/pom.xml
deleted file mode 100644
index 4d33b590ae..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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.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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>         
-       </plugins>         
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 3d259e66b1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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://incubator.apache.org/tuscany", "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://incubator.apache.org/tuscany", "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/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
deleted file mode 100644
index dec073c36b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
deleted file mode 100644
index ea7d252ed4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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).getPublished();
-                Date yDate = ((Entry)yObj).getPublished();
-                if (xDate == null)
-                    return -1;
-                if (newFirst)
-                    return yDate.compareTo(xDate);
-                else
-                    return xDate.compareTo(yDate);
-            }
-        });
-        return Arrays.asList(entriesArray);
-    }
-}
diff --git a/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index d41fe3e4a0..0000000000
--- a/tags/java/sca/1.3/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/1"/>
-   		</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/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index b67fe843ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dea3980e4d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/index.html b/tags/java/sca/1.3/samples/feed-aggregator-webapp/src/main/webapp/index.html
deleted file mode 100644
index e20f2fdf81..0000000000
--- a/tags/java/sca/1.3/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:8080/sample-feed-aggregator-webapp/atomAggregator</a>
-    <br/><a href="atomAggregator/atomsvc">http://localhost:8080/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a>
-    <br/><a href="rssAggregator">http://localhost:8080/sample-feed-aggregator-webapp/rssAggregator</a>
-     
-  </body>
-</html>
diff --git a/tags/java/sca/1.3/samples/feed-aggregator/README b/tags/java/sca/1.3/samples/feed-aggregator/README
deleted file mode 100644
index 5dfe430b83..0000000000
--- a/tags/java/sca/1.3/samples/feed-aggregator/README
+++ /dev/null
@@ -1,97 +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 feed.SampleServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-feed-aggregator.jar feed.SampleServer
-
-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/
-          FeedAggregatorImpl.java         - implementation of the Feed
-                                            aggregator component
-          SampleServer.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        
-
-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/tags/java/sca/1.3/samples/feed-aggregator/build.xml b/tags/java/sca/1.3/samples/feed-aggregator/build.xml
deleted file mode 100644
index 2118e13db7..0000000000
--- a/tags/java/sca/1.3/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="feed.SampleServer" />
-	<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/tags/java/sca/1.3/samples/feed-aggregator/feed-aggregator.png b/tags/java/sca/1.3/samples/feed-aggregator/feed-aggregator.png
deleted file mode 100644
index c8fea8a7b8..0000000000
--- a/tags/java/sca/1.3/samples/feed-aggregator/feed-aggregator.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/feed-aggregator/feed-aggregator.svg b/tags/java/sca/1.3/samples/feed-aggregator/feed-aggregator.svg
deleted file mode 100644
index 72fe6a00ac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator/pom.xml b/tags/java/sca/1.3/samples/feed-aggregator/pom.xml
deleted file mode 100644
index 0d41413b11..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss-rome</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 5c713f9ca4..0000000000
--- a/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.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 feed;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-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.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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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://incubator.apache.org/tuscany", "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://incubator.apache.org/tuscany", "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/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/SampleServer.java
deleted file mode 100644
index 2aace3daf7..0000000000
--- a/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/SampleServer.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 feed;
-
-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("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();
-        }
-
-        // RssFeed feedService = scaDomain.getService(RssFeed.class,
-        // "RssAggregatorComponent");
-        // SyndFeed syndFeed = feedService.get();
-        // SyndFeedOutput output = new SyndFeedOutput();
-        // output.output(syndFeed,new PrintWriter(System.out));
-
-        scaDomain.close();
-        System.out.println("Sample Feed server stopped");
-    }
-}
diff --git a/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/Sort.java b/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/Sort.java
deleted file mode 100644
index dec073c36b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/tags/java/sca/1.3/samples/feed-aggregator/src/main/java/feed/SortImpl.java
deleted file mode 100644
index ea7d252ed4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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).getPublished();
-                Date yDate = ((Entry)yObj).getPublished();
-                if (xDate == null)
-                    return -1;
-                if (newFirst)
-                    return yDate.compareTo(xDate);
-                else
-                    return xDate.compareTo(yDate);
-            }
-        });
-        return Arrays.asList(entriesArray);
-    }
-}
diff --git a/tags/java/sca/1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/tags/java/sca/1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index 34f313672e..0000000000
--- a/tags/java/sca/1.3/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/1"/>
-   		</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/tags/java/sca/1.3/samples/helloworld-bpel-ws/README b/tags/java/sca/1.3/samples/helloworld-bpel-ws/README
deleted file mode 100644
index 5c669f5da5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/build.xml b/tags/java/sca/1.3/samples/helloworld-bpel-ws/build.xml
deleted file mode 100644
index c8917007f1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/helloworld-bpel.png b/tags/java/sca/1.3/samples/helloworld-bpel-ws/helloworld-bpel.png
deleted file mode 100644
index 5f53a3c5d1..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-bpel-ws/helloworld-bpel.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-bpel-ws/helloworld-bpel.svg b/tags/java/sca/1.3/samples/helloworld-bpel-ws/helloworld-bpel.svg
deleted file mode 100644
index 5a98f1a07c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/pom.xml b/tags/java/sca/1.3/samples/helloworld-bpel-ws/pom.xml
deleted file mode 100644
index bf07a4f080..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-bpel-ode</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>1.3</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>1.3</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>1.3</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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/java/helloworld/BPELClient.java
deleted file mode 100644
index 971a5373e9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/deploy.xml b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/deploy.xml
deleted file mode 100644
index d9d4363832..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.bpel
deleted file mode 100644
index a88aa7960c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.componentType
deleted file mode 100644
index 70273245d7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.composite
deleted file mode 100644
index 97262109e6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 1cb338b283..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/log4j.properties b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/main/resources/log4j.properties
deleted file mode 100644
index c1bc0a0b81..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java b/tags/java/sca/1.3/samples/helloworld-bpel-ws/src/test/java/helloworld/BPELHelloWorldTestCase.java
deleted file mode 100644
index 6ad63f87d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/README b/tags/java/sca/1.3/samples/helloworld-bpel/README
deleted file mode 100644
index bf5f500ef3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/build.xml b/tags/java/sca/1.3/samples/helloworld-bpel/build.xml
deleted file mode 100644
index 890a6427b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/helloworld-bpel.png b/tags/java/sca/1.3/samples/helloworld-bpel/helloworld-bpel.png
deleted file mode 100644
index 5f53a3c5d1..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-bpel/helloworld-bpel.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-bpel/helloworld-bpel.svg b/tags/java/sca/1.3/samples/helloworld-bpel/helloworld-bpel.svg
deleted file mode 100644
index 5a98f1a07c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/pom.xml b/tags/java/sca/1.3/samples/helloworld-bpel/pom.xml
deleted file mode 100644
index bdd0ab0ed6..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.3</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>1.3</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>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-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>1.3</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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
deleted file mode 100644
index 1826c885c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/deploy.xml b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/deploy.xml
deleted file mode 100644
index 9bd95b2c58..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.bpel
deleted file mode 100644
index a88aa7960c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.componentType b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.componentType
deleted file mode 100644
index 2b360111cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.composite b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.composite
deleted file mode 100644
index b4623b5c2d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 46cf381577..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/log4j.properties b/tags/java/sca/1.3/samples/helloworld-bpel/src/main/resources/log4j.properties
deleted file mode 100644
index 8649a71550..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/tags/java/sca/1.3/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
deleted file mode 100644
index 1caaa78878..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/README b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/README
deleted file mode 100644
index 38392a13b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/build-dojo.xml b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/build-dojo.xml
deleted file mode 100644
index 534a1dacd9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/build.xml b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/build.xml
deleted file mode 100644
index 95813af65a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
deleted file mode 100644
index d5c3bc5d3e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/pom.xml
deleted file mode 100644
index 2a5220847f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</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.2</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>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>           
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index e205f4da9b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 4195f3288c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 2c178c1ddc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 70cd67890a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/tags/java/sca/1.3/samples/helloworld-dojo-webapp/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/README b/tags/java/sca/1.3/samples/helloworld-jms-webapp/README
deleted file mode 100644
index 9be2e0b0f6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-jms-webapp/pom.xml
deleted file mode 100644
index 2db15b9b49..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-jms-webapp/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-sca</artifactId>
-        <version>1.3</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>
-
-        <!-- 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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index c24a741ee2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 2af978b9ce..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String sayHello(String name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 280388f443..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 2419887413..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
deleted file mode 100644
index f6328d156c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 86710435ae..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/tags/java/sca/1.3/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index bc6ef59a9b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/README b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/README
deleted file mode 100644
index 07253d039b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
deleted file mode 100644
index 6ef1f438fb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/pom.xml
deleted file mode 100644
index 86fb503927..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</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.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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>         
-       </plugins>      
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index 35fd00fabd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 75dd9050fa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index c8246e15a7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 267bed176c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/tags/java/sca/1.3/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/README b/tags/java/sca/1.3/samples/helloworld-reference-jms/README
deleted file mode 100644
index 184e67a239..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/build.xml b/tags/java/sca/1.3/samples/helloworld-reference-jms/build.xml
deleted file mode 100644
index 4702beed0d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/helloworld-reference.png b/tags/java/sca/1.3/samples/helloworld-reference-jms/helloworld-reference.png
deleted file mode 100644
index ab80b1f91c..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-reference-jms/helloworld-reference.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-reference-jms/helloworld-reference.svg b/tags/java/sca/1.3/samples/helloworld-reference-jms/helloworld-reference.svg
deleted file mode 100644
index 40f4e8f271..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/pom.xml b/tags/java/sca/1.3/samples/helloworld-reference-jms/pom.xml
deleted file mode 100644
index 6c00d2930d..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-jms</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>sample-helloworld-service-jms</artifactId>

-            <version>1.3</version>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
deleted file mode 100644
index 5bec27a137..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index c0259c6e07..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the helloworld service

- */

-@Remotable

-public interface HelloWorldService {

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 27cef47677..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
deleted file mode 100644
index 3cf1104562..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
deleted file mode 100644
index e692ef8e4c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/logging.properties b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/logging.properties
deleted file mode 100644
index a2a4067921..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index e0ea596dd3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/tags/java/sca/1.3/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
deleted file mode 100644
index f5380d9ccd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/README b/tags/java/sca/1.3/samples/helloworld-service-jms/README
deleted file mode 100644
index 49feabaa07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/build.xml b/tags/java/sca/1.3/samples/helloworld-service-jms/build.xml
deleted file mode 100644
index 330de7f7e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/helloworld-service.png b/tags/java/sca/1.3/samples/helloworld-service-jms/helloworld-service.png
deleted file mode 100644
index ef27c71f54..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-service-jms/helloworld-service.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-service-jms/helloworld-service.svg b/tags/java/sca/1.3/samples/helloworld-service-jms/helloworld-service.svg
deleted file mode 100644
index dd7a9dd87d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/pom.xml b/tags/java/sca/1.3/samples/helloworld-service-jms/pom.xml
deleted file mode 100644
index 97e4787409..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-            <scope>compile</scope>            

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-jms</artifactId>

-            <version>1.3</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>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/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index d4ea391a00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 4b019b21bf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/definitions.xml
deleted file mode 100644
index 8c881ab0bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
deleted file mode 100644
index 3135cdc320..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3f9e00689e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/tags/java/sca/1.3/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
deleted file mode 100644
index 7930f98716..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/README b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/build.xml
deleted file mode 100644
index 5456c99a47..0000000000
--- a/tags/java/sca/1.3/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.3.jar"/>

-            	<include name="tuscany-assembly-1.3.jar"/>

-            	<include name="tuscany-assembly-xml-1.3.jar"/>

-            	<include name="tuscany-binding-feed-1.3.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.3.jar"/>

-            	<include name="tuscany-binding-sca-1.3.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.3.jar"/>

-            	<include name="tuscany-binding-ws-1.3.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.3.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.3.jar"/>

-            	<include name="tuscany-contribution-1.3.jar"/>

-            	<include name="tuscany-contribution-impl-1.3.jar"/>

-            	<include name="tuscany-contribution-java-1.3.jar"/>

-            	<include name="tuscany-contribution-namespace-1.3.jar"/>

-            	<include name="tuscany-core-1.3.jar"/>

-            	<include name="tuscany-core-databinding-1.3.jar"/>

-            	<include name="tuscany-core-spi-1.3.jar"/>

-            	<include name="tuscany-databinding-1.3.jar"/>

-            	<include name="tuscany-databinding-axiom-1.3.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.3.jar"/>

-            	<include name="tuscany-databinding-sdo-1.3.jar"/>

-            	<include name="tuscany-distributed-1.3.jar"/>

-            	<include name="tuscany-extension-helper-1.3.jar"/>

-            	<include name="tuscany-host-embedded-1.3.jar"/>

-            	<include name="tuscany-host-http-1.3.jar"/>

-            	<include name="tuscany-host-webapp-1.3.jar"/>

-            	<include name="tuscany-implementation-java-1.3.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.3.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.3.jar"/>

-            	<include name="tuscany-interface-1.3.jar"/>

-            	<include name="tuscany-interface-java-1.3.jar"/>

-            	<include name="tuscany-interface-java-xml-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.3.jar"/>         	

-            	<include name="tuscany-policy-1.3.jar"/>

-            	<include name="tuscany-policy-xml-1.3.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.3.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.3.jar"/>

-            	<include name="tuscany-sdo-impl-1.3.jar"/>

-            	<include name="tuscany-sdo-lib-1.3.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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/pom.xml
deleted file mode 100644
index b1e574cd25..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 182fd38fd9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/README b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/README
deleted file mode 100644
index abf10ef1f2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/build.xml
deleted file mode 100644
index 4f83c8ae9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/pom.xml
deleted file mode 100644
index 04108c1088..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-ws-service-jms</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
deleted file mode 100644
index b3db243a1f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index db0c947cf7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 0dee19550b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
deleted file mode 100644
index d029ba3e1c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
deleted file mode 100644
index a4eb217310..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 013a55b61e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
deleted file mode 100644
index 12b0716b5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/README b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/README
deleted file mode 100644
index 167991c8f7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/build.xml
deleted file mode 100644
index 38f1b7549d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/pom.xml
deleted file mode 100644
index 387a2b5e09..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</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>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>sample-helloworld-ws-service-secure</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
deleted file mode 100644
index 0f1ebf46d6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index a21619fc8a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index c0259c6e07..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * The interface for the helloworld service

- */

-@Remotable

-public interface HelloWorldService {

-    public String getGreetings(String name);

-}

diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 27cef47677..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
deleted file mode 100644
index 0ab3a5a9f1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
deleted file mode 100644
index 0b4f2399f0..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 904befaf60..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
deleted file mode 100644
index 3a4b43222d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index e6fcc6f4a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 848c41d1c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/tags/java/sca/1.3/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 21f2166560..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/README b/tags/java/sca/1.3/samples/helloworld-ws-reference/README
deleted file mode 100644
index 13c89ab2f6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference/build.xml
deleted file mode 100644
index 71ee66b31e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/helloworld-ws-reference.png b/tags/java/sca/1.3/samples/helloworld-ws-reference/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/tags/java/sca/1.3/samples/helloworld-ws-reference/helloworld-ws-reference.svg
deleted file mode 100644
index 354ffbae8f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-reference/pom.xml
deleted file mode 100644
index 6760b8bc05..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-helloworld-ws-service</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index 4559b282fe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index db0c947cf7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 0dee19550b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 899ad5ce35..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/logging.properties b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 662c9affac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 7ce89179c2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/tags/java/sca/1.3/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 8226ec884e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/README b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/README
deleted file mode 100644
index aa4819927a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/build.xml
deleted file mode 100644
index 386008e707..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
deleted file mode 100644
index 2590f02a45..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
deleted file mode 100644
index 56a29db23c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/pom.xml
deleted file mode 100644
index 8d27cba8da..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.3</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
-            <version>1.1-incubating</version>
-        </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-sdo</artifactId>
-            <version>1.3</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>1.3</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.2</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-incubating</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>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>             
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index eb82418516..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
deleted file mode 100644
index fea4e2a16c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 3d6576aca0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
deleted file mode 100644
index 34396b1b02..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index fe79094b94..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
deleted file mode 100644
index a0b7c37cd9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
deleted file mode 100644
index 4657c6cdc1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 6f241cc90c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index ceee0f1a91..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 257e65aad4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/README b/tags/java/sca/1.3/samples/helloworld-ws-sdo/README
deleted file mode 100644
index be947b1923..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo/build.xml
deleted file mode 100644
index 401315d424..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/tags/java/sca/1.3/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/tags/java/sca/1.3/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-sdo/pom.xml
deleted file mode 100644
index f67c9f85d4..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</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-sdo</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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>
-        <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-incubating</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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de4795ceaf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c950f7df04..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index e03ed4dc25..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 367c5b4a12..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
-    public String getGreetings(Name name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 711eef63b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
deleted file mode 100644
index c255df2897..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index d4fba548d5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 11564c370f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/tags/java/sca/1.3/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 4b0c40dafd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/README b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/README
deleted file mode 100644
index 26272b1d91..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/build.xml
deleted file mode 100644
index 330de7f7e5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/helloworld-ws-service.png
deleted file mode 100644
index eab29d0bcd..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-service-jms/helloworld-ws-service.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
deleted file mode 100644
index 8d2ae98c82..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/pom.xml
deleted file mode 100644
index e8c26df884..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-            <scope>compile</scope>            

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</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>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 5454487ff6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 4b019b21bf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
deleted file mode 100644
index 8c881ab0bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
deleted file mode 100644
index 67079f738e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
deleted file mode 100644
index 10faf374f3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 3f9e00689e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
deleted file mode 100644
index 34f8605d5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
deleted file mode 100644
index 03d566cc17..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/README b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/README
deleted file mode 100644
index f32eb08b05..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/build.xml
deleted file mode 100644
index 29bbae0173..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
deleted file mode 100644
index 6f7d9dd450..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
deleted file mode 100644
index 53eb552923..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/pom.xml
deleted file mode 100644
index cc3808161d..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</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>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-binding-ws-axis2</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-host-tomcat</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 4b019b21bf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;

-

-/**

- * This is the business interface of the HelloWorld greetings service.

- */

-@Remotable

-public interface HelloWorldService {

-

-    public String getGreetings(String name);

-}

-

diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
deleted file mode 100644
index ded02f09d6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
deleted file mode 100644
index 10fa7b8652..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
deleted file mode 100644
index 0b4f2399f0..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
deleted file mode 100644
index d1e18d7929..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 068229be6f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
deleted file mode 100644
index 4a14afcd9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/README b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/build.xml
deleted file mode 100644
index 027abae84e..0000000000
--- a/tags/java/sca/1.3/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.3.jar"/>

-            	<include name="tuscany-assembly-1.3.jar"/>

-            	<include name="tuscany-assembly-xml-1.3.jar"/>

-            	<include name="tuscany-binding-feed-1.3.jar"/>

-            	<include name="tuscany-binding-jsonrpc-1.3.jar"/>

-            	<include name="tuscany-binding-sca-1.3.jar"/>

-            	<include name="tuscany-binding-sca-xml-1.3.jar"/>

-            	<include name="tuscany-binding-ws-1.3.jar"/>

-            	<include name="tuscany-binding-ws-axis2-1.3.jar"/>

-            	<include name="tuscany-binding-ws-xml-1.3.jar"/>

-            	<include name="tuscany-contribution-1.3.jar"/>

-            	<include name="tuscany-contribution-impl-1.3.jar"/>

-            	<include name="tuscany-contribution-java-1.3.jar"/>

-            	<include name="tuscany-contribution-namespace-1.3.jar"/>

-            	<include name="tuscany-core-1.3.jar"/>

-            	<include name="tuscany-core-databinding-1.3.jar"/>

-            	<include name="tuscany-core-spi-1.3.jar"/>

-            	<include name="tuscany-databinding-1.3.jar"/>

-            	<include name="tuscany-databinding-axiom-1.3.jar"/>

-            	<include name="tuscany-databinding-jaxb-1.3.jar"/>

-            	<include name="tuscany-databinding-sdo-1.3.jar"/>

-            	<include name="tuscany-distributed-1.3.jar"/>

-            	<include name="tuscany-extension-helper-1.3.jar"/>

-            	<include name="tuscany-host-embedded-1.3.jar"/>

-            	<include name="tuscany-host-http-1.3.jar"/>

-            	<include name="tuscany-host-webapp-1.3.jar"/>

-            	<include name="tuscany-implementation-java-1.3.jar"/>

-            	<include name="tuscany-implementation-java-runtime-1.3.jar"/>

-            	<include name="tuscany-implementation-java-xml-1.3.jar"/>

-            	<include name="tuscany-interface-1.3.jar"/>

-            	<include name="tuscany-interface-java-1.3.jar"/>

-            	<include name="tuscany-interface-java-xml-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-runtime-1.3.jar"/>

-            	<include name="tuscany-interface-wsdl-xml-1.3.jar"/>         	

-            	<include name="tuscany-policy-1.3.jar"/>

-            	<include name="tuscany-policy-xml-1.3.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.3.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.3.jar"/>

-            	<include name="tuscany-sdo-impl-1.3.jar"/>

-            	<include name="tuscany-sdo-lib-1.3.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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/pom.xml
deleted file mode 100644
index 1db2446d4f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 5538677659..0000000000
--- a/tags/java/sca/1.3/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>1.3</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        <!-- TUSCANY-1986 -->
-        <d:inverse-classloading />
-    </d:environment>
-</web-app>
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3f3c92fa78..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service/README b/tags/java/sca/1.3/samples/helloworld-ws-service/README
deleted file mode 100644
index 44dc7ab4e8..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-service/README
+++ /dev/null
@@ -1,141 +0,0 @@
-Hello World Web Service Service Sample
-======================================
-This sample demonstrates an SCA service 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 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.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-Now the server is started you can use the helloworld-ws-reference 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/
-  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
-      resources/
-        wsdl/
-          helloworld.wsdl                 - the service description that describes
-                                            the exposed service
-        helloworldws.composite            - the SCA assembly for this sample
-    test/
-      java/
-        helloworld/
-          HelloWorldServerTestCase.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
-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 helloworld-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 helloworld-ws-service
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldServerTestCase
-14-Jan-2008 14:19:57 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:19:57 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:19:57 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:19:57 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:19:57 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:19:57 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:19:57 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:19:57 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:19:57 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:19:57 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-14-Jan-2008 14:19:57 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:19:58 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:19:58 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:19:58 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:19:58 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:19:58 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-14-Jan-2008 14:19:59 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: 6.75 sec
-
-This shows that the Junit test cases have run successfully. 
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service/build.xml b/tags/java/sca/1.3/samples/helloworld-ws-service/build.xml
deleted file mode 100644
index 46678febc3..0000000000
--- a/tags/java/sca/1.3/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="helloworld-ws-service" default="compile">
-    <property name="test.class" value="helloworld.HelloWorldServer" />
-	<property name="test.jar"   value="sample-helloworld-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/tags/java/sca/1.3/samples/helloworld-ws-service/helloworld-ws-service.png b/tags/java/sca/1.3/samples/helloworld-ws-service/helloworld-ws-service.png
deleted file mode 100644
index eab29d0bcd..0000000000
--- a/tags/java/sca/1.3/samples/helloworld-ws-service/helloworld-ws-service.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service/helloworld-ws-service.svg b/tags/java/sca/1.3/samples/helloworld-ws-service/helloworld-ws-service.svg
deleted file mode 100644
index 61cd93ead9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service/pom.xml b/tags/java/sca/1.3/samples/helloworld-ws-service/pom.xml
deleted file mode 100644
index d8cbda641e..0000000000
--- a/tags/java/sca/1.3/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.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-service</artifactId>
-    <name>Apache Tuscany SCA HelloWorld 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.3</version>
-            <scope>compile</scope>            
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index c37bfcda65..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 7245513b2a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
-    public String getGreetings(String name);
-}
-
diff --git a/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index d767625ae7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/tags/java/sca/1.3/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 454763410c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/tags/java/sca/1.3/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
deleted file mode 100644
index 189332be91..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/README b/tags/java/sca/1.3/samples/implementation-composite/README
deleted file mode 100644
index 27de00e8ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/build.xml b/tags/java/sca/1.3/samples/implementation-composite/build.xml
deleted file mode 100644
index 7aa31aab8b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/implementation-composite.png b/tags/java/sca/1.3/samples/implementation-composite/implementation-composite.png
deleted file mode 100644
index 4c6d71bc03..0000000000
--- a/tags/java/sca/1.3/samples/implementation-composite/implementation-composite.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/implementation-composite/implementation-composite.svg b/tags/java/sca/1.3/samples/implementation-composite/implementation-composite.svg
deleted file mode 100644
index 0e60354aab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/pom.xml b/tags/java/sca/1.3/samples/implementation-composite/pom.xml
deleted file mode 100644
index c3cdafbe49..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index bf743e1797..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/Source.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/Target.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/tags/java/sca/1.3/samples/implementation-composite/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/InnerComposite.composite b/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e675fd3624..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/OuterComposite.composite b/tags/java/sca/1.3/samples/implementation-composite/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/tags/java/sca/1.3/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 9e9a4b44a4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/README b/tags/java/sca/1.3/samples/implementation-crud-extension/README
deleted file mode 100644
index 5e8190648f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/build.xml b/tags/java/sca/1.3/samples/implementation-crud-extension/build.xml
deleted file mode 100644
index 88d308e6fc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/pom.xml b/tags/java/sca/1.3/samples/implementation-crud-extension/pom.xml
deleted file mode 100644
index 57b0ba4964..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
deleted file mode 100644
index b23d85887b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
deleted file mode 100644
index 49be844f93..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
deleted file mode 100644
index fa83c63c1b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
deleted file mode 100644
index cc0795a735..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
deleted file mode 100644
index 2f1e5fcba8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
deleted file mode 100644
index 383a035e69..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
deleted file mode 100644
index b212ee3c9b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
deleted file mode 100644
index 8f11f9d910..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
deleted file mode 100644
index 4566cb7155..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
deleted file mode 100644
index 3cf5de5fa1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 6ce605197a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/tags/java/sca/1.3/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
deleted file mode 100644
index 447e31bf93..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/tags/java/sca/1.3/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
deleted file mode 100644
index 0bb5cfc361..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud-extension/src/test/resources/crud.composite b/tags/java/sca/1.3/samples/implementation-crud-extension/src/test/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/README b/tags/java/sca/1.3/samples/implementation-crud/README
deleted file mode 100644
index 50da631c04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/build.xml b/tags/java/sca/1.3/samples/implementation-crud/build.xml
deleted file mode 100644
index 10b26b5a94..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/implementation-crud.png b/tags/java/sca/1.3/samples/implementation-crud/implementation-crud.png
deleted file mode 100644
index a292037e7a..0000000000
--- a/tags/java/sca/1.3/samples/implementation-crud/implementation-crud.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/implementation-crud/implementation-crud.svg b/tags/java/sca/1.3/samples/implementation-crud/implementation-crud.svg
deleted file mode 100644
index dbb37be208..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/pom.xml b/tags/java/sca/1.3/samples/implementation-crud/pom.xml
deleted file mode 100644
index 73046aefed..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>sample-implementation-crud-extension</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/tags/java/sca/1.3/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
deleted file mode 100644
index ea87cb3001..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/src/main/resources/crud.composite b/tags/java/sca/1.3/samples/implementation-crud/src/main/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/tags/java/sca/1.3/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
deleted file mode 100644
index 7e0476a8b1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/README b/tags/java/sca/1.3/samples/implementation-notification/README
deleted file mode 100644
index 5b59358080..0000000000
--- a/tags/java/sca/1.3/samples/implementation-notification/README
+++ /dev/null
@@ -1,93 +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 do

-

-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/tags/java/sca/1.3/samples/implementation-notification/build.xml b/tags/java/sca/1.3/samples/implementation-notification/build.xml
deleted file mode 100644
index 110c7b84c1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/implementation-notification.png b/tags/java/sca/1.3/samples/implementation-notification/implementation-notification.png
deleted file mode 100644
index 0b7ee34bf7..0000000000
--- a/tags/java/sca/1.3/samples/implementation-notification/implementation-notification.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/implementation-notification/pom.xml b/tags/java/sca/1.3/samples/implementation-notification/pom.xml
deleted file mode 100644
index fee9b56864..0000000000
--- a/tags/java/sca/1.3/samples/implementation-notification/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</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>sample-implementation-notification</artifactId>

-    <name>Apache Tuscany SCA Notification Implementation Sample</name>

-    <version>1.3</version>

-    <description>A sample illustrating use of implementation.notification</description>

-

-    <dependencies>

-        <dependency>

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

-            <artifactId>tuscany-implementation-notification</artifactId>

-            <version>1.3</version>

-        </dependency>

-        <dependency>

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

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.3</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>1.3</version>

-            <scope>test</scope>

-        </dependency>

-        <!-- end -->

-		        

-        <!-- test dependencies -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.2</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <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/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
deleted file mode 100644
index bf8c72e0ce..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
deleted file mode 100644
index 7bbfda2122..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
deleted file mode 100644
index da32bab58d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 2aaae596be..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/tags/java/sca/1.3/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
deleted file mode 100644
index a0bb02e846..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/tags/java/sca/1.3/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/tags/java/sca/1.3/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/tags/java/sca/1.3/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
deleted file mode 100644
index 719141c94b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/tags/java/sca/1.3/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/tags/java/sca/1.3/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/README b/tags/java/sca/1.3/samples/implementation-pojo-extension/README
deleted file mode 100644
index 3b201779e1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/build.xml b/tags/java/sca/1.3/samples/implementation-pojo-extension/build.xml
deleted file mode 100644
index 78bae79859..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/pom.xml b/tags/java/sca/1.3/samples/implementation-pojo-extension/pom.xml
deleted file mode 100644
index 3ad9dd1fb5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.3</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
deleted file mode 100644
index 7c2f5d236f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
deleted file mode 100644
index bbcfb3d0dc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
deleted file mode 100644
index 0dad270a6c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
deleted file mode 100644
index f2d6871039..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
deleted file mode 100644
index 44a2cc0aa8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
deleted file mode 100644
index 87333c61f6..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
deleted file mode 100644
index 73a0d22493..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
deleted file mode 100644
index 22f2be09e9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index b30ea3b9cf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
deleted file mode 100644
index 075af98240..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
deleted file mode 100644
index c9d170770b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0580e30aba..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
deleted file mode 100644
index 69ab1f567e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index d8b5f41adc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
deleted file mode 100644
index a92c5ab8db..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index c38094dfc9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/loanapplication/pom.xml b/tags/java/sca/1.3/samples/loanapplication/pom.xml
deleted file mode 100644
index de83d40a02..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
deleted file mode 100644
index 4fedb70782..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
deleted file mode 100644
index 5183ece867..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
deleted file mode 100644
index 7e4438bbff..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
deleted file mode 100644
index b06d9465a2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanService.java
deleted file mode 100644
index 9dfd8b42fe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/tags/java/sca/1.3/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
deleted file mode 100644
index 76a53323bd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/loanapplication/src/main/resources/loanapplication.composite b/tags/java/sca/1.3/samples/loanapplication/src/main/resources/loanapplication.composite
deleted file mode 100644
index 3aa8d030b7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/tags/java/sca/1.3/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
deleted file mode 100644
index e88e48a53a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/README b/tags/java/sca/1.3/samples/osgi-supplychain/README
deleted file mode 100644
index 11fecf2ae8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/build-bundles.xml b/tags/java/sca/1.3/samples/osgi-supplychain/build-bundles.xml
deleted file mode 100644
index 7a31e6016b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/build.xml b/tags/java/sca/1.3/samples/osgi-supplychain/build.xml
deleted file mode 100644
index 2e103e5a15..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/osgi-supplychain.png b/tags/java/sca/1.3/samples/osgi-supplychain/osgi-supplychain.png
deleted file mode 100644
index 2bec57ac8a..0000000000
--- a/tags/java/sca/1.3/samples/osgi-supplychain/osgi-supplychain.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/osgi-supplychain/osgi-supplychain.svg b/tags/java/sca/1.3/samples/osgi-supplychain/osgi-supplychain.svg
deleted file mode 100644
index 43cb427944..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/pom.xml b/tags/java/sca/1.3/samples/osgi-supplychain/pom.xml
deleted file mode 100644
index 84d5fdf6f5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index 5f40054ada..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 64814487cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 023d716651..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index a1c7fce60a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index 4647a716c7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index d0d29f94f8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 1b7fb15bf1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index e97331c06c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 4206ce7dc8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 0f88cca213..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index f55a068ede..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index 72eec76cc2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 600f3f0c74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index b8bca97bd0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Customer.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Customer.componentType
deleted file mode 100644
index 5c61a0961c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
deleted file mode 100644
index 87a184d968..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
deleted file mode 100644
index 872ab6601a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
deleted file mode 100644
index 57fcbbc5d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
deleted file mode 100644
index 75fa8029f7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Retailer.componentType
deleted file mode 100644
index 15185f2bf9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Shipper.componentType
deleted file mode 100644
index 675597d80b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
deleted file mode 100644
index 6e1ac3e5a9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 88d79e5219..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index d95ef5d582..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index de7ac7ec7a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 21241a6899..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
deleted file mode 100644
index b5c5a862be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
deleted file mode 100644
index 5b368afd5b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
deleted file mode 100644
index 47897d16ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
deleted file mode 100644
index cae7fdfde2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
deleted file mode 100644
index f5333c7caa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
deleted file mode 100644
index d894309b71..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
deleted file mode 100644
index 6166549e5a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
deleted file mode 100644
index fc86a76784..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/supplychain.composite b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 0bbfed9176..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/tags/java/sca/1.3/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
deleted file mode 100644
index d1e11168e2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/tags/java/sca/1.3/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index ff15c0d9a2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/pom.xml b/tags/java/sca/1.3/samples/pom.xml
deleted file mode 100644
index 5618985641..0000000000
--- a/tags/java/sca/1.3/samples/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>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-samples</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Samples</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>binding-echo</module>
-                <module>binding-echo-extension</module>
-                <module>binding-notification-broker</module>
-                <module>binding-notification-consumer</module>
-                <module>binding-notification-producer</module>
-                <module>calculator</module>
-                <module>calculator-distributed</module>
-		<module>calculator-implementation-policies</module>
-                <module>calculator-rmi-reference</module>
-                <module>calculator-rmi-service</module>
-                <module>calculator-script</module>
-                <module>calculator-webapp</module>
-                <module>calculator-ws-secure-webapp</module>
-                <module>calculator-ws-webapp</module>
-                <module>callback-ws-client</module>
-                <module>callback-ws-service</module>
-                <module>chat-webapp</module>
-                <module>databinding-echo</module>
-                <!--module>domain-webapp</module-->
-                <module>domain-management</module>
-                <module>feed-aggregator</module>
-                <module>feed-aggregator-webapp</module>
-                <module>helloworld-bpel</module>
-                <module>helloworld-dojo-webapp</module>
-                <module>helloworld-jms-webapp</module>
-                <module>helloworld-jsonrpc-webapp</module>
-                <module>helloworld-reference-jms</module>
-                <module>helloworld-service-jms</module>
-                <module>helloworld-ws-service</module>
-                <module>helloworld-ws-service-jms</module>
-                <module>helloworld-ws-service-secure</module>
-                <module>helloworld-ws-reference</module>
-                <module>helloworld-ws-reference-jms</module>
-                <module>helloworld-ws-reference-secure</module>
-                <module>helloworld-ws-sdo</module>
-                <module>helloworld-ws-sdo-webapp</module>
-                <module>implementation-composite</module>
-                <module>implementation-crud</module>
-                <module>implementation-crud-extension</module>
-                <module>implementation-notification</module>
-                <module>implementation-pojo-extension</module>
-                <module>loanapplication</module>
-                <module>osgi-supplychain</module>
-                <module>quote-xquery</module>
-                <module>simple-bigbank</module>
-                <module>simple-bigbank-spring</module>
-                <module>simple-callback</module>
-                <module>simple-callback-ws</module>
-                <module>store</module>
-                <module>supplychain</module>
-                <module>web-resource</module>
-                <module>zipcode-jaxws</module>
-            </modules>
-        </profile>
-    </profiles>
-    
-</project>
diff --git a/tags/java/sca/1.3/samples/quote-xquery/README b/tags/java/sca/1.3/samples/quote-xquery/README
deleted file mode 100644
index cf8a4609a6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/build.xml b/tags/java/sca/1.3/samples/quote-xquery/build.xml
deleted file mode 100644
index a3a5acf102..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/pom.xml b/tags/java/sca/1.3/samples/quote-xquery/pom.xml
deleted file mode 100644
index b7e2420a0a..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</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>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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</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>
-        <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-incubating</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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
deleted file mode 100644
index 8a42136b5d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(AvailQuoteProviderService.class)
-public class AvailQuoteProviderImpl implements AvailQuoteProviderService {
-
-    public AvailQuote provideAvailQuote(String dummyString) {
-        return QuoteDataUtil.buildAvailQuoteData();
-    }
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
deleted file mode 100644
index 41d78683cc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderNodeInfo {
-    NodeInfo provideAvailQuote(String dummyString);
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
deleted file mode 100644
index f744a59744..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface AvailQuoteProviderService {
-    AvailQuote provideAvailQuote(String dummyString);
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
deleted file mode 100644
index 374c0825e9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ExternalReferencesQuoteJoin {
-    public Quote joinPriceAndAvailQuotes(float taxRate);
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
deleted file mode 100644
index fbe38b8269..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PriceQuoteProvider {
-
-    public PriceQuote providePriceQuote();
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
deleted file mode 100644
index d2d175430b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
deleted file mode 100644
index 06c3945a6e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PriceQuoteProviderNodeInfo {
-    public NodeInfo providePriceQuote();
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
deleted file mode 100644
index 1ecdf120c2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface PropertiesQuoteJoin {
-    @RequestWrapper(className="xquery.quote.joinPriceAndAvailQuotes")
-    @ResponseWrapper(className="xquery.quote.joinPriceAndAvailQuotesResponse")
-    public Quote joinPriceAndAvailQuotes();
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
deleted file mode 100644
index 85508eaa46..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface QuoteCalculator {
-    public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder);
-}
diff --git a/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
deleted file mode 100644
index 26331381a8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
deleted file mode 100644
index 8ed02dc1ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
deleted file mode 100644
index 425867055b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
deleted file mode 100644
index cfd201f883..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
deleted file mode 100644
index 20fe73fd92..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
deleted file mode 100644
index adc852acd4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java b/tags/java/sca/1.3/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
deleted file mode 100644
index 3fa3cdb637..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
deleted file mode 100644
index d504f40f04..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
deleted file mode 100644
index cc50da164a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
deleted file mode 100644
index cf41ab528d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
deleted file mode 100644
index e7f3e67068..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
deleted file mode 100644
index 4c437586ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
deleted file mode 100644
index 4f64850056..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
deleted file mode 100644
index 96c2af138a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/xqueryquotews.composite
deleted file mode 100644
index 9e35e2ecb2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/tags/java/sca/1.3/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
deleted file mode 100644
index 35306b9f89..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/tags/java/sca/1.3/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
deleted file mode 100644
index 9555532b3e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/tags/java/sca/1.3/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
deleted file mode 100644
index 9a4be5bda6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank-spring/README b/tags/java/sca/1.3/samples/simple-bigbank-spring/README
deleted file mode 100644
index 900a006141..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/README
+++ /dev/null
@@ -1,99 +0,0 @@
-Spring Bigbank 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-spring.jar bigbank.client.BigBankClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-bigbank-spring.jar bigbank.client.BigBankClient
-
-
-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/tags/java/sca/1.3/samples/simple-bigbank-spring/build.xml b/tags/java/sca/1.3/samples/simple-bigbank-spring/build.xml
deleted file mode 100644
index ecc2596d71..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank-spring/pom.xml b/tags/java/sca/1.3/samples/simple-bigbank-spring/pom.xml
deleted file mode 100644
index d96510ea21..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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>1.3</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-host-embedded</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/simple-bigbank-spring/simple-bigbank-spring.png b/tags/java/sca/1.3/samples/simple-bigbank-spring/simple-bigbank-spring.png
deleted file mode 100644
index 593c047f6a..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/tags/java/sca/1.3/samples/simple-bigbank-spring/simple-bigbank-spring.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index ae9071445d..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.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 bigbank.account;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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 {
-
-    private AccountDataService accountDataService;
-    
-    private StockQuoteService stockQuoteService;
-    
-    private 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;
-    }
-
-    public AccountDataService getAccountDataService() {
-        return accountDataService;
-    }
-
-    public void setAccountDataService(AccountDataService accountDataService) {
-        this.accountDataService = accountDataService;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public StockQuoteService getStockQuoteService() {
-        return stockQuoteService;
-    }
-
-    public void setStockQuoteService(StockQuoteService stockQuoteService) {
-        this.stockQuoteService = stockQuoteService;
-    }
-}
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
deleted file mode 100644
index a5ae7b3955..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index c354de387b..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 000acb935c..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 11bdff757e..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index b791024076..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 86246a3f84..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index edbf910d37..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 0512d40b0b..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index 2d97b57066..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
-
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
deleted file mode 100644
index 2d882472fb..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.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.    
--->
-<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.springframework.org/schema/sca/spring-sca.xsd">
-
-    <sca:service name="AccountService"
-		type="bigbank.account.AccountService" target="AccountServiceBean"/>
-
-    <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">
-        <property name="accountDataService" ref="AccountDataServiceBean"/>
-        <property name="stockQuoteService" ref="stockQuoteService"/>
-        <property name="currency" value="USD"/>
-    </bean>
-
-    <bean id="AccountDataServiceBean" class="bigbank.accountdata.AccountDataServiceImpl">
-    </bean>
-
-    <sca:reference name="stockQuoteService"
-		type="bigbank.stockquote.StockQuoteService"/>
-
-</beans>
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
deleted file mode 100644
index 29d4a2d5a3..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://bigbank"
-	xmlns:s="http://stockquote"
-	name="BigBank">
-
-    <component name="AccountServiceComponent">
-        <implementation.spring location="Account-spring-context.xml"/>
-        <reference name="stockQuoteService" target="StockQuoteServiceComponent"/>
-    </component>
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.composite name="s:StockQuote"/>
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
deleted file mode 100644
index 26bdc59075..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/main/resources/StockQuote.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://stockquote"
-    name="StockQuote">
-
-    <service name="StockQuoteService" promote="StockQuoteServiceComponent"/>
-
-    <component name="StockQuoteServiceComponent">
-        <implementation.java class="bigbank.stockquote.StockQuoteImpl" />
-    </component>
-
-</composite>
diff --git a/tags/java/sca/1.3/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/tags/java/sca/1.3/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index ba6c1dd797..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank-spring/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/tags/java/sca/1.3/samples/simple-bigbank/README b/tags/java/sca/1.3/samples/simple-bigbank/README
deleted file mode 100644
index acbe93a4d3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/build.xml b/tags/java/sca/1.3/samples/simple-bigbank/build.xml
deleted file mode 100644
index a814014eae..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/pom.xml b/tags/java/sca/1.3/samples/simple-bigbank/pom.xml
deleted file mode 100644
index 2abc8f9221..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/simple-bigbank/simple-bigbank.png b/tags/java/sca/1.3/samples/simple-bigbank/simple-bigbank.png
deleted file mode 100644
index 2aab2c93ea..0000000000
--- a/tags/java/sca/1.3/samples/simple-bigbank/simple-bigbank.png
+++ /dev/null
@@ -1,2 +0,0 @@
-‰PNG

-‰PNG1.3

diff --git a/tags/java/sca/1.3/samples/simple-bigbank/simple-bigbank.svg b/tags/java/sca/1.3/samples/simple-bigbank/simple-bigbank.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index fa85f309c0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
deleted file mode 100644
index a5ae7b3955..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index c354de387b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 000acb935c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 11bdff757e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index b791024076..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 86246a3f84..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index edbf910d37..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 0512d40b0b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/tags/java/sca/1.3/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index 7961279352..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
-    public double getQuote(String symbol);
-}
-
diff --git a/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/Account.composite b/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/Account.composite
deleted file mode 100644
index e71615e27e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/BigBank.composite b/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index c870f39cab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/StockQuote.composite b/tags/java/sca/1.3/samples/simple-bigbank/src/main/resources/StockQuote.composite
deleted file mode 100644
index 4f29c14851..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/tags/java/sca/1.3/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index ba6c1dd797..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/README b/tags/java/sca/1.3/samples/simple-callback-ws/README
deleted file mode 100644
index 6b27718f74..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/build.xml b/tags/java/sca/1.3/samples/simple-callback-ws/build.xml
deleted file mode 100644
index 10b69bd395..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/pom.xml b/tags/java/sca/1.3/samples/simple-callback-ws/pom.xml
deleted file mode 100644
index db8a46672c..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/simple-callback-ws/simple-callback-ws.png b/tags/java/sca/1.3/samples/simple-callback-ws/simple-callback-ws.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/tags/java/sca/1.3/samples/simple-callback-ws/simple-callback-ws.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/simple-callback-ws/simple-callback-ws.svg b/tags/java/sca/1.3/samples/simple-callback-ws/simple-callback-ws.svg
deleted file mode 100644
index 7d9e3de510..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index ad7c6d8fef..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index 48acc0e94f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index 66cfb2bc8a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index 08057d2fcc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index eeb0e52163..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/resources/simplecallback.composite
deleted file mode 100644
index 53e7fe66af..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/tags/java/sca/1.3/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
deleted file mode 100644
index 8a6465de3a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/tags/java/sca/1.3/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index 580a7f6b0c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/README b/tags/java/sca/1.3/samples/simple-callback/README
deleted file mode 100644
index 719376f254..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/build.xml b/tags/java/sca/1.3/samples/simple-callback/build.xml
deleted file mode 100644
index 47d1ea4bc1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/pom.xml b/tags/java/sca/1.3/samples/simple-callback/pom.xml
deleted file mode 100644
index 91b3563547..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/simple-callback/simple-callback.png b/tags/java/sca/1.3/samples/simple-callback/simple-callback.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/tags/java/sca/1.3/samples/simple-callback/simple-callback.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/simple-callback/simple-callback.svg b/tags/java/sca/1.3/samples/simple-callback/simple-callback.svg
deleted file mode 100644
index 484b65df9d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index 3e2a1df5a5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyService.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index e78ad6f68f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index b27eea44f5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index fc5e31d14e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/tags/java/sca/1.3/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index b8987fcd07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/src/main/resources/simplecallback.composite b/tags/java/sca/1.3/samples/simple-callback/src/main/resources/simplecallback.composite
deleted file mode 100644
index 33e6f60601..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/tags/java/sca/1.3/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index cbaab8af83..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/pom.xml b/tags/java/sca/1.3/samples/spi-implementation-pojo/pom.xml
deleted file mode 100644
index 59498b9008..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
deleted file mode 100644
index 73104c3166..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
deleted file mode 100644
index 43efae32ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
deleted file mode 100644
index d65d4c8e4a..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
deleted file mode 100644
index 198befa928..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
deleted file mode 100644
index 95ee37c1aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 02af1ccf22..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 5813fda330..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.3/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index fa9cecc160..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/README b/tags/java/sca/1.3/samples/store/README
deleted file mode 100644
index d4797618ff..0000000000
--- a/tags/java/sca/1.3/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://incubator.apache.org/tuscany/getting-started-with-tuscany.html
-
-or
-
-http://incubator.apache.org/tuscany/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/tags/java/sca/1.3/samples/store/build.xml b/tags/java/sca/1.3/samples/store/build.xml
deleted file mode 100644
index 652afc3570..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/pom.xml b/tags/java/sca/1.3/samples/store/pom.xml
deleted file mode 100644
index 53bd756d50..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/store/src/main/java/launch/Launch.java b/tags/java/sca/1.3/samples/store/src/main/java/launch/Launch.java
deleted file mode 100644
index 801697abea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/src/main/java/services/Cart.java b/tags/java/sca/1.3/samples/store/src/main/java/services/Cart.java
deleted file mode 100644
index 9e6226d963..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/tags/java/sca/1.3/samples/store/src/main/java/services/Catalog.java b/tags/java/sca/1.3/samples/store/src/main/java/services/Catalog.java
deleted file mode 100644
index 2c3b19f579..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/tags/java/sca/1.3/samples/store/src/main/java/services/CurrencyConverter.java b/tags/java/sca/1.3/samples/store/src/main/java/services/CurrencyConverter.java
deleted file mode 100644
index e104a0423a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/tags/java/sca/1.3/samples/store/src/main/java/services/CurrencyConverterImpl.java b/tags/java/sca/1.3/samples/store/src/main/java/services/CurrencyConverterImpl.java
deleted file mode 100644
index c354aed447..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/src/main/java/services/FruitsCatalogImpl.java b/tags/java/sca/1.3/samples/store/src/main/java/services/FruitsCatalogImpl.java
deleted file mode 100644
index 377b3d7e59..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/store/src/main/java/services/Item.java b/tags/java/sca/1.3/samples/store/src/main/java/services/Item.java
deleted file mode 100644
index 27abd4f016..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/src/main/java/services/ShoppingCartImpl.java b/tags/java/sca/1.3/samples/store/src/main/java/services/ShoppingCartImpl.java
deleted file mode 100644
index 9889921a96..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/store/src/main/java/services/Total.java b/tags/java/sca/1.3/samples/store/src/main/java/services/Total.java
deleted file mode 100644
index 8f464e526f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/tags/java/sca/1.3/samples/store/src/main/resources/store.composite b/tags/java/sca/1.3/samples/store/src/main/resources/store.composite
deleted file mode 100644
index 571678839d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/store/src/main/resources/uiservices/store.html b/tags/java/sca/1.3/samples/store/src/main/resources/uiservices/store.html
deleted file mode 100644
index 095570f949..0000000000
--- a/tags/java/sca/1.3/samples/store/src/main/resources/uiservices/store.html
+++ /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.    
--->
-<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) {
-		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) {			
-				shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total) {
-		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() {
-		catalog.get(catalog_getResponse);
-		shoppingCart.get("", shoppingCart_getResponse);
-	}
-	
-</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/tags/java/sca/1.3/samples/store/store.png b/tags/java/sca/1.3/samples/store/store.png
deleted file mode 100644
index da413edeee..0000000000
--- a/tags/java/sca/1.3/samples/store/store.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/store/store.svg b/tags/java/sca/1.3/samples/store/store.svg
deleted file mode 100644
index 74f8ecd36d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/README b/tags/java/sca/1.3/samples/supplychain/README
deleted file mode 100644
index ea4493fdd4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/build.xml b/tags/java/sca/1.3/samples/supplychain/build.xml
deleted file mode 100644
index 506180b8b1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/pom.xml b/tags/java/sca/1.3/samples/supplychain/pom.xml
deleted file mode 100644
index f1c9eb8ece..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Customer.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Customer.java
deleted file mode 100644
index 8088001898..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
deleted file mode 100644
index 7a1e8553ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Retailer.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Retailer.java
deleted file mode 100644
index 1add63fb4e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
deleted file mode 100644
index f622052cf8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Shipper.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Shipper.java
deleted file mode 100644
index d4d49a922b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
deleted file mode 100644
index 4ae52a12a2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 7072f582d1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Warehouse.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/Warehouse.java
deleted file mode 100644
index 0be499f569..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/tags/java/sca/1.3/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
deleted file mode 100644
index b5e256a1e0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/samples/supplychain/src/main/resources/supplychain.composite b/tags/java/sca/1.3/samples/supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 301efcaf1f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/tags/java/sca/1.3/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index 88e0eb7ab8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/supplychain/supplychain.png b/tags/java/sca/1.3/samples/supplychain/supplychain.png
deleted file mode 100644
index 51a384e827..0000000000
--- a/tags/java/sca/1.3/samples/supplychain/supplychain.png
+++ /dev/null
diff --git a/tags/java/sca/1.3/samples/supplychain/supplychain.svg b/tags/java/sca/1.3/samples/supplychain/supplychain.svg
deleted file mode 100644
index f72e77acab..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/README b/tags/java/sca/1.3/samples/web-resource/README
deleted file mode 100644
index 56bffba6a3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/build.xml b/tags/java/sca/1.3/samples/web-resource/build.xml
deleted file mode 100644
index 5f6b6091e7..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/pom.xml b/tags/java/sca/1.3/samples/web-resource/pom.xml
deleted file mode 100644
index 135cc8bd9e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/samples/web-resource/src/main/java/web/resource/SampleServer.java b/tags/java/sca/1.3/samples/web-resource/src/main/java/web/resource/SampleServer.java
deleted file mode 100644
index 9410de08c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/src/main/resources/WebResource.composite b/tags/java/sca/1.3/samples/web-resource/src/main/resources/WebResource.composite
deleted file mode 100644
index 4536136a8b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/src/main/resources/myContent/index.html b/tags/java/sca/1.3/samples/web-resource/src/main/resources/myContent/index.html
deleted file mode 100644
index 55de048373..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/web-resource/web-resource.png b/tags/java/sca/1.3/samples/web-resource/web-resource.png
deleted file mode 100644
index 2aab2c93ea..0000000000
--- a/tags/java/sca/1.3/samples/web-resource/web-resource.png
+++ /dev/null
@@ -1,2 +0,0 @@
-‰PNG

-‰PNG1.3

diff --git a/tags/java/sca/1.3/samples/web-resource/web-resource.svg b/tags/java/sca/1.3/samples/web-resource/web-resource.svg
deleted file mode 100644
index 0d1257316c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/LICENSE b/tags/java/sca/1.3/samples/zipcode-jaxws/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/NOTICE b/tags/java/sca/1.3/samples/zipcode-jaxws/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/samples/zipcode-jaxws/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/tags/java/sca/1.3/samples/zipcode-jaxws/README b/tags/java/sca/1.3/samples/zipcode-jaxws/README
deleted file mode 100644
index 12f81543f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/build.xml b/tags/java/sca/1.3/samples/zipcode-jaxws/build.xml
deleted file mode 100644
index ab8d704352..0000000000
--- a/tags/java/sca/1.3/samples/zipcode-jaxws/build.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.
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>    
-
-<project name="sample-jaxws" 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"/>
-        </copy>
-        <jar destfile="target/sample-zipcode-jaxws.jar" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="zipcode.ZipCodeClient"/>
-            </manifest>
-        </jar>
-    </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/tags/java/sca/1.3/samples/zipcode-jaxws/pom.xml b/tags/java/sca/1.3/samples/zipcode-jaxws/pom.xml
deleted file mode 100644
index 548c13ccfe..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</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="${basedir}/src/main/resources/wsdl/" />
-                                <get src="http://www.webservicex.net/uszip.asmx?wsdl"
-                                    dest="${basedir}/src/main/resources/wsdl/uszip.wsdl" verbose="true"
-                                    usetimestamp="true" />
-                                <get src="http://www.webservicex.net/WeatherForecast.asmx?wsdl"
-                                    dest="${basedir}/src/main/resources/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>1.3</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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCode.java
deleted file mode 100644
index 8c9a48bf40..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByAreaCodeResponse.java
deleted file mode 100644
index 93847c8809..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCity.java
deleted file mode 100644
index cf9276d417..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByCityResponse.java
deleted file mode 100644
index 9dc0e41b2b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByState.java
deleted file mode 100644
index 48be94b14a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByStateResponse.java
deleted file mode 100644
index 1645e11ca2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIP.java
deleted file mode 100644
index 45c948b4b4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/GetInfoByZIPResponse.java
deleted file mode 100644
index 9e78dc6d0a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/ObjectFactory.java
deleted file mode 100644
index ced83ff09a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZip.java
deleted file mode 100644
index 22493ba9b8..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/USZipSoap.java
deleted file mode 100644
index 5ac370005f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/uszip/package-info.java
deleted file mode 100644
index d120f34ee5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/ArrayOfWeatherData.java
deleted file mode 100644
index 5385fb57be..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceName.java
deleted file mode 100644
index 9eb205e75d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByPlaceNameResponse.java
deleted file mode 100644
index e281509623..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCode.java
deleted file mode 100644
index 08d4a70364..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/GetWeatherByZipCodeResponse.java
deleted file mode 100644
index 9288f5332e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/ObjectFactory.java
deleted file mode 100644
index 0c4fdbcde1..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherData.java
deleted file mode 100644
index a4ca6190b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecast.java
deleted file mode 100644
index 0902ce67fe..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecastSoap.java
deleted file mode 100644
index aa000a44d2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/WeatherForecasts.java
deleted file mode 100644
index 8ded0946d9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/com/example/weather/package-info.java
deleted file mode 100644
index 6543ed7abf..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/location/LocationClient.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/location/LocationClient.java
deleted file mode 100644
index 35c114093a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/location/USLocationImpl.java
deleted file mode 100644
index cf27332e60..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastClient.java
deleted file mode 100644
index c03cf2955f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/weather/WeatherForecastImpl.java
deleted file mode 100644
index cf50a6cd9e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.java
deleted file mode 100644
index c470230b7a..0000000000
--- a/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeClient.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 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 {
-
-        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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeService.java
deleted file mode 100644
index ec0f05dd6c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface ZipCodeService {
-    String lookup(String zipCode);
-}
diff --git a/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/java/zipcode/ZipCodeServiceImpl.java
deleted file mode 100644
index 284e5a3aa3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/USLocation.composite b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/USLocation.composite
deleted file mode 100644
index a171fe62c9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/WeatherForecast.composite
deleted file mode 100644
index 0e1b118e44..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/ZipCode.composite b/tags/java/sca/1.3/samples/zipcode-jaxws/src/main/resources/ZipCode.composite
deleted file mode 100644
index 28d674c29b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java b/tags/java/sca/1.3/samples/zipcode-jaxws/src/test/java/zipcode/ZipCodeClientTestCase.java
deleted file mode 100644
index 019fce26d6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/features/feature/.project b/tags/java/sca/1.3/tools/eclipse/features/feature/.project
deleted file mode 100644
index 4c25cefc21..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<projectDescription>
-  <name>org.apache.tuscany.sca.feature</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.pde.FeatureBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.validation.validationbuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.pde.FeatureNature</nature>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/tools/eclipse/features/feature/LICENSE b/tags/java/sca/1.3/tools/eclipse/features/feature/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/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/tags/java/sca/1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF b/tags/java/sca/1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF
deleted file mode 100644
index d03761079c..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Tools

-Bundle-SymbolicName: org.apache.tuscany.sca.feature

-Bundle-Version: 1.3.0

-Bundle-Vendor: Apache Software Foundation

diff --git a/tags/java/sca/1.3/tools/eclipse/features/feature/NOTICE b/tags/java/sca/1.3/tools/eclipse/features/feature/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/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/tags/java/sca/1.3/tools/eclipse/features/feature/build.properties b/tags/java/sca/1.3/tools/eclipse/features/feature/build.properties
deleted file mode 100644
index ff6f2b6235..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = feature.xml,\
-               NOTICE,\
-               LICENSE,\
-               DISCLAIMER,\
-               META-INF/
-src.includes = .project,\
-               DISCLAIMER,\
-               LICENSE,\
-               NOTICE,\
-               build.properties,\
-               feature.xml,\
-               META-INF/
diff --git a/tags/java/sca/1.3/tools/eclipse/features/feature/feature.xml b/tags/java/sca/1.3/tools/eclipse/features/feature/feature.xml
deleted file mode 100644
index 92a0b6a576..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/feature.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.    
--->
-<feature
-      id="org.apache.tuscany.sca.feature"
-      label="Apache Tuscany SCA Tools"
-      version="1.3.0"
-      provider-name="Apache Software Foundation">
-   <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
-
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Tools.
-   </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.swt"/>
-      <import plugin="org.eclipse.osgi"/>
-   </requires>
-
-   <plugin
-         id="org.apache.tuscany.sca.core"
-         download-size="0"
-         install-size="0"
-         version="1.3.0"
-         unpack="false"/>
-
-   <data
-         id="runtime/apache-tuscany-sca-1.3.jar"
-         download-size="0"
-         install-size="0"/>
-
-   <data
-         id="src/apache-tuscany-sca-1.3-src.zip"
-         download-size="0"
-         install-size="0"/>
-
-</feature>
diff --git a/tags/java/sca/1.3/tools/eclipse/features/feature/pom.xml b/tags/java/sca/1.3/tools/eclipse/features/feature/pom.xml
deleted file mode 100644
index 673d4afff8..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/features/feature/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>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.feature</artifactId>
-    <name>Apache Tuscany SCA Eclipse Tools 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/tags/java/sca/1.3/tools/eclipse/plugins/core/.classpath b/tags/java/sca/1.3/tools/eclipse/plugins/core/.classpath
deleted file mode 100644
index fd5bc59a28..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/.classpath
+++ /dev/null
@@ -1,56 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="."/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/ui/3.2.100-v20070531-1800/ui-3.2.100-v20070531-1800.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/ide/3.3.0-I20070531-1800/ide-3.3.0-I20070531-1800.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/resources/3.3.0-v20070530/resources-3.3.0-v20070530.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/expressions/3.3.0-v20070531-1300/expressions-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/runtime/3.3.100-v20070530/runtime-3.3.100-v20070530.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/osgi/3.3.0-v20070530/osgi-3.3.0-v20070530.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/common/3.3.0-v20070426/common-3.3.0-v20070426.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/jobs/3.3.0-v20070423/jobs-3.3.0-v20070423.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/registry/3.3.0-v20070522/registry-3.3.0-v20070522.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/preferences/3.2.100-v20070522/preferences-3.2.100-v20070522.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/contenttype/3.2.100-v20070319/contenttype-3.2.100-v20070319.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/app/1.0.0-v20070423/app-1.0.0-v20070423.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/filesystem/1.1.0-v20070510/filesystem-1.1.0-v20070510.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/help/3.3.0-v20070524/help-3.3.0-v20070524.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/3.3.0-I20070601-1200/ui-3.3.0-I20070601-1200.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/swt/3.3.0-v3345b/swt-3.3.0-v3345b.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/3.3.0-I20070601-1200/jface-3.3.0-I20070601-1200.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/commands/3.3.0-I20070523-1500/commands-3.3.0-I20070523-1500.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/workbench/3.3.0-I20070601-0010/workbench-3.3.0-I20070601-0010.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/databinding/1.1.0-I20070530-0100/databinding-1.1.0-I20070530-0100.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/databinding/1.0.0-I20070530-0100/databinding-1.0.0-I20070530-0100.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/3.2.100-I20070319-0010/views-3.2.100-I20070319-0010.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/update/configurator/3.2.100-v20070507/configurator-3.2.100-v20070507.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/update/core/3.2.100-v20070522/core-3.2.100-v20070522.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/net/1.0.0-I20070531/net-1.0.0-I20070531.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/update/ui/3.2.100-v20070601a/ui-3.2.100-v20070601a.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/forms/3.3.0-v20070511/forms-3.3.0-v20070511.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/text/3.3.0-v20070531-1300/text-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/text/3.3.0-v20070531-1300/text-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/workbench/texteditor/3.3.0-v20070531-1300/texteditor-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/editors/3.3.0-v20070531-1300/editors-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/filebuffers/3.3.0-v20070531-1300/filebuffers-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/core/variables/3.2.0-v20070426/variables-3.2.0-v20070426.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.3.0-v_768/core-3.3.0-v_768.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/debug/ui/3.3.0-v20070531-1800/ui-3.3.0-v20070531-1800.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/console/3.2.0-v20070530/console-3.2.0-v20070530.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/debug/core/3.3.0-v20070531-1800/core-3.3.0-v20070531-1800.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/3.3.0-v20070530a/debug-3.3.0-v20070530a.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/launching/3.3.0-v20070510/launching-3.3.0-v20070510.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/ui/3.3.0-v20070531-1300/ui-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/search/3.3.0-v20070531-1300/search-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/compare/3.3.0-I20070528/compare-3.3.0-I20070528.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/team/ui/3.3.0-I20070524/ui-3.3.0-I20070524.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/team/core/3.2.100-I20070531/core-3.2.100-I20070531.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/3.3.0-I20070531-1800/navigator-3.3.0-I20070531-1800.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/resources/3.2.100-I20070530-0100/resources-3.2.100-I20070530-0100.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/properties/tabbed/3.2.100-I20070424-0010/tabbed-3.2.100-I20070424-0010.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/core/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/ui/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/manipulation/1.1.0-v20070531-1300/manipulation-1.1.0-v20070531-1300.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/swt/win32/win32/x86/3.3.0-v3346/x86-3.3.0-v3346.jar"/>
-</classpath>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/.project b/tags/java/sca/1.3/tools/eclipse/plugins/core/.project
deleted file mode 100644
index fa874620ec..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/.project
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
-  <name>org.apache.tuscany.sca.core</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/LICENSE b/tags/java/sca/1.3/tools/eclipse/plugins/core/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/tags/java/sca/1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
deleted file mode 100644
index 8e26c57699..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Tools

-Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true

-Bundle-Version: 1.3.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

diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/NOTICE b/tags/java/sca/1.3/tools/eclipse/plugins/core/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/NOTICE
+++ /dev/null
@@ -1,12 +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 SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/build.properties b/tags/java/sca/1.3/tools/eclipse/plugins/core/build.properties
deleted file mode 100644
index 453eef1615..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               DISCLAIMER,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               DISCLAIMER,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
deleted file mode 100644
index 700d056838..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.apache.tuscany.sca.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.apache.tuscany.sca.core" id="runtimeLibraries" name="Tuscany Runtime Libraries"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <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="classpathContainer">
-      <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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/t.gif b/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/t.gif
deleted file mode 100644
index ba896ced08..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/t.gif
+++ /dev/null
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/tuscany.gif b/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/tuscany.gif
deleted file mode 100644
index 849dd76d4a..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/icons/tuscany.gif
+++ /dev/null
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
deleted file mode 100644
index df7f81b44d..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.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.core.classpath;

-

-import static org.apache.tuscany.sca.core.log.LogUtil.error;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jdt.core.IClasspathContainer;

-import org.eclipse.jdt.core.IClasspathEntry;

-

-/**

- * Utility functions to help determine the runtime classpath.

- *

- * @version $Rev: $ $Date: $

- */

-public class ClasspathUtil {

-

-    private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";

-

-    private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";

-    private static final String TUSCANY_VERSION = "1.3.0";

-    

-    /**

-     * 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(TUSCANY_RUNTIME_LIBRARIES).getExtensions()) {

-            for (IConfigurationElement configuration: extension.getConfigurationElements()) {

-                IClasspathContainer container = (IClasspathContainer)configuration.createExecutableExtension("class");

-                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();

-    }

-

-    /**

-     * Returns the Tuscany feature location.

-     *  

-     * @return

-     */

-    static IPath feature() {

-        try {

-            URL location = Platform.getInstallLocation().getURL();

-            File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);

-            return new Path(feature.getPath());

-        } catch (Exception e) {

-            error("Tuscany runtime feature not found", e);

-            return null;

-        }

-    }

-

-    /**

-     * Returns the location of the runtime distribution under the Tuscany feature.

-     * 

-     * @param feature

-     * @return

-     */

-    static IPath runtime(IPath feature) {

-        IPath runtimePath = null;

-        try {

-            

-            // Find the Tuscany distribution under the feature's runtime directory

-            // Typically runtime/distro-archive-name/un-archived-distro-dir

-            File file = new File(feature.toFile(), "runtime");

-            if (file.exists()) {

-                File distro = null;

-                for (File f: file.listFiles()) {

-                    if (f.getName().contains("tuscany-sca")) {

-                        distro = f;

-                        break;

-                    }

-                }

-                if (distro != null) {

-                    for (File f: distro.listFiles()) {

-                        if (f.getName().contains("tuscany-sca")) {

-                            runtimePath = new Path(f.getPath());

-                            break;

-                        }

-                    }

-                    if (runtimePath == null) {

-                        error("Tuscany runtime distribution directory not found", new FileNotFoundException(distro.getAbsolutePath()));

-                    }

-                } else {

-                    error("Tuscany runtime distribution archive not found", new FileNotFoundException(file.getAbsolutePath()));

-                }

-            } else {

-                error("Tuscany runtime feature not found", new FileNotFoundException(file.getAbsolutePath()));

-            }

-        } catch (Exception e) {

-            error("Tuscany runtime feature not found", e);

-        }

-        return runtimePath;

-    }

-

-    /**

-     * Returns the location of the src distribution under the Tuscany feature.

-     * 

-     * @param feature

-     * @return

-     */

-    static IPath src(IPath feature) {

-        IPath sourcePath = null;

-        try {

-

-            // Find the Tuscany source distribution under the feature's src directory

-            // Typically src/distro-archive-src.zip

-            File file = new File(feature.toFile(), "src");

-            if (file.exists()) {

-                File distro = null;

-                for (File f: file.listFiles()) {

-                    if (f.getName().contains("tuscany-sca") && f.getName().endsWith("-src.zip")) {

-                        distro = f;

-                        break;

-                    }

-                }

-                if (distro != null) {

-                    sourcePath = new Path(distro.getPath());

-                }

-            }

-        } catch (Exception e) {

-        }

-        return sourcePath;

-    }

-    

-}

diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
deleted file mode 100644
index c1a674a46a..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.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.core.classpath;
-
-import static org.apache.tuscany.sca.core.classpath.ClasspathUtil.feature;
-import static org.apache.tuscany.sca.core.classpath.ClasspathUtil.runtime;
-import static org.apache.tuscany.sca.core.classpath.ClasspathUtil.src;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * A classpath container for the Tuscany runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class TuscanyClasspathContainer implements IClasspathContainer {
-    
-    public static final IPath TUSCANY_LIBRARY_CONTAINER = new Path("org.apache.tuscany.sca.runtime.library");  
-    
-    private static final String TUSCANY_HOME = "TUSCANY_HOME";
-    private static final String TUSCANY_SRC = "TUSCANY_SRC";
-    
-    public TuscanyClasspathContainer() {
-    }
-
-    public IClasspathEntry[] getClasspathEntries() {
-        List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
-        
-        // Find the Tuscany feature
-        IPath feature = feature();
-        
-        // Get the runtime location from the installed Tuscany feature
-        IPath runtimePath = runtime(feature);
-
-        if (runtimePath == null) {
-
-            // Try to get the location of the Tuscany binary distribution from
-            // the TUSCANY_HOME property or environment variable
-            String home = System.getProperty(TUSCANY_HOME);
-            if (home == null || home.length() == 0) {
-                home = System.getenv(TUSCANY_HOME);
-            }
-            if (home != null && home.length() != 0) {
-                if (new File(home).exists()) {
-                    runtimePath = new Path(home);
-                }
-            }
-        }
-        
-        // Get the source location from the installed Tuscany feature
-        IPath sourcePath = src(feature);
-
-        if (sourcePath == null) {
-            
-            // Try to get the location of the Tuscany source distribution from
-            // the TUSCANY_SRC property or environment variable
-            String source = System.getProperty(TUSCANY_SRC);
-            if (source == null || source.length() == 0) {
-                source = System.getenv(TUSCANY_SRC);
-            }
-            if (source != null && source.length() != 0) {
-                if (new File(source).exists()) {
-                    sourcePath = new Path(source);
-                }
-            }
-        }
-        
-        // Add the JARs from runtime/lib and runtime/modules as classpath entries
-        if (runtimePath != null) {
-            
-            // Add a selection of 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;
-                    }
-                    if (name.startsWith("tuscany-node-api-") || name.startsWith("tuscany-domain-api-")) {
-                        continue;
-                    }
-
-                    list.add(JavaCore.newLibraryEntry(path, sourcePath, null));
-                }
-            }
-
-            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 String getDescription() {
-        return "Tuscany Library";
-    }
-
-    public int getKind() {
-        return IClasspathContainer.K_APPLICATION;
-    }
-
-    public IPath getPath() {
-        return TUSCANY_LIBRARY_CONTAINER;
-    }
-
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
deleted file mode 100644
index c82281b243..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.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.core.classpath;
-
-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.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * A classpath container initializer for the Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyClasspathContainerInitializer extends ClasspathContainerInitializer {
-
-    @Override
-    public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
-
-        TuscanyClasspathContainer classpathContainer = new TuscanyClasspathContainer();
-        JavaCore.setClasspathContainer(containerPath,
-                                       new IJavaProject[] {project},
-                                       new IClasspathContainer[] {classpathContainer},
-                                       null);
-    }
-
-    @Override
-    public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-        return true;
-    }
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
deleted file mode 100644
index 21f6f27a6f..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.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.core.classpath;
-
-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 classpath container page for the Tuscany runtime library.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLibraryEntryPage extends WizardPage implements IClasspathContainerPage {
-
-    private IClasspathEntry classpathEntry;
-
-    public TuscanyLibraryEntryPage() {
-        super("Tuscany");
-    }
-
-    public void createControl(Composite parent) {
-        setTitle("Tuscany Library");
-
-        Label label = new Label(parent, SWT.NONE);
-        label.setText("Press Finish to add the Tuscany Library");
-        label.setFont(parent.getFont());
-
-        setControl(label);
-    }
-
-    public boolean finish() {
-        classpathEntry = JavaCore.newContainerEntry(TuscanyClasspathContainer.TUSCANY_LIBRARY_CONTAINER);
-        return true;
-    }
-
-    public boolean isPageComplete() {
-        return true;
-    }
-
-    public IClasspathEntry getSelection() {
-        return classpathEntry;
-    }
-
-    public void setSelection(IClasspathEntry containerEntry) {
-        this.classpathEntry = containerEntry;
-    }
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
deleted file mode 100644
index df73402b67..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.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.core.classpath;
-
-import static org.apache.tuscany.sca.core.classpath.ClasspathUtil.feature;
-import static org.apache.tuscany.sca.core.classpath.ClasspathUtil.runtime;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * A classpath container for the Tuscany runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class TuscanyRuntimeClasspathContainer implements IClasspathContainer {
-    
-    public static final IPath TUSCANY_LIBRARY_CONTAINER = new Path("org.apache.tuscany.sca.runtime.library");  
-    
-    private static final String TUSCANY_HOME = "TUSCANY_HOME";
-    
-    public TuscanyRuntimeClasspathContainer() {
-    }
-
-    public IClasspathEntry[] getClasspathEntries() {
-        
-        // Find the Tuscany feature
-        IPath feature = feature();
-        
-        // Get the runtime location from the installed Tuscany feature
-        IPath runtimePath = runtime(feature);
-
-        if (runtimePath == null) {
-
-            // Try to get the location of the Tuscany binary distribution from
-            // the TUSCANY_HOME property or environment variable
-            String home = System.getProperty(TUSCANY_HOME);
-            if (home == null || home.length() == 0) {
-                home = System.getenv(TUSCANY_HOME);
-            }
-            if (home != null && home.length() != 0) {
-                if (new File(home).exists()) {
-                    runtimePath = new Path(home);
-                }
-            }
-        }
-        
-        if (runtimePath != null) {
-            return new IClasspathEntry[] {JavaCore.newLibraryEntry(runtimePath, null, null)};
-        } else {
-            return new IClasspathEntry[0];
-        }
-    }
-
-    public String getDescription() {
-        return "Tuscany Library";
-    }
-
-    public int getKind() {
-        return IClasspathContainer.K_APPLICATION;
-    }
-
-    public IPath getPath() {
-        return TUSCANY_LIBRARY_CONTAINER;
-    }
-
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
deleted file mode 100644
index bd255f4a15..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.launch;
-
-import static org.apache.tuscany.sca.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.core.classpath.ClasspathUtil;
-import org.apache.tuscany.sca.core.classpath.TuscanyClasspathContainer;
-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(TuscanyClasspathContainer.TUSCANY_LIBRARY_CONTAINER);
-            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=" + ClasspathUtil.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
deleted file mode 100644
index c9b96c7031..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.launch;
-
-import static org.apache.tuscany.sca.core.launch.DomainManagerLauncherUtil.domainProject;
-import static org.apache.tuscany.sca.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.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.core.classpath.ClasspathUtil;
-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=" + ClasspathUtil.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
deleted file mode 100644
index ddcfb66b63..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
deleted file mode 100644
index 738fe2638e..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
deleted file mode 100644
index 895cde6922..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.launch;
-
-import static org.apache.tuscany.sca.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
deleted file mode 100644
index c5aeefb891..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.launch;
-
-/**
- * TuscanyLaunchNodeFilter
- *
- * @version $Rev: $ $Date: $
- */
-public class TuscanyLaunchNodeFilter {
-
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
deleted file mode 100644
index 94ab29ce9a..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.launch;
-
-import static org.apache.tuscany.sca.core.launch.NodeLauncherUtil.launchNode;
-import static org.apache.tuscany.sca.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
deleted file mode 100644
index 3bbdc81dde..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.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.core")).log(
-                        new Status(IStatus.ERROR, "org.apache.tuscany.sca.core", IStatus.OK, msg, e));
-    }
-
-}
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
deleted file mode 100644
index 09b800fe1b..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
deleted file mode 100644
index 53b9607159..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.newwizards;
-
-import static org.apache.tuscany.sca.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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
deleted file mode 100644
index f07f0b643c..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java b/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
deleted file mode 100644
index bbca96196d..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/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.core.newwizards;
-
-import static org.apache.tuscany.sca.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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/plugin.xml b/tags/java/sca/1.3/tools/eclipse/plugins/core/plugin.xml
deleted file mode 100644
index 97c1d86623..0000000000
--- a/tags/java/sca/1.3/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="runtimeLibraries"
-		name="Tuscany Runtime Libraries"
-		schema="exsd/runtimeLibraries.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.core.runtimeLibraries">
-    	<classpathContainer 
-    			id="org.apache.tuscany.sca.runtime.library"
-				class="org.apache.tuscany.sca.core.classpath.TuscanyRuntimeClasspathContainer"/>                       
-	</extension>	
-
-	<extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-    	<classpathContainerInitializer 
-    			id="org.apache.tuscany.sca.runtime.library"
-				class="org.apache.tuscany.sca.core.classpath.TuscanyClasspathContainerInitializer"/>                       
-	</extension>
-	
-	<extension point="org.eclipse.jdt.ui.classpathContainerPage">
-		<classpathContainerPage 
-				id="org.apache.tuscany.sca.runtime.library"
-				name="Tuscany Library"
-				class="org.apache.tuscany.sca.core.classpath.TuscanyLibraryEntryPage">
-		</classpathContainerPage>
-	</extension>
-
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Tuscany"
-            visible="true"
-            id="org.apache.tuscany.sca.core.launch.actionSet">
-         <action
-               label="&amp;Start SCA Domain Manager"
-               icon="icons/t.gif"
-               class="org.apache.tuscany.sca.core.launch.TuscanyLaunchDomainManagerAction"
-               tooltip="Start SCA Domain Manager"
-               toolbarPath="tuscanyGroup"
-               id="org.apache.tuscany.sca.core.launch.TuscanyLaunchDomainManagerAction">
-         </action>
-      </actionSet>
-   </extension>
-
-	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
-		<launchConfigurationType
-       		name="Tuscany"
-        	delegate="org.apache.tuscany.sca.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.core.launch.configurationtype">        
-    	</launchConfigurationType>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-    	<launchConfigurationTypeImage
-        	icon="icons/t.gif"
-        	configTypeID="org.apache.tuscany.sca.core.launch.configurationtype"
-        	id="org.apache.tuscany.sca.core.launch.configurationtypeimage">
-    	</launchConfigurationTypeImage>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-    	<launchConfigurationTabGroup
-        	type="org.apache.tuscany.sca.core.launch.configurationtype"
-        	class="org.apache.tuscany.sca.core.launch.TuscanyLaunchConfigurationTabGroup"
-        	id="org.apache.tuscany.sca.core.launch.configurationtypetabgroup">
-    	</launchConfigurationTabGroup>
-	</extension>	
-	
-	<extension point="org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-			id="org.apache.tuscany.sca.core.launchshortcut"
-			class="org.apache.tuscany.sca.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.core.newwizards" /> 
-		<wizard name="Composite" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.core.newwizards" 
-				class="org.apache.tuscany.sca.core.newwizards.NewCompositeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.core.newwizards.newcompositewizard">
-			<description>Create a new SCA Composite</description> 
-		</wizard>
-		<wizard name="ComponentType" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.core.newwizards" 
-				class="org.apache.tuscany.sca.core.newwizards.NewComponentTypeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.core.newwizards.newcompositewizard">
-			<description>Create a new SCA ComponentType</description> 
-		</wizard>		
-	</extension>
-	
-</plugin>
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/pom.xml b/tags/java/sca/1.3/tools/eclipse/plugins/core/pom.xml
deleted file mode 100644
index f884c6b519..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/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-eclipse-tools</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.core</artifactId>
-    <name>Apache Tuscany SCA Eclipse Tools Core Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </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>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-all.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-all.xsd
deleted file mode 100644
index 1b19ede427..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
deleted file mode 100644
index 26bedfcce5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
deleted file mode 100644
index 850f32b56a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
deleted file mode 100644
index 02703402ef..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
deleted file mode 100644
index 3e92de193b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
deleted file mode 100644
index c7f92f6c3b..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-contribution.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.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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-core.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-core.xsd
deleted file mode 100644
index 1c6291792b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
deleted file mode 100644
index 0249882a92..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
deleted file mode 100644
index 87b443fb36..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
deleted file mode 100644
index 99669bc672..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
deleted file mode 100644
index 6f1cf14a4b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
deleted file mode 100644
index 1bca6199cb..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
deleted file mode 100644
index f9d8171b8e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
deleted file mode 100644
index 1cf9fb3ea9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
deleted file mode 100644
index 44f14e5ed5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
deleted file mode 100644
index 81f939bdb4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
deleted file mode 100644
index c1fdfd8f3c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca-policy.xsd
deleted file mode 100644
index c22ffd6618..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/sca.xsd
deleted file mode 100644
index 10f54275d0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
deleted file mode 100644
index c93a1d72de..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
deleted file mode 100644
index d0da5421ec..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
deleted file mode 100644
index ff48b97d7a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
deleted file mode 100644
index 7c79738898..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
deleted file mode 100644
index 6d5468b2f9..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
deleted file mode 100644
index 2697a1ea98..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.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="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="host" type="anyURI" use="optional"/>
-			 <attribute name="port" type="int" use="optional"/>
-			 <attribute name="serviceName" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
deleted file mode 100644
index 821f323d73..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
deleted file mode 100644
index 1b5c8aece2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
deleted file mode 100644
index f8d437310e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
deleted file mode 100644
index f8ece54a07..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
deleted file mode 100644
index dd596821ea..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
deleted file mode 100644
index e1723d65f0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
deleted file mode 100644
index 0c0998595f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
deleted file mode 100644
index cdabb697aa..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/tags/java/sca/1.3/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
deleted file mode 100644
index da5e696e01..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/pom.xml b/tags/java/sca/1.3/tools/eclipse/pom.xml
deleted file mode 100644
index 34165d24eb..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-tools</artifactId>
-        <version>1.3</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>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>features/feature</module>
-                <module>plugins/core</module>
-                <module>site/updatesite</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3/tools/eclipse/site/updatesite/.project b/tags/java/sca/1.3/tools/eclipse/site/updatesite/.project
deleted file mode 100644
index 4f95113dfd..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/site/updatesite/.project
+++ /dev/null
@@ -1,20 +0,0 @@
-<projectDescription>
-  <name>org.apache.tuscany.sca.updatesite</name>
-  <comment>Parent POM defining settings that can be used across Tuscany</comment>
-  <projects>
-    <project>org.apache.tuscany.sca.core</project>
-    <project>org.apache.tuscany.sca.feature</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.pde.UpdateSiteBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.pde.UpdateSiteNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/tags/java/sca/1.3/tools/eclipse/site/updatesite/LICENSE b/tags/java/sca/1.3/tools/eclipse/site/updatesite/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/eclipse/site/updatesite/NOTICE b/tags/java/sca/1.3/tools/eclipse/site/updatesite/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/site/updatesite/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/tags/java/sca/1.3/tools/eclipse/site/updatesite/pom.xml b/tags/java/sca/1.3/tools/eclipse/site/updatesite/pom.xml
deleted file mode 100644
index bb1bb5215a..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/site/updatesite/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-eclipse-tools</artifactId>
-        <version>1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
-    <name>Apache Tuscany SCA Eclipse Tools Update Site</name>
-
-    <properties>
-        <tuscany.version>${pom.version}</tuscany.version>
-    </properties>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.core</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.feature</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/tools/eclipse/site/updatesite/site.xml b/tags/java/sca/1.3/tools/eclipse/site/updatesite/site.xml
deleted file mode 100644
index 31b30bea35..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/site/updatesite/site.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.
--->
-<site>
-   <description url="http://incubator.apache.org/tuscany">
-      Apache Tuscany SCA Tools.
-   </description>
-   
-   <feature id="org.apache.tuscany.sca.feature" version="1.3.0"
-      url="features/org.apache.tuscany.sca.feature-1.3.jar"/>
-   
-   <archive path="plugins/org.apache.tuscany.sca.core_1.3.0.jar"
-      url="plugins/org.apache.tuscany.sca.core-1.3.jar"/>
-
-   <archive path="features/org.apache.tuscany.sca.feature_1.3.0/runtime/apache-tuscany-sca-1.3.jar"
-      url="../apache-tuscany-sca-1.3.zip"/>
-
-   <archive path="features/org.apache.tuscany.sca.feature_1.3.0/src/apache-tuscany-sca-1.3-src.zip"
-      url="../apache-tuscany-sca-1.3-src.zip"/>   
-</site>
diff --git a/tags/java/sca/1.3/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/tags/java/sca/1.3/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
deleted file mode 100644
index c5a0aa0dbb..0000000000
--- a/tags/java/sca/1.3/tools/eclipse/site/updatesite/src/main/assembly/updatesite.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.
--->
-<assembly>
-    <id>updatesite</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
-            <includes>
-                <include>DISCLAIMER</include>
-                <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.core</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/tags/java/sca/1.3/tools/java2wsdl/LICENSE b/tags/java/sca/1.3/tools/java2wsdl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/NOTICE b/tags/java/sca/1.3/tools/java2wsdl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/java2wsdl/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/tags/java/sca/1.3/tools/java2wsdl/pom.xml b/tags/java/sca/1.3/tools/java2wsdl/pom.xml
deleted file mode 100644
index f12821f06b..0000000000
--- a/tags/java/sca/1.3/tools/java2wsdl/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * 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>1.3</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-incubating</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</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.2</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.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <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.3</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.3</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>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </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.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-incubating</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>
-            <!-- <id>eclipse.emf</id>
-            <url>http://download.eclipse.org/tools/emf/maven2</url> -->
-            <!-- <id>osuosl.org</id>
-            <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
-            <!-- 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>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
deleted file mode 100644
index 60afe70534..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
deleted file mode 100644
index a890dd624d..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
deleted file mode 100644
index 9c8ff9df9e..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
deleted file mode 100644
index e8f3db95b0..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
deleted file mode 100644
index bce30a48d3..0000000000
--- a/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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.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.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
-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();
-        javax.xml.stream.XMLStreamReader stream = om.getXMLStreamReader();
-
-        org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node xform =
-            new org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node();
-
-        Node node = xform.transform(stream, null);
-
-        Document doc = node.getOwnerDocument();
-
-        // pretty-print WSDL document
-        OutputFormat format = new OutputFormat(doc);
-        format.setLineWidth(65);
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(getOutputStream(), format);
-        serializer.serialize(doc);
-
-        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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
deleted file mode 100644
index 897700ffd9..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
deleted file mode 100644
index fd10c77f8b..0000000000
--- a/tags/java/sca/1.3/tools/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.osoa.sca.annotations.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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
deleted file mode 100644
index 18cfafa4e3..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
deleted file mode 100644
index 3750dc27f5..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
deleted file mode 100644
index d6cd8a7f57..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
deleted file mode 100644
index 03291428a2..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
deleted file mode 100644
index cb41c56b94..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
deleted file mode 100644
index 66c9100ef9..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
deleted file mode 100644
index e30ada3af5..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
deleted file mode 100644
index 788d162f34..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/tags/java/sca/1.3/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
deleted file mode 100644
index b30b8cd62b..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/tags/java/sca/1.3/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
deleted file mode 100644
index 135b374357..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
deleted file mode 100644
index dfebd77215..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
deleted file mode 100644
index 5406025643..0000000000
--- a/tags/java/sca/1.3/tools/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.osoa.sca.annotations.OneWay;

-

-public interface ExampleService {

-

-    void sayHelloTwoWay(String name);

-

-    @OneWay

-    void sayHelloOneWay(String name);

-    

-    String getGreeting();

-}

diff --git a/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
deleted file mode 100644
index c587252d23..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
deleted file mode 100644
index bf49d98888..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
deleted file mode 100644
index cf83095852..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
deleted file mode 100644
index 901da8e551..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/tags/java/sca/1.3/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
deleted file mode 100644
index 78a64dcc64..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/AccountService.wsdl b/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 6f2fed1e2a..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
deleted file mode 100644
index 09d1a58589..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/helloworld.wsdl b/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/helloworld.wsdl
deleted file mode 100644
index 051f604bb2..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/sequences.xsd b/tags/java/sca/1.3/tools/java2wsdl/src/test/resources/sequences.xsd
deleted file mode 100644
index a565f3fa65..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/maven/maven-ant-generator/LICENSE b/tags/java/sca/1.3/tools/maven/maven-ant-generator/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-ant-generator/NOTICE b/tags/java/sca/1.3/tools/maven/maven-ant-generator/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-ant-generator/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/tags/java/sca/1.3/tools/maven/maven-ant-generator/pom.xml b/tags/java/sca/1.3/tools/maven/maven-ant-generator/pom.xml
deleted file mode 100644
index e052c9c4c3..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-dependency-lister/LICENSE b/tags/java/sca/1.3/tools/maven/maven-dependency-lister/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-dependency-lister/NOTICE b/tags/java/sca/1.3/tools/maven/maven-dependency-lister/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-dependency-lister/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/tags/java/sca/1.3/tools/maven/maven-dependency-lister/README b/tags/java/sca/1.3/tools/maven/maven-dependency-lister/README
deleted file mode 100644
index d53760029f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-dependency-lister/pom.xml b/tags/java/sca/1.3/tools/maven/maven-dependency-lister/pom.xml
deleted file mode 100644
index 23c4f5c511..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-incremental-build/LICENSE b/tags/java/sca/1.3/tools/maven/maven-incremental-build/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-incremental-build/NOTICE b/tags/java/sca/1.3/tools/maven/maven-incremental-build/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-incremental-build/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/tags/java/sca/1.3/tools/maven/maven-incremental-build/pom.xml b/tags/java/sca/1.3/tools/maven/maven-incremental-build/pom.xml
deleted file mode 100644
index 572ca068d1..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-java2wsdl/LICENSE b/tags/java/sca/1.3/tools/maven/maven-java2wsdl/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-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/tags/java/sca/1.3/tools/maven/maven-java2wsdl/NOTICE b/tags/java/sca/1.3/tools/maven/maven-java2wsdl/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-java2wsdl/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/tags/java/sca/1.3/tools/maven/maven-java2wsdl/pom.xml b/tags/java/sca/1.3/tools/maven/maven-java2wsdl/pom.xml
deleted file mode 100644
index afad37a323..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-java2wsdl/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-maven-tools</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-maven-java2wsdl</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Apache Tuscany SCA Java2WSDL Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-java2wsdl</artifactId>
-            <version>1.3</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/tags/java/sca/1.3/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
deleted file mode 100644
index 620e32a6fd..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.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.tools.java2wsdl.plugin;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.tuscany.tools.java2wsdl.generate.Java2WSDLGeneratorFactory;
-import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-
-/**
- * @version $Rev$ $Date$
- * @goal generate
- * @phase generate-sources
- * @description Generate WSDL from a given Java class / interface
- */
-public class Java2WSDLGeneratorMojo extends AbstractMojo 
-{
-	
-     /**
-     * The name of the class for which the WSDL must be generated
-     * @parameter 
-     * 
-     */
-    private String sourceClassName;
-
-    /**
-     * The location where the WSDLs should be generated into
-     * @parameter expression="${project.build.directory}\\java2wsdl-wsdl"
-    */
-    private String targetLocation;
-    
-    /**
-     * The name of the WSDL file 
-     * @parameter
-    */
-    private String wsdlFilename;
-
-
-    /**
-     * Classpaths to be included
-     * @parameter 
-     * 
-     */
-    String[] classpaths;
-
-    /**
-     * The name of the service
-     * @parameter    
-     */
-    private String serviceName;
-
-    /**
-     * The binding style for the service
-     * @parameter 
-     */
-    private String bindingStyle;
-
-    /**
-     * The binding use option
-     * @parameter 
-     */
-    private String bindingUse;
-
-    /**
-     * The soap address
-     * @parameter 
-     */
-    private String soapAddress;
-
-    public void execute() throws MojoExecutionException 
-    {
-    	try
-    	{
-    		Java2WSDLGeneratorFactory.getInstance().createGenerator().generateWSDL(createOptionsMap ());
-    	}
-    	catch ( Exception e )
-    	{
-    		throw new MojoExecutionException("Exception in Java2WSDL Maven Plugin ", e);
-    	}
-    }
-    
-    protected Map createOptionsMap()
-    {
-		Map optionsMap = new Hashtable();
-	
-	        optionsMap.put(Java2WSDLConstants.CLASSNAME_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.CLASSNAME_OPTION, new String[]{sourceClassName}));
-	    	
-		if ( targetLocation != null )
-		{
-		    optionsMap.put(Java2WSDLConstants.OUTPUT_LOCATION_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.OUTPUT_LOCATION_OPTION, new String[]{targetLocation}));
-		}
-		
-		if ( wsdlFilename != null )
-		{
-		    optionsMap.put(Java2WSDLConstants.OUTPUT_FILENAME_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.OUTPUT_FILENAME_OPTION, new String[]{wsdlFilename}));
-		}
-	
-		if ( classpaths != null && classpaths.length > 0 )
-		{
-		    optionsMap.put(Java2WSDLConstants.CLASSPATH_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.CLASSPATH_OPTION, classpaths));
-		}
-	
-		if ( serviceName != null  )
-		{
-		    optionsMap.put(Java2WSDLConstants.SERVICE_NAME_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.SERVICE_NAME_OPTION, new String[]{serviceName}));
-		}
-		
-		 if ( bindingStyle != null  )
-		{
-		    optionsMap.put(Java2WSDLConstants.STYLE_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.STYLE_OPTION, new String[]{bindingStyle}));
-		}
-	
-		if ( bindingUse != null  )
-		{
-		    optionsMap.put(Java2WSDLConstants.USE_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.USE_OPTION, new String[]{bindingUse}));
-		}
-	
-		if ( soapAddress != null  )
-		{
-		    optionsMap.put(Java2WSDLConstants.LOCATION_OPTION, 
-	    			new Java2WSDLCommandLineOption(Java2WSDLConstants.LOCATION_OPTION, new String[]{soapAddress}));
-		}
-
-   	return optionsMap;
-    }
-}
diff --git a/tags/java/sca/1.3/tools/maven/maven-web-junit/LICENSE b/tags/java/sca/1.3/tools/maven/maven-web-junit/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-web-junit/NOTICE b/tags/java/sca/1.3/tools/maven/maven-web-junit/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-web-junit/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/tags/java/sca/1.3/tools/maven/maven-web-junit/pom.xml b/tags/java/sca/1.3/tools/maven/maven-web-junit/pom.xml
deleted file mode 100644
index ac69b31b24..0000000000
--- a/tags/java/sca/1.3/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>1.3</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/tags/java/sca/1.3/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/maven/maven-wsdl2java/LICENSE b/tags/java/sca/1.3/tools/maven/maven-wsdl2java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-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/tags/java/sca/1.3/tools/maven/maven-wsdl2java/NOTICE b/tags/java/sca/1.3/tools/maven/maven-wsdl2java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/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/tags/java/sca/1.3/tools/maven/maven-wsdl2java/pom.xml b/tags/java/sca/1.3/tools/maven/maven-wsdl2java/pom.xml
deleted file mode 100644
index a986113403..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/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-maven-tools</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-maven-wsdl2java</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>Apache Tuscany SCA WSDL2Java Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-wsdl2java</artifactId>
-            <version>1.3</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
deleted file mode 100644
index 8021692521..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
+++ /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.    
- */
-package org.apache.tuscany.tools.wsdl2java.plugin;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator;
-
-/**
- * @version $Rev$ $Date$
- * @goal generate
- * @phase generate-sources
- * @description Generate SDO interface classes from an XML Schema
- */
-public class WSDL2JavaGeneratorMojo extends AbstractMojo {
-    /**
-     * The directory containing WSDL files; defaults to ${basedir}/src/main/wsdl
-     * @parameter expression="${basedir}/src/main/wsdl"
-     */
-    private String wsdlDir;
-
-    /**
-     * Name of the WSDL file; if omitted all files in the directory are processed
-     * @parameter
-     */
-    private File wsdlFile;
-
-    /**
-     * The Java package to generate into. By default the value is derived from the schema URI.
-     *
-     * @parameter
-     */
-    private String javaPackage;
-
-    /**
-     * The directory to generate into; defaults to ${project.build.directory}/wsdl2java-source
-     *
-     * @parameter expression="${project.build.directory}/wsdl2java-source"
-     */
-    private String targetDirectory;
-    
-    /**
-     * The directory to generate into; defaults to ${project.build.directory}/wsdl2java-source
-     *
-     * @parameter 
-     */
-    private WSDLFileOption[] wsdlFiles;
-
-    /**
-     * @parameter expression="${project.compileSourceRoots}"
-     * @readonly
-     */
-    private List compilerSourceRoots;
-
-    public void execute() throws MojoExecutionException {
-        
-        if(null != wsdlFiles){
-            for(int i=0; i< wsdlFiles.length ; ++i ){
-                System.err.println("wsdlFiles" + wsdlFiles[i].getFileName());
-                WSDLFileOption wf = wsdlFiles[i];
-
-                if(null == wf.getTargetDirectory())
-                    wf.setTargetDirectory(targetDirectory);
-                if(null == wf.getJavaPackage()){
-                    wf.setJavaPackage(javaPackage);
-                }
-                if(wf.getFileName() == null || wf.getFileName().length() ==0){
-                    throw new MojoExecutionException("no fileName specfied for wsdl.");    
-                }
-                if(!wf.getFileName().canRead() || !wf.getFileName().isFile()){
-
-                    throw new MojoExecutionException("file can not be read:"+wf.getFileName());    
-                }
-
-            }
-        }else{
-
-
-            
-            if (wsdlFile == null) {
-             
-             File[] files = new File(wsdlDir).listFiles(FILTER);
-             
-             wsdlFiles=   new WSDLFileOption[files.length];
-             for(int i= files.length -1; i> -1; --i){
-                 
-                 
-                 wsdlFiles[i] = new WSDLFileOption();
-                 wsdlFiles[i].setFileName(files[i]);
-                 wsdlFiles[i].setJavaPackage(javaPackage);
-                 wsdlFiles[i].setPorts(null);
-                 wsdlFiles[i].setTargetDirectory(targetDirectory);
-                 
-                 
-             }
-                
-            } else {
-                wsdlFiles=   new WSDLFileOption[]{new WSDLFileOption()};
-                wsdlFiles[0].setFileName(wsdlFile);
-                wsdlFiles[0].setJavaPackage(javaPackage);
-                wsdlFiles[0].setPorts(null);
-                wsdlFiles[0].setTargetDirectory(targetDirectory);
-            }
-        }
-        
-        int genOptions = 0;
-
-        for (int i = 0; i < wsdlFiles.length; i++) {
-            File file = wsdlFiles[i].getFileName();
-            File marker = new File(targetDirectory, ".gen#" + file.getName()+".wsdl2java");
-            if (file.lastModified() > marker.lastModified()) {
-                getLog().info("Generating Java service interfaces from " + file);
-                WSDL2JavaGenerator.generateFromWSDL(file.toString(), wsdlFiles[i].getPorts(), wsdlFiles[i].getTargetDirectory(), wsdlFiles[i].getJavaPackage(), null, genOptions);
-            }
-            try {
-                marker.createNewFile();
-            } catch (IOException e) {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-            marker.setLastModified(System.currentTimeMillis());
-        }
-
-        compilerSourceRoots.add(targetDirectory);
-    }
-
-    private static final FileFilter FILTER = new FileFilter() {
-        public boolean accept(File pathname) {
-            return (pathname.isFile() || !pathname.isHidden());
-        }
-    };
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
deleted file mode 100644
index cc10c351b1..0000000000
--- a/tags/java/sca/1.3/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.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.tools.wsdl2java.plugin;
-
-import java.io.File;
-
-public class WSDLFileOption {
-    /**
-     * Name of the WSDL file; if omitted all files in the directory are processed
-     * 
-     */
-    private File fileName;
-
-    /**
-     * The Java package to generate into. By default the value is derived from the schema URI.
-     *
-     * 
-     */
-    private String javaPackage;
-
-    /**
-     * The directory to generate into; defaults to ${project.build.directory}/wsdl2java-source
-     *
-     * 
-     */
-    private String targetDirectory;
-
-    /**
-     * @parameter expression="${project.compileSourceRoots}"
-     * @readonly
-     */
-
-    private String  ports[];
-
-    /**
-     * @parameter expression="${project.compileSourceRoots}"
-     * @readonly
-     */
-
-    
-   public WSDLFileOption(){}
-
-    public String getJavaPackage() {
-        return javaPackage;
-    }
-
-    public void setJavaPackage(String javaPackage) {
-        this.javaPackage = javaPackage;
-    }
-
- 
-    public String[] getPorts() {
-        return ports;
-    }
-
-    public void setPorts(String[] ports) {
-        this.ports = ports;
-    }
-
-    public String getTargetDirectory() {
-        return targetDirectory;
-    }
-
-    public void setTargetDirectory(String targetDirectory) {
-        this.targetDirectory = targetDirectory;
-    }
-
-    public File getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(File fileName) {
-        this.fileName = fileName;
-    }
-
-}
diff --git a/tags/java/sca/1.3/tools/maven/pom.xml b/tags/java/sca/1.3/tools/maven/pom.xml
deleted file mode 100644
index 729fb4f3af..0000000000
--- a/tags/java/sca/1.3/tools/maven/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-tools</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <packaging>pom</packaging>
-    <artifactId>tuscany-sca-maven-tools</artifactId>
-    <name>Apache Tuscany SCA Maven Tools</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>maven-ant-generator</module>
-                <module>maven-dependency-lister</module>
-                <module>maven-incremental-build</module>
-                <module>maven-java2wsdl</module>
-                <module>maven-web-junit</module>
-                <module>maven-wsdl2java</module>
-            </modules>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-</project>
diff --git a/tags/java/sca/1.3/tools/pom.xml b/tags/java/sca/1.3/tools/pom.xml
deleted file mode 100644
index 832c519310..0000000000
--- a/tags/java/sca/1.3/tools/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-sca</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>tuscany-sca-tools</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tools</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>eclipse</module>

-                <module>java2wsdl</module>

-                <module>maven</module>

-                <module>wsdl2java</module>

-                <module>runtime-inspector</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/tags/java/sca/1.3/tools/runtime-inspector/LICENSE b/tags/java/sca/1.3/tools/runtime-inspector/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/NOTICE b/tags/java/sca/1.3/tools/runtime-inspector/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/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/tags/java/sca/1.3/tools/runtime-inspector/pom.xml b/tags/java/sca/1.3/tools/runtime-inspector/pom.xml
deleted file mode 100644
index 680568276e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>

-        </dependency>

-            

-        <dependency>

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

-            <artifactId>tuscany-node2-impl</artifactId>

-            <version>1.3</version>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.3</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/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java b/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
deleted file mode 100644
index 55f83f65b3..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.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.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 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.Composite;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-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.node.SCANode2;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-import org.w3c.dom.Node;
-
-
-/**
- * Prints out the composite XML.
- */
-public class AssemblyInspector {
-    
-
-    public String assemblyAsString(SCANode2 node) {
-        StringBuffer assemblyString = new StringBuffer();
-        
-        // get at the node internals
-        Composite composite = ((NodeImpl)node).getComposite();
-        ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
-        
-        // Get the output factory 
-        ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.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/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java b/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
deleted file mode 100644
index 823322daeb..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.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.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.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-
-
-/**
- * An implementation of the ExtensionPointRegistryInspector service.
- */
-public class RegistryInspector {
-
-    public String registryAsString(SCANode2 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/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java b/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
deleted file mode 100644
index a405264a0d..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.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.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.SCANode2;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-import org.w3c.dom.Node;
-
-
-/**
- * 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(SCANode2 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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/AddService.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 7ca8fb04b5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9d180bf52e..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/src/test/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3d861f2018..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/DivideService.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 1323edf55a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index 91b803bc9e..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/SubtractService.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 58cc4a3547..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
deleted file mode 100644
index 0f7e6bce43..0000000000
--- a/tags/java/sca/1.3/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.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.tools.inspector;

-

-import java.io.ByteArrayOutputStream;

-import java.io.File;

-import java.io.OutputStream;

-import java.lang.reflect.Field;

-import java.util.Map;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.core.ExtensionPointRegistry;

-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.SCAClient;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.apache.tuscany.sca.tools.inspector.RegistryInspector;

-

-import calculator.CalculatorService;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class RegistryInspectorTestCase extends TestCase {

-

-    private CalculatorService calculatorService;

-    private SCANode2 node;

-

-    @Override

-    protected void setUp() throws Exception {

-        SCANode2Factory nodeFactory = SCANode2Factory.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/tags/java/sca/1.3/tools/runtime-inspector/src/test/resources/Calculator.composite b/tags/java/sca/1.3/tools/runtime-inspector/src/test/resources/Calculator.composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/tools/wsdl2java/LICENSE b/tags/java/sca/1.3/tools/wsdl2java/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/NOTICE b/tags/java/sca/1.3/tools/wsdl2java/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/tags/java/sca/1.3/tools/wsdl2java/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/tags/java/sca/1.3/tools/wsdl2java/pom.xml b/tags/java/sca/1.3/tools/wsdl2java/pom.xml
deleted file mode 100644
index 69d144330c..0000000000
--- a/tags/java/sca/1.3/tools/wsdl2java/pom.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * 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>1.3</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>1.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.1-incubating</version>
-        </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-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>
-            <!-- Replacing stax 1.0 with stax 1.0.1 -->
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</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.2</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.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-            <exclusions>
-                <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.3</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.3</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>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-        </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.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-test-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-incubating</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>
-            <!-- <id>eclipse.emf</id>
-                <url>http://download.eclipse.org/tools/emf/maven2</url> -->
-            <!-- <id>osuosl.org</id>
-                <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
-            <!-- 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>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
deleted file mode 100644
index a2220abe55..0000000000
--- a/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.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.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.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, AxisOperation operation, List headerParameterQNameList) {
-        return getElement(doc,
-                          "input",
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
-                          headerParameterQNameList);
-    }
-
-    @Override
-    protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
-        return getElement(doc,
-                          "output",
-                          operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
-                          operation.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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
deleted file mode 100644
index 8e0c3683a3..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
deleted file mode 100644
index 0c4f42633a..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
deleted file mode 100644
index 4ab152fb90..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
deleted file mode 100644
index 2d81ef12bf..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
deleted file mode 100644
index f6d1f3a64a..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/tags/java/sca/1.3/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
deleted file mode 100644
index d0b325982c..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/tags/java/sca/1.3/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/tags/java/sca/1.3/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
deleted file mode 100644
index 43005bcdbc..0000000000
--- a/tags/java/sca/1.3/tools/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.osoa.sca.annotations.Remotable;
-    import org.osoa.sca.annotations.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/tags/java/sca/1.3/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/tags/java/sca/1.3/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
deleted file mode 100644
index 92581d6ac2..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/tags/java/sca/1.3/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
deleted file mode 100644
index e9e8aa882a..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/AccountService.wsdl b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/AccountService.wsdl
deleted file mode 100644
index 6f2fed1e2a..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
deleted file mode 100644
index dda5a36085..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
deleted file mode 100644
index 09d1a58589..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/helloworld.wsdl b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/helloworld.wsdl
deleted file mode 100644
index 051f604bb2..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/interopdoc.wsdl b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/interopdoc.wsdl
deleted file mode 100644
index 820c26ca34..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/sequences.xsd b/tags/java/sca/1.3/tools/wsdl2java/src/test/resources/sequences.xsd
deleted file mode 100644
index a565f3fa65..0000000000
--- a/tags/java/sca/1.3/tools/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/tags/java/sca/1.3/tutorial/README b/tags/java/sca/1.3/tutorial/README
deleted file mode 100644
index 6169a05292..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/Tutorial.pdf b/tags/java/sca/1.3/tutorial/Tutorial.pdf
deleted file mode 100644
index e22f1b4c9d..0000000000
--- a/tags/java/sca/1.3/tutorial/Tutorial.pdf
+++ /dev/null
diff --git a/tags/java/sca/1.3/tutorial/assets/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/assets/META-INF/sca-contribution.xml
deleted file mode 100644
index cba1564cb4..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/assets/pom.xml b/tags/java/sca/1.3/tutorial/assets/pom.xml
deleted file mode 100644
index 698b1892e3..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-assets</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/assets/services/Cart.java b/tags/java/sca/1.3/tutorial/assets/services/Cart.java
deleted file mode 100644
index 9e6226d963..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/tags/java/sca/1.3/tutorial/assets/services/Catalog.java b/tags/java/sca/1.3/tutorial/assets/services/Catalog.java
deleted file mode 100644
index 2c3b19f579..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/tags/java/sca/1.3/tutorial/assets/services/CurrencyConverter.java b/tags/java/sca/1.3/tutorial/assets/services/CurrencyConverter.java
deleted file mode 100644
index e104a0423a..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, String toCurrencyCode, double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/tags/java/sca/1.3/tutorial/assets/services/CurrencyConverterImpl.java b/tags/java/sca/1.3/tutorial/assets/services/CurrencyConverterImpl.java
deleted file mode 100644
index c354aed447..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/assets/services/FruitsCatalogImpl.java b/tags/java/sca/1.3/tutorial/assets/services/FruitsCatalogImpl.java
deleted file mode 100644
index 377b3d7e59..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/Item.java b/tags/java/sca/1.3/tutorial/assets/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/assets/services/ShoppingCartImpl.java b/tags/java/sca/1.3/tutorial/assets/services/ShoppingCartImpl.java
deleted file mode 100644
index 9889921a96..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/Total.java b/tags/java/sca/1.3/tutorial/assets/services/Total.java
deleted file mode 100644
index 8f464e526f..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/tags/java/sca/1.3/tutorial/assets/services/VegetablesCatalogImpl.java b/tags/java/sca/1.3/tutorial/assets/services/VegetablesCatalogImpl.java
deleted file mode 100644
index 8bfbc757db..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/db/ShoppingCartTableImpl.java b/tags/java/sca/1.3/tutorial/assets/services/db/ShoppingCartTableImpl.java
deleted file mode 100644
index cfc52c563c..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/db/cart.sql b/tags/java/sca/1.3/tutorial/assets/services/db/cart.sql
deleted file mode 100644
index 25f16cb36b..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/assets/services/map/FruitsCatalogImpl.java b/tags/java/sca/1.3/tutorial/assets/services/map/FruitsCatalogImpl.java
deleted file mode 100644
index b160ba7be0..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/market/MarketCatalogImpl.java b/tags/java/sca/1.3/tutorial/assets/services/market/MarketCatalogImpl.java
deleted file mode 100644
index bd2c7d76a2..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/services/merger/MergedCatalogImpl.java b/tags/java/sca/1.3/tutorial/assets/services/merger/MergedCatalogImpl.java
deleted file mode 100644
index c02b4e821e..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/assets/tutorial.html b/tags/java/sca/1.3/tutorial/assets/tutorial.html
deleted file mode 100644
index 14f81e0c22..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/assets/uiservices/store.html b/tags/java/sca/1.3/tutorial/assets/uiservices/store.html
deleted file mode 100644
index 095570f949..0000000000
--- a/tags/java/sca/1.3/tutorial/assets/uiservices/store.html
+++ /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.    
--->
-<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) {
-		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) {			
-				shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total) {
-		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() {
-		catalog.get(catalog_getResponse);
-		shoppingCart.get("", shoppingCart_getResponse);
-	}
-	
-</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/tags/java/sca/1.3/tutorial/catalog-ejb/pom.xml b/tags/java/sca/1.3/tutorial/catalog-ejb/pom.xml
deleted file mode 100644
index 3a0e4b364a..0000000000
--- a/tags/java/sca/1.3/tutorial/catalog-ejb/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 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-tutorial</artifactId>

-        <version>1.3</version>

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

-    </parent>

-

-    <artifactId>tutorial-catalog-ejb</artifactId>

-    <name>Apache Tuscany SCA 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.2</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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
deleted file mode 100644
index c7ad31b682..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
deleted file mode 100644
index 7e79fc8b9d..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/Vegetable.java
deleted file mode 100644
index cf81539ba5..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
deleted file mode 100644
index ff2004fe1b..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index a0a7adf6fa..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 04d77ee39e..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 2e46b31047..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
deleted file mode 100644
index bc57b35e79..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite b/tags/java/sca/1.3/tutorial/catalog-ejb/src/main/resources/catalog-ejb.composite
deleted file mode 100644
index f733524809..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
deleted file mode 100644
index f9bd16f050..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
deleted file mode 100644
index 6930093042..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
deleted file mode 100644
index 3482ebb9ec..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
deleted file mode 100644
index d848fbb280..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
deleted file mode 100644
index 6efc86b608..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
deleted file mode 100644
index bdc1a5cfd5..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/tags/java/sca/1.3/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
deleted file mode 100644
index a24108714e..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-mediation/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/catalog-mediation/META-INF/sca-contribution.xml
deleted file mode 100644
index 88950bf740..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-mediation/catalog-mediation.composite b/tags/java/sca/1.3/tutorial/catalog-mediation/catalog-mediation.composite
deleted file mode 100644
index d832e88acc..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-mediation/pom.xml b/tags/java/sca/1.3/tutorial/catalog-mediation/pom.xml
deleted file mode 100644
index 43a1a81c16..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-catalog-mediation</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/tags/java/sca/1.3/tutorial/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
deleted file mode 100644
index 6cfa54e9de..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/catalog-webapp/catalog-web.composite b/tags/java/sca/1.3/tutorial/catalog-webapp/catalog-web.composite
deleted file mode 100644
index 3ba76da078..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-webapp/pom.xml b/tags/java/sca/1.3/tutorial/catalog-webapp/pom.xml
deleted file mode 100644
index 2d0005fcdd..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>

-        <version>1.3</version>

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

-    </parent>

-    <artifactId>tutorial-catalog-webapp</artifactId>

-    <name>Apache Tuscany SCA 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>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tuscany-node2-api</artifactId>

-            <version>1.3</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

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

-            <artifactId>tutorial-assets</artifactId>

-            <version>1.3</version>

-        </dependency>

-        

-        <dependency>

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

-            <artifactId>tuscany-node2-launcher</artifactId>

-            <version>1.3</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>1.3</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-       </plugins>

-    </build>

-

-</project>

diff --git a/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 7f06dc7ccb..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/WEB-INF/web.xml b/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/WEB-INF/web.xml
deleted file mode 100644
index e08d617dad..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/catalog.jsp b/tags/java/sca/1.3/tutorial/catalog-webapp/webapp/catalog.jsp
deleted file mode 100644
index dcee7c33f4..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud.composite b/tags/java/sca/1.3/tutorial/domain/cloud.composite
deleted file mode 100644
index a2341571fc..0000000000
--- a/tags/java/sca/1.3/tutorial/domain/cloud.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 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: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/tags/java/sca/1.3/tutorial/domain/cloud/CatalogEJBNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/CatalogEJBNode.composite
deleted file mode 100644
index 02e83d4c8d..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/CatalogMediationNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/CatalogMediationNode.composite
deleted file mode 100644
index bac96d9781..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/CatalogWebAppNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/CatalogWebAppNode.composite
deleted file mode 100644
index f3ed2dfdd5..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/CatalogsNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/CatalogsNode.composite
deleted file mode 100644
index 3a5ec770cb..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/CurrencyNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/CurrencyNode.composite
deleted file mode 100644
index ed80268f22..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreClientNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreClientNode.composite
deleted file mode 100644
index 91948b5476..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreDBNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreDBNode.composite
deleted file mode 100644
index 9b09bd7344..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreEUNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreEUNode.composite
deleted file mode 100644
index 6a50de56d5..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreMarketNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreMarketNode.composite
deleted file mode 100644
index 1bdd994c2b..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreMashupNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreMashupNode.composite
deleted file mode 100644
index 0db43df8c3..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreMergerNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreMergerNode.composite
deleted file mode 100644
index 0ce6e6a231..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreNode.composite
deleted file mode 100644
index e2b61a98e1..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/cloud/StoreSupplierNode.composite b/tags/java/sca/1.3/tutorial/domain/cloud/StoreSupplierNode.composite
deleted file mode 100644
index df46bb8813..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/domain.composite b/tags/java/sca/1.3/tutorial/domain/domain.composite
deleted file mode 100644
index 06d1cb4133..0000000000
--- a/tags/java/sca/1.3/tutorial/domain/domain.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 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: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/tags/java/sca/1.3/tutorial/domain/launch/LaunchCatalogMediationNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchCatalogMediationNode.java
deleted file mode 100644
index 4e0772d211..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchCatalogsNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchCatalogsNode.java
deleted file mode 100644
index a0c04a2f34..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchCurrencyNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchCurrencyNode.java
deleted file mode 100644
index d9110f5804..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreDBNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreDBNode.java
deleted file mode 100644
index b83db75646..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreEUNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreEUNode.java
deleted file mode 100644
index de0e421e2d..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMarketNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMarketNode.java
deleted file mode 100644
index b95d2a8d74..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMashupNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMashupNode.java
deleted file mode 100644
index aa7cbdc4ca..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMergerNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreMergerNode.java
deleted file mode 100644
index a29c9b7d61..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreNode.java
deleted file mode 100644
index 11f1b2ce86..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreSupplierNode.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchStoreSupplierNode.java
deleted file mode 100644
index fce27d7d3b..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/launch/LaunchTutorialDomainManager.java b/tags/java/sca/1.3/tutorial/domain/launch/LaunchTutorialDomainManager.java
deleted file mode 100644
index 7408e99c63..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/domain/pom.xml b/tags/java/sca/1.3/tutorial/domain/pom.xml
deleted file mode 100644
index 466f82d49d..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-domain</artifactId>
-    <name>Apache Tuscany SCA 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-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>launch.LaunchTutorialAdmin</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/domain/workspace.xml b/tags/java/sca/1.3/tutorial/domain/workspace.xml
deleted file mode 100644
index 702b9aff30..0000000000
--- a/tags/java/sca/1.3/tutorial/domain/workspace.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.    
--->
-<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:../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/tags/java/sca/1.3/tutorial/pom.xml b/tags/java/sca/1.3/tutorial/pom.xml
deleted file mode 100644
index 743fc39cc6..0000000000
--- a/tags/java/sca/1.3/tutorial/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-sca</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-tutorial</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA 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>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/tags/java/sca/1.3/tutorial/store-client/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-client/META-INF/sca-contribution.xml
deleted file mode 100644
index 30ffa61ed2..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-client/client/Shopper.java b/tags/java/sca/1.3/tutorial/store-client/client/Shopper.java
deleted file mode 100644
index f8643d4c52..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Shopper {
-    
-    String shop(String itemName, int quantity);
-
-}
diff --git a/tags/java/sca/1.3/tutorial/store-client/client/ShopperImpl.java b/tags/java/sca/1.3/tutorial/store-client/client/ShopperImpl.java
deleted file mode 100644
index c017548fb3..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.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/tags/java/sca/1.3/tutorial/store-client/launch/LaunchStoreClientNode.java b/tags/java/sca/1.3/tutorial/store-client/launch/LaunchStoreClientNode.java
deleted file mode 100644
index 4709240db5..0000000000
--- a/tags/java/sca/1.3/tutorial/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.SCANode2;
-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();
-        SCANode2 storeClientNode = nodeLauncher.createNode("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/tags/java/sca/1.3/tutorial/store-client/pom.xml b/tags/java/sca/1.3/tutorial/store-client/pom.xml
deleted file mode 100644
index 347350d8bf..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-client</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store-client/services/Cart.java b/tags/java/sca/1.3/tutorial/store-client/services/Cart.java
deleted file mode 100644
index 9e6226d963..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Cart extends Collection<String, Item> {
-
-}
diff --git a/tags/java/sca/1.3/tutorial/store-client/services/Catalog.java b/tags/java/sca/1.3/tutorial/store-client/services/Catalog.java
deleted file mode 100644
index 2c3b19f579..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Catalog {
-    Item[] get();
-}
diff --git a/tags/java/sca/1.3/tutorial/store-client/services/Item.java b/tags/java/sca/1.3/tutorial/store-client/services/Item.java
deleted file mode 100644
index 81cefcdbef..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-client/services/Total.java b/tags/java/sca/1.3/tutorial/store-client/services/Total.java
deleted file mode 100644
index 8f464e526f..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Total {
-    
-    String getTotal();
-
-}
diff --git a/tags/java/sca/1.3/tutorial/store-client/store-client.composite b/tags/java/sca/1.3/tutorial/store-client/store-client.composite
deleted file mode 100644
index 3c5f1637ef..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-db/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-db/META-INF/sca-contribution.xml
deleted file mode 100644
index 7a5d5613be..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-db/pom.xml b/tags/java/sca/1.3/tutorial/store-db/pom.xml
deleted file mode 100644
index 35e0340b2a..0000000000
--- a/tags/java/sca/1.3/tutorial/store-db/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-db</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <!-- 1.1 due to MOJO-619 -->
-                <version>1.1-SNAPSHOT</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/tags/java/sca/1.3/tutorial/store-db/store-db.composite b/tags/java/sca/1.3/tutorial/store-db/store-db.composite
deleted file mode 100644
index 03094be5ad..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-eu/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-eu/META-INF/sca-contribution.xml
deleted file mode 100644
index 552932b0e7..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-eu/pom.xml b/tags/java/sca/1.3/tutorial/store-eu/pom.xml
deleted file mode 100644
index 1bcf2171f4..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-eu</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-	        <plugin>
-	             <groupId>org.codehaus.mojo</groupId>
-	             <artifactId>sql-maven-plugin</artifactId>
-	             <version>1.0</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/tags/java/sca/1.3/tutorial/store-eu/store-eu.composite b/tags/java/sca/1.3/tutorial/store-eu/store-eu.composite
deleted file mode 100644
index a0b8b50975..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-eu/uiservices/store-eu.html b/tags/java/sca/1.3/tutorial/store-eu/uiservices/store-eu.html
deleted file mode 100644
index ec72d9b2a7..0000000000
--- a/tags/java/sca/1.3/tutorial/store-eu/uiservices/store-eu.html
+++ /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.    
--->
-<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) {
-		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) {			
-				shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total) {
-		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() {
-		catalog.get(catalog_getResponse);
-		shoppingCart.get("", shoppingCart_getResponse);
-	}
-	
-</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/tags/java/sca/1.3/tutorial/store-market/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-market/META-INF/sca-contribution.xml
deleted file mode 100644
index 491230c952..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-market/build.xml b/tags/java/sca/1.3/tutorial/store-market/build.xml
deleted file mode 100644
index 205d6aa71b..0000000000
--- a/tags/java/sca/1.3/tutorial/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-1.3.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-    </fileset>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store-market/pom.xml b/tags/java/sca/1.3/tutorial/store-market/pom.xml
deleted file mode 100644
index b7e483e47f..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-market</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store-market/store-market.composite b/tags/java/sca/1.3/tutorial/store-market/store-market.composite
deleted file mode 100644
index 1c225e6c07..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-merger/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-merger/META-INF/sca-contribution.xml
deleted file mode 100644
index 700a84736c..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-merger/pom.xml b/tags/java/sca/1.3/tutorial/store-merger/pom.xml
deleted file mode 100644
index 4b7443dc3d..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-merger</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store-merger/store-merger.composite b/tags/java/sca/1.3/tutorial/store-merger/store-merger.composite
deleted file mode 100644
index 76d77dc693..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-supplier/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-supplier/META-INF/sca-contribution.xml
deleted file mode 100644
index a75087aca1..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-supplier/pom.xml b/tags/java/sca/1.3/tutorial/store-supplier/pom.xml
deleted file mode 100644
index e0659beca2..0000000000
--- a/tags/java/sca/1.3/tutorial/store-supplier/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-tutorial</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-supplier</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <!-- 1.1 due to MOJO-619 -->
-                <version>1.1-SNAPSHOT</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/tags/java/sca/1.3/tutorial/store-supplier/store-supplier.composite b/tags/java/sca/1.3/tutorial/store-supplier/store-supplier.composite
deleted file mode 100644
index 525bc889cb..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-test/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store-test/META-INF/sca-contribution.xml
deleted file mode 100644
index a75087aca1..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store-test/client/Shopper.java b/tags/java/sca/1.3/tutorial/store-test/client/Shopper.java
deleted file mode 100644
index f8643d4c52..0000000000
--- a/tags/java/sca/1.3/tutorial/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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Shopper {
-    
-    String shop(String itemName, int quantity);
-
-}
diff --git a/tags/java/sca/1.3/tutorial/store-test/pom.xml b/tags/java/sca/1.3/tutorial/store-test/pom.xml
deleted file mode 100644
index 5c26a10b29..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store-test</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-data-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.3</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.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-store-supplier</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-       <testSourceDirectory>${basedir}</testSourceDirectory>
-       <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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store-test/test/StoreSupplierTestCase.java b/tags/java/sca/1.3/tutorial/store-test/test/StoreSupplierTestCase.java
deleted file mode 100644
index a7cb97ccc2..0000000000
--- a/tags/java/sca/1.3/tutorial/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.SCANode2;
-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 SCANode2 domainManager;
-    private SCANode2 storeSupplierNode;
-    private SCANode2 storeCatalogsNode;
-    private SCANode2 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.createNode("http://localhost:9990/node-config/StoreSupplierNode");
-        storeSupplierNode.start();
-        
-        storeCatalogsNode = nodeLauncher.createNode("http://localhost:9990/node-config/CatalogsNode");
-        storeCatalogsNode.start();
-        
-        storeClientNode = nodeLauncher.createNode("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/tags/java/sca/1.3/tutorial/store/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/store/META-INF/sca-contribution.xml
deleted file mode 100644
index 3ed6e4a4ef..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/store/pom.xml b/tags/java/sca/1.3/tutorial/store/pom.xml
deleted file mode 100644
index fca80c5429..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-store</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/tutorial/store/store.composite b/tags/java/sca/1.3/tutorial/store/store.composite
deleted file mode 100644
index b3f3140c8c..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/web-services/META-INF/sca-contribution.xml b/tags/java/sca/1.3/tutorial/web-services/META-INF/sca-contribution.xml
deleted file mode 100644
index 10fbe6c448..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/web-services/catalogs.composite b/tags/java/sca/1.3/tutorial/web-services/catalogs.composite
deleted file mode 100644
index 154d475165..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/web-services/currency.composite b/tags/java/sca/1.3/tutorial/web-services/currency.composite
deleted file mode 100644
index 7a3f70e299..0000000000
--- a/tags/java/sca/1.3/tutorial/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/tags/java/sca/1.3/tutorial/web-services/pom.xml b/tags/java/sca/1.3/tutorial/web-services/pom.xml
deleted file mode 100644
index 1c1a735775..0000000000
--- a/tags/java/sca/1.3/tutorial/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</artifactId>
-        <version>1.3</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tutorial-web-services</artifactId>
-    <name>Apache Tuscany SCA 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>1.3</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>1.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/tags/java/sca/1.3/vtest/assembly/ctypefile/pom.xml b/tags/java/sca/1.3/vtest/assembly/ctypefile/pom.xml
deleted file mode 100644
index 7858afbfce..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-
-
-</project>
diff --git a/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
deleted file mode 100644
index d1df390ace..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
deleted file mode 100644
index 8ee18b242f..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
deleted file mode 100644
index 0f24201970..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
deleted file mode 100644
index fd32cb1f9b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
deleted file mode 100644
index 173203ae21..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
deleted file mode 100644
index 360c31b8e2..0000000000
--- a/tags/java/sca/1.3/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">SomePropertyValue</property>
-  
-</componentType>              
-       
\ No newline at end of file
diff --git a/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/typefile.composite
deleted file mode 100644
index 3a70a1a977..0000000000
--- a/tags/java/sca/1.3/vtest/assembly/ctypefile/src/main/resources/typefile.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: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"></property>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/tags/java/sca/1.3/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
deleted file mode 100644
index ff0f9ebee7..0000000000
--- a/tags/java/sca/1.3/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.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.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.Ignore;
-import org.junit.Test;
-
-/**
- *
- */
-public class CompomnentTypeFileTestCase {
-
-    protected static String compositeName = "typefile.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/AService");
-        } 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
-    @Ignore("TUSCANY-2390")
-    public void typeFile3() throws Exception {
-        Assert.assertEquals("SomePropertyValue", aService.getBProperty());
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/assembly/pom.xml b/tags/java/sca/1.3/vtest/assembly/pom.xml
deleted file mode 100644
index 20378cb910..0000000000
--- a/tags/java/sca/1.3/vtest/assembly/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>ctypefile</module>
-           </modules>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversational/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/pom.xml
deleted file mode 100644
index 1b508781d2..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
deleted file mode 100644
index b67d89d3e2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Local Service
- */
-@Conversational
-public interface B2Service {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
deleted file mode 100644
index 55d87c9546..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
deleted file mode 100644
index 457b18e60a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
deleted file mode 100644
index d6252f0a0c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
deleted file mode 100644
index 4c2de35d52..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/pom.xml
deleted file mode 100644
index 042a82c757..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
deleted file mode 100644
index 8a1ed23b9d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface B2Service {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
deleted file mode 100644
index 1d215100f7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
deleted file mode 100644
index cd4f29ea5b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-
-/**
- * Simple Service
- */
-public interface CService {
-
-    public void testSinglePricipal(ServiceReference<BService> bReference);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
deleted file mode 100644
index 64b99c9f98..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
deleted file mode 100644
index 0d34b802e1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
deleted file mode 100644
index 762c9533d0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
deleted file mode 100644
index 3ebf63ba54..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
deleted file mode 100644
index 9d5aec8ed5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
deleted file mode 100644
index 49391b3353..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
deleted file mode 100644
index d3573176a3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
deleted file mode 100644
index c10369c9bd..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
deleted file mode 100644
index b9d10732e7..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.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.osoa.sca.ConversationEndedException;
-
-/**
- * This test class tests the Service annotation described in section 1.2.1 and
- * 1.8.17
- */
-public class ConversationAttributesAnnotationTestCase {
-
-    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
-    @Test(expected = Exception.class)
-    public void singlePrincipal() throws Exception {
-        aService.testSinglePrincipal();
-    }
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/pom.xml
deleted file mode 100644
index 0562846217..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
deleted file mode 100644
index 039689805c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for AService
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
deleted file mode 100644
index 0b30bb8644..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
deleted file mode 100644
index 33b2e01bcb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
deleted file mode 100644
index d5630e859e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
deleted file mode 100644
index b8f384704a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
deleted file mode 100644
index 75a00447f3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
deleted file mode 100644
index b03a0defe5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
deleted file mode 100644
index 93aafdd971..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
deleted file mode 100644
index eb8f6e59ca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
deleted file mode 100644
index 296a386876..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
deleted file mode 100644
index 4373bc2558..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
deleted file mode 100644
index 1d10679a8c..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.Test;
-import org.osoa.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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/pom.xml
deleted file mode 100644
index 7fa0fcef60..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
deleted file mode 100644
index 5400c1fe0d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-
-/**
- * Simple Local Service
- */
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    
-    public String getConversationId();
-    
-    @EndsConversation
-    public void endConversation();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
deleted file mode 100644
index ed564ddbdc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
deleted file mode 100644
index 418fb93c68..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
deleted file mode 100644
index cbc13e380c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
deleted file mode 100644
index 1ddd711a31..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/vtest/java-api/annotations/init/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/init/pom.xml
deleted file mode 100644
index 378254a04b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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-node2-impl</artifactId>
-            <version>1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
deleted file mode 100644
index edf13010f5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for AService
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-    public boolean isInitProper();
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
deleted file mode 100644
index 5d53510462..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
deleted file mode 100644
index 43c1a8cffa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
deleted file mode 100644
index f5cac472c0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
deleted file mode 100644
index b7c17ee535..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
deleted file mode 100644
index c2adea1426..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
deleted file mode 100644
index 01b8e101e0..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
deleted file mode 100644
index 4ae38d44b6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
deleted file mode 100644
index 6bc3d8e7fc..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
deleted file mode 100644
index 7ade16e6d3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
deleted file mode 100644
index 35f13a2ae6..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
deleted file mode 100644
index 65ccc9838d..0000000000
--- a/tags/java/sca/1.3/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.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.Test;
-import org.osoa.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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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 {
-        SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
-        try {
-            SCANode2 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/tags/java/sca/1.3/vtest/java-api/annotations/oneway/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/oneway/pom.xml
deleted file mode 100644
index 611170ee53..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
deleted file mode 100644
index 6fef2afa2a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.OneWay;
-
-/**
- * Simple Remotable Service
- */
-public interface AService {
-
-    @OneWay
-    public void setNameOneWay(String name);
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
deleted file mode 100644
index 4829ffb95f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    @Reference
-    protected BService b;
-
-    public void setNameOneWay(String name) {
-        b.setNameOneWay(name);
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
deleted file mode 100644
index 09c783ae96..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
deleted file mode 100644
index 47a7a98c7d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/pom.xml
deleted file mode 100644
index 51cebd0c39..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/vtest/java-api/annotations/property/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/property/pom.xml
deleted file mode 100644
index 3103b036f8..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
deleted file mode 100644
index 99fb842a9a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-    String getName();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
deleted file mode 100644
index b385083533..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
deleted file mode 100644
index fd1ba5ee52..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
deleted file mode 100644
index f22f4a35b7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
deleted file mode 100644
index 280d2275f8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
deleted file mode 100644
index 6bc4384e73..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
deleted file mode 100644
index 6715b64fad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
deleted file mode 100644
index e10f07b0be..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
deleted file mode 100644
index 9a23e2de8d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
deleted file mode 100644
index b4797595ac..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/resources/property.composite b/tags/java/sca/1.3/vtest/java-api/annotations/property/src/main/resources/property.composite
deleted file mode 100644
index f7af170f33..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/reference/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/reference/pom.xml
deleted file mode 100644
index 64317d2568..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
deleted file mode 100644
index 3322b542a9..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.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.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();
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
deleted file mode 100644
index 53b376d369..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
-    String getName();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
deleted file mode 100644
index 916ee25d7a..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.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.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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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;
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
deleted file mode 100644
index 82cd8014cd..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.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.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.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-public class AnotherAServiceImpl 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 AnotherAServiceImpl() {
-    }
-
-    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;
-    }
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
deleted file mode 100644
index e8611d510f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
-    public String getName() {
-        return "BService";
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/resources/ab.composite
deleted file mode 100644
index 9937173894..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/main/resources/ab.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://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="b4" target="BComponent"/>
-        <reference name="b5" target="BComponent"/>
-        <reference name="b6" 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="AnotherAComponent">
-        <implementation.java class="org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl.AnotherAServiceImpl"/>
-        <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/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
deleted file mode 100644
index a399d892cb..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.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.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, "AnotherAComponent");
-        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());
-    }
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/scope/pom.xml
deleted file mode 100644
index dbfc1f9f09..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
deleted file mode 100644
index d4cedcc979..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
deleted file mode 100644
index 7844ba7b62..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
deleted file mode 100644
index 7a047414dc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface GService {
-
-    public String getName();
-    
-	public int getInitCalledCounter();
-
-	public int getDestroyCalledCounter();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
deleted file mode 100644
index 555cdd5be0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-
-/**
- * Simple Service
- */
-@Remotable
-public interface HService {
-
-    public String getName();
-    
-    public String test();
-    
-    public String testCounters(int n);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
deleted file mode 100644
index 79e20a3879..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
deleted file mode 100644
index 95813f0e32..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface JService {
-
-    public String getName();
-
-    public String getFailedReason();
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
deleted file mode 100644
index b4c95965ff..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface KService {
-
-    public String getName();
-
-    public String callL1();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
deleted file mode 100644
index 5c0fc12fa3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
deleted file mode 100644
index ab6a3f946a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface MService {
-
-    public String getName();
-
-    public String getFailedReason();
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
deleted file mode 100644
index c544bf6e02..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface NService {
-
-    public String getName();
-
-    public String callO1(int nthTime);
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
deleted file mode 100644
index 0104030f2e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
deleted file mode 100644
index 9c17b06b16..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-	public String getName() {
-        return "AService";
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
deleted file mode 100644
index 2a8bd80e9a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
deleted file mode 100644
index c99f5f5e74..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
deleted file mode 100644
index cc41994106..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
deleted file mode 100644
index 4fb7386484..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
deleted file mode 100644
index 994469cb3a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
deleted file mode 100644
index 2fa610def7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
deleted file mode 100644
index 12566dc5e4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
deleted file mode 100644
index a5851598a0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
deleted file mode 100644
index 7088562c57..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
deleted file mode 100644
index 274e0570d9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
deleted file mode 100644
index 681b0b3776..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
deleted file mode 100644
index 98b94a33c7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
deleted file mode 100644
index 8cf39a072c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/main/resources/scope.composite
deleted file mode 100644
index 7c195b2b5d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
deleted file mode 100644
index 9821af4a27..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, 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
-    // JIRA T-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/tags/java/sca/1.3/vtest/java-api/annotations/service/pom.xml b/tags/java/sca/1.3/vtest/java-api/annotations/service/pom.xml
deleted file mode 100644
index bb3989ac93..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
deleted file mode 100644
index a923faf5ae..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-public interface AService {
-
-    public String getName();
-
-    public String setAObject(AObject a);
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
deleted file mode 100644
index e50e230bd4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
deleted file mode 100644
index e3a1462f88..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
deleted file mode 100644
index 7ce2235719..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
deleted file mode 100644
index 9c3f15743c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
deleted file mode 100644
index 4cc9430c74..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
deleted file mode 100644
index a64d434a46..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service()
-public class EServiceImpl implements EService {
-
-    public String getName() {
-        return "EService";
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
deleted file mode 100644
index 49f34738ef..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
deleted file mode 100644
index 46370b7e19..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(FServiceImpl2.class)
-public class FServiceImpl2 extends FServiceImpl  {
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
deleted file mode 100644
index a86d6e1da0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-import org.osoa.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
deleted file mode 100644
index ac525ea669..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
deleted file mode 100644
index f2760b96ab..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/resources/service.composite b/tags/java/sca/1.3/vtest/java-api/annotations/service/src/main/resources/service.composite
deleted file mode 100644
index 0731986df2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/pom.xml
deleted file mode 100644
index 9c848d8122..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
deleted file mode 100644
index a3f6d48685..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
deleted file mode 100644
index 1a62b86c22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
deleted file mode 100644
index 51ee68a393..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
deleted file mode 100644
index f66db33a83..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
deleted file mode 100644
index f997d78bb5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/pom.xml
deleted file mode 100644
index 85ddc7d080..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
deleted file mode 100644
index 255d91e168..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/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.apis.componentcontext;
-
-/**
- * Simple Service B.
- */
-public interface BService {
-
-    String getBName();
-
-    String getSelfReferenceWithServiceName();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
deleted file mode 100644
index 597dca0ea5..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.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.componentcontext;
-
-public interface DComponent {
-
-    public String getName();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
deleted file mode 100644
index 318b6ae0dd..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(AComponent.class)
-@Scope("COMPOSITE")
-@EagerInit
-public class AComponentImpl implements AComponent {
-
-    public static String rcContent = null;
-
-    protected ComponentContext componentContext;
-    
-    @Reference
-    protected BService bReference;
-
-    @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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
deleted file mode 100644
index 71d2eade2b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
deleted file mode 100644
index 4b2c8c183b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-@Service(DComponent.class)
-public class DComponentImpl implements DComponent {
-
-    public String getName() {
-        return "ComponentD";
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
deleted file mode 100644
index 695922e9ec..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/main/resources/ab.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://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="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/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
deleted file mode 100644
index 5f39638e5c..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.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.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;
-
-/**
- * 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 BService 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(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());
-    }
-
-    /**
-     * 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";
-        }
-        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
-     */
-    @Ignore
-    public void testServiceLookup() throws Exception {
-        Assert.assertEquals("ComponentD", a.testServiceLookup());
-    }
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/conversation/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/conversation/pom.xml
deleted file mode 100644
index ab2ee620fc..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
deleted file mode 100644
index 805c1f2750..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service A.
- */
-@Conversational
-public interface AComponent {
-
-    public String getName();
-
-    public void testConversation();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
deleted file mode 100644
index abd8602705..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
deleted file mode 100644
index 616155ccdf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.Conversation;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
deleted file mode 100644
index 66a3d3c72c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
deleted file mode 100644
index 87cab2f479..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/exception/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/exception/pom.xml
deleted file mode 100644
index e93dc51fa4..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
deleted file mode 100644
index 5c3755b19f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
deleted file mode 100644
index 6893a3b4b8..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-
-/**
- * Simple Service B.
- */
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public void testRedirectedCallback();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
deleted file mode 100644
index 519e66f1ce..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service C.
- */
-@Conversational
-public interface CComponent {
-
-    public String getName();
-
-    public void testConversation();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
deleted file mode 100644
index d0ef71a926..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remote Service D.
- */
-@Remotable
-public interface DComponent {
-
-    public String getName();
-    public void testException() throws DException;
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
deleted file mode 100644
index b4d6e929c5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.ServiceRuntimeException;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
deleted file mode 100644
index 245401e8aa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
deleted file mode 100644
index 2546548e1c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
deleted file mode 100644
index 1cbda7e10b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/resources/exception.composite b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/main/resources/exception.composite
deleted file mode 100644
index 5bd933ce96..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/tags/java/sca/1.3/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
deleted file mode 100644
index 9ff7e8e28f..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.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.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
-     */
-    @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/tags/java/sca/1.3/vtest/java-api/apis/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/pom.xml
deleted file mode 100644
index c1779c1ac3..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/pom.xml
deleted file mode 100644
index 07cceb50d1..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
deleted file mode 100644
index 34f709d175..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-
-/**
- * Simple Service B.
- */
-@Callback(BCallback.class)
-public interface BComponent {
-
-    public String getName();
-    
-    public void testCallback();
-    public String getServiceReferenceName();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
deleted file mode 100644
index c6fa589ed4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
deleted file mode 100644
index 33ff829357..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
deleted file mode 100644
index 4aa5eeb25a..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/tags/java/sca/1.3/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
deleted file mode 100644
index 65a1dbf88b..0000000000
--- a/tags/java/sca/1.3/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
-    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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/pom.xml b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/pom.xml
deleted file mode 100644
index 49a36d0fc2..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
deleted file mode 100644
index a1745f400e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
deleted file mode 100644
index 33a4d6edcc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
deleted file mode 100644
index 545d037c53..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
deleted file mode 100644
index f4307667b6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
deleted file mode 100644
index 099655ea22..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
deleted file mode 100644
index 9bded61947..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/pom.xml b/tags/java/sca/1.3/vtest/java-api/conversation/callback/pom.xml
deleted file mode 100644
index 53f4aa845f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
deleted file mode 100644
index 0a90f9c99a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
deleted file mode 100644
index 0e61247294..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
deleted file mode 100644
index e317a6e7e0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
deleted file mode 100644
index 6446e006bd..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
deleted file mode 100644
index 400c696d82..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
deleted file mode 100644
index 33421cb4d0..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/tags/java/sca/1.3/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 1b220abf69..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/tags/java/sca/1.3/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 957957a2e4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
deleted file mode 100644
index 4ef741c1c1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
deleted file mode 100644
index bba4bf2611..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
deleted file mode 100644
index 4fb4fa53de..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-@Conversational
-public interface CustomCallback {
-
-    public void someMethod();
-
-    public void callBack(String someState);
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/tags/java/sca/1.3/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 83453397b2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/tags/java/sca/1.3/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 c165aa51da..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/tags/java/sca/1.3/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 c0440a2b1b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
deleted file mode 100644
index 8a237af0ad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
deleted file mode 100644
index 9c185ddee3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/tags/java/sca/1.3/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 2e79d135f4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/tags/java/sca/1.3/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 fb0d6b8a50..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
deleted file mode 100644
index 1ace5858b2..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
deleted file mode 100644
index 52d8fe5a7e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
deleted file mode 100644
index eea769b2fb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
deleted file mode 100644
index 1caa467348..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- *
- */
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
deleted file mode 100644
index a7f471aa26..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
deleted file mode 100644
index 4aeeca6dc3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-
-/**
- * Simple Service
- */
-@Conversational
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
deleted file mode 100644
index 014f1edd33..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/tags/java/sca/1.3/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 4e6dce6fb9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/tags/java/sca/1.3/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 2f560fe87b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/tags/java/sca/1.3/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 23e0d0e70b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
deleted file mode 100644
index 705e101a01..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/tags/java/sca/1.3/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 c03b1aedc4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/tags/java/sca/1.3/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 8e068c8be4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
deleted file mode 100644
index 16b2932afc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
deleted file mode 100644
index 56b7006581..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback2 {
-
-    public void callBack2(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
deleted file mode 100644
index 580cf5a612..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
deleted file mode 100644
index 144492984a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/tags/java/sca/1.3/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 ce7214dba1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/tags/java/sca/1.3/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 b61a15cbee..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
deleted file mode 100644
index cb9aee2b9f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service
- */
-@Remotable
-public interface BServiceCallback {
-
-    public void callBack(String someState);
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
deleted file mode 100644
index 1fe70344af..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/tags/java/sca/1.3/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 033fa9d097..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/tags/java/sca/1.3/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 5f7d8d9c94..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/tags/java/sca/1.3/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 47d5d53821..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/tags/java/sca/1.3/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 18ce5edebe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
deleted file mode 100644
index 802c9c30db..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
deleted file mode 100644
index e66ea5d537..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
deleted file mode 100644
index 4d93d2279d..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
deleted file mode 100644
index cd8c589a59..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
deleted file mode 100644
index d2d9956103..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
deleted file mode 100644
index 6c69330ce5..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
deleted file mode 100644
index 72c08e8344..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
deleted file mode 100644
index 144f7f3d00..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
deleted file mode 100644
index ace06b245c..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/main/resources/callback.composite
deleted file mode 100644
index 4623f17ca2..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/tags/java/sca/1.3/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
deleted file mode 100644
index dc681a4e7e..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/vtest/java-api/conversation/id/pom.xml b/tags/java/sca/1.3/vtest/java-api/conversation/id/pom.xml
deleted file mode 100644
index c8878a4e6b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
deleted file mode 100644
index f49952828c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
deleted file mode 100644
index d4641c5ee6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
deleted file mode 100644
index 66a9b3b6c3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
-    public void setState(String someState);
-    
-    public String getState();
-
-    public void testAnnotation();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
deleted file mode 100644
index 517976ff73..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
deleted file mode 100644
index 752476ebf7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
deleted file mode 100644
index a01ceb7be4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/tags/java/sca/1.3/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
deleted file mode 100644
index 25e7154fca..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/pom.xml b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/pom.xml
deleted file mode 100644
index c2ac4b9ef5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
deleted file mode 100644
index 8deef5df31..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
deleted file mode 100644
index 5a20f4d960..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Remotable Service
- */
-@Remotable
-@Conversational
-public interface AServiceCallback {
-
-    @EndsConversation
-    public void endConversation();
-    
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
deleted file mode 100644
index 6368b1157b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
deleted file mode 100644
index dcc2e5d9c4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface CService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
deleted file mode 100644
index 06d40accd4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
deleted file mode 100644
index 1a1574561d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ComponentContext;
-import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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<CService> ref = context.getServiceReference(CService.class, "c");
-        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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
deleted file mode 100644
index 0919734c7a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
deleted file mode 100644
index d9910d445c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
deleted file mode 100644
index 34c57e402e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
deleted file mode 100644
index 6e6c08c185..0000000000
--- a/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.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-Lifetime">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.lifetime.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="c" target="CComponent" />
-		<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/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/tags/java/sca/1.3/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
deleted file mode 100644
index 2e5785f7d3..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/pom.xml b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/pom.xml
deleted file mode 100644
index a9ebd86b0b..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
deleted file mode 100644
index 8a5ef43a4b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Local Service
- */
-@Remotable
-@Conversational
-public interface BService {
-
-    public void setState(String someState);
-    public String getState();
-
-}
diff --git a/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
deleted file mode 100644
index e9a6dc469d..0000000000
--- a/tags/java/sca/1.3/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.osoa.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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
deleted file mode 100644
index 0ef2f219f7..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
deleted file mode 100644
index ab0b05d163..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
deleted file mode 100644
index 27d0210fca..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
deleted file mode 100644
index a8500dfb09..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/java-api/conversation/pom.xml b/tags/java/sca/1.3/vtest/java-api/conversation/pom.xml
deleted file mode 100644
index 044d120b3f..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/vtest/java-api/pom.xml b/tags/java/sca/1.3/vtest/java-api/pom.xml
deleted file mode 100644
index 420ecc7ef2..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/vtest/pom.xml b/tags/java/sca/1.3/vtest/pom.xml
deleted file mode 100644
index 43ead04359..0000000000
--- a/tags/java/sca/1.3/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>1.3</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.2</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/tags/java/sca/1.3/vtest/processcomments.rb b/tags/java/sca/1.3/vtest/processcomments.rb
deleted file mode 100644
index b7a7fc1cc3..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/utilities/pom.xml b/tags/java/sca/1.3/vtest/utilities/pom.xml
deleted file mode 100644
index b83836f063..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-         <dependency>
-             <groupId>wsdl4j</groupId>
-             <artifactId>wsdl4j</artifactId>
-             <version>1.6.2</version>
-         </dependency>
-         
-    </dependencies>
-
-</project>
diff --git a/tags/java/sca/1.3/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/tags/java/sca/1.3/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
deleted file mode 100644
index 9b6792e51b..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
deleted file mode 100644
index e7f29d191e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
deleted file mode 100644
index cba68beb65..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
deleted file mode 100644
index 43e35564b5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
deleted file mode 100644
index 8838c07899..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
deleted file mode 100644
index 27eee2de0a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
deleted file mode 100644
index da767518ec..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
deleted file mode 100644
index 4402b76f3a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
deleted file mode 100644
index 8392f5ed81..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
deleted file mode 100644
index 8064abf235..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
deleted file mode 100644
index d8ef16316a..0000000000
--- a/tags/java/sca/1.3/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/>
-		</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/>
-		</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:8080/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:8080/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:8080/CComponent"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
deleted file mode 100644
index 1ad636a5c5..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
deleted file mode 100644
index 4acfc5ca3f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
deleted file mode 100644
index fa2f11b495..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
deleted file mode 100644
index b55df2c0ae..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
deleted file mode 100644
index e39103a436..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
deleted file mode 100644
index 650d3295a6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
deleted file mode 100644
index 69d993251b..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
deleted file mode 100644
index ddcfc01416..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
deleted file mode 100644
index a3081b3bf4..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
deleted file mode 100644
index 8da87d88fc..0000000000
--- a/tags/java/sca/1.3/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:8080/BService/soap11"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8080/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:8080/CService/soap12"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8080/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:8080/BServicePromoted/soap11"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8080/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:8080/CServicePromoted/soap12"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8080/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:8080/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:8080/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/pom.xml
deleted file mode 100644
index 241552d2e4..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>1.3</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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/pom.xml
deleted file mode 100644
index 17490c3e5c..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
deleted file mode 100644
index 6ab6fbb8f5..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
deleted file mode 100644
index f3c42008aa..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
deleted file mode 100644
index 1215d9d41f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
deleted file mode 100644
index 774b68bf6d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
deleted file mode 100644
index 952df7ccfe..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
deleted file mode 100644
index 9111b5c3a9..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
deleted file mode 100644
index 5aa508d8f1..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
deleted file mode 100644
index 055283bfad..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
deleted file mode 100644
index 8f776672de..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
deleted file mode 100644
index 7a5d91d762..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
deleted file mode 100644
index 121de12d3c..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
deleted file mode 100644
index f05c8852f6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
deleted file mode 100644
index 746b0a357f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
deleted file mode 100644
index 5be411b286..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
deleted file mode 100644
index cf47c072a7..0000000000
--- a/tags/java/sca/1.3/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/>
-	</service>
-
-	<service name="BServiceSOAP" promote="BComponentSOAP">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="soap"/>
-	</service>
-
-	<service name="BServiceSOAP11" promote="BComponentSOAP11">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap.1_1"/>
-	</service>
-
-	<service name="BServiceSOAP12" promote="BComponentSOAP12">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="soap.1_2"/>
-	</service>
-
-	<service name="CService" promote="CComponent">
-   		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
-		<binding.ws requires="soap.1_2"/>
-	</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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/pom.xml
deleted file mode 100644
index 0ae9b8107e..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
deleted file mode 100644
index d5204634a6..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
deleted file mode 100644
index 034aad7781..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
deleted file mode 100644
index 1c345428b3..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
deleted file mode 100644
index 74dcccd898..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
deleted file mode 100644
index a86922ef4f..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
deleted file mode 100644
index a809795657..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
deleted file mode 100644
index 2c1642ff14..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
deleted file mode 100644
index 657be52e7d..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
deleted file mode 100644
index fb079fa8bc..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
deleted file mode 100644
index 9f0e76ec10..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
deleted file mode 100644
index 91e4ffbd7e..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
deleted file mode 100644
index b8cd38bb09..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
deleted file mode 100644
index 250694dc36..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
deleted file mode 100644
index 9f6c29c643..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
deleted file mode 100644
index 464bb4ebf3..0000000000
--- a/tags/java/sca/1.3/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:8080/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"/>
-		</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"/>
-		</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"/>
-		</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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/CComponent"/>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
deleted file mode 100644
index 42ce7edd6a..0000000000
--- a/tags/java/sca/1.3/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
-    // 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
-    //  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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/tags/java/sca/1.3/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/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/pom.xml
deleted file mode 100644
index f23ecf422d..0000000000
--- a/tags/java/sca/1.3/vtest/wsbinding/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-vtest</artifactId>
-        <version>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>vtest-utilities</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>service</module>
-                <module>nowsdl</module>
-           </modules>
-        </profile>
-    </profiles>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/pom.xml b/tags/java/sca/1.3/vtest/wsbinding/service/pom.xml
deleted file mode 100644
index 34d46ffe00..0000000000
--- a/tags/java/sca/1.3/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>1.3</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>1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.3</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
deleted file mode 100644
index 397f6b4c5a..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for AClientService.
- */
-@Remotable
-public interface AClientService {
-    public String getGreetingsForward(String name);
-}
diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
deleted file mode 100644
index b97e0cfebb..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-    public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
deleted file mode 100644
index 8d9e6de816..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.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/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
deleted file mode 100644
index 450da9cbcf..0000000000
--- a/tags/java/sca/1.3/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.osoa.sca.annotations.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
-    public String getGreetings(String name) {
-        return "Hello " + name;
-    }
-}
diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/aservice.wsdl
deleted file mode 100644
index 861ab471ee..0000000000
--- a/tags/java/sca/1.3/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: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/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
deleted file mode 100644
index b3ab971c67..0000000000
--- a/tags/java/sca/1.3/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:8080/AService/soap12portxxx"/>

-		    <binding.ws name="bnd2" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"

-		                uri="http://localhost:8080/AService/endpointrefxxx">

-                <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-                  <wsa:Address>http://localhost:8080/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:8080/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:8080/AService/noWsdlElement"/>

-		    <binding.ws name="bnd6" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_wsdl)"

-		                uri="http://localhost:8080/AService/endpointref6"/>

-		    <binding.ws name="bnd7" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"

-		                uri="http://localhost:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/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:8080/AService/endpointref8"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/endpointreference.composite
deleted file mode 100644
index bb3bbef390..0000000000
--- a/tags/java/sca/1.3/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:8080/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:8080/AService/endpointref"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
deleted file mode 100644
index d24c1ac4af..0000000000
--- a/tags/java/sca/1.3/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:8080/AService/bnd11"/>

-		    <binding.ws name="bnd12" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP12Binding)"

-		        uri="http://localhost:8080/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:8080/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:8080/AService/bnd12"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
deleted file mode 100644
index 92c30e5d90..0000000000
--- a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlendpoint.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://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)"/>

-		</service>

-    </component>

-    <component name="AClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8080/AService/endpoint"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlport.composite
deleted file mode 100644
index 961ae28e5a..0000000000
--- a/tags/java/sca/1.3/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:8080/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:8080/AService/soap12port"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
deleted file mode 100644
index 093eb83323..0000000000
--- a/tags/java/sca/1.3/vtest/wsbinding/service/src/main/resources/wsdlservice.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://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)"/>

-		</service>

-    </component>

-    <component name="AClientS11Component">

-        <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>

-        <reference name="aService">

-            <binding.ws uri="http://localhost:8080/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:8080/AService/soap12port"/>

-        </reference>

-    </component> 

-</composite>

diff --git a/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
deleted file mode 100644
index d858daaf78..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
deleted file mode 100644
index b9f679c9a7..0000000000
--- a/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.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.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 "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.
-     */
-    @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/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
deleted file mode 100644
index 292de8b654..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
deleted file mode 100644
index 842da87bd4..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
deleted file mode 100644
index 0545cef776..0000000000
--- a/tags/java/sca/1.3/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/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/tags/java/sca/1.3/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
deleted file mode 100644
index aa2b2fac7a..0000000000
--- a/tags/java/sca/1.3/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();
-    }
-}